From: henri g. <pro...@us...> - 2003-09-24 19:26:48
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1:/tmp/cvs-serv1903/run Modified Files: JvUIB.pas JvUIBase.pas JvUIBLib.pas JvUIBMetaData.pas Log Message: various design update Index: JvUIB.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUIB.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JvUIB.pas 23 Sep 2003 16:50:13 -0000 1.6 --- JvUIB.pas 24 Sep 2003 19:26:43 -0000 1.7 *************** *** 1003,1006 **** --- 1003,1008 ---- end; end; + if eof then + beep; end; Index: JvUIBase.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUIBase.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvUIBase.pas 22 Sep 2003 20:55:05 -0000 1.4 --- JvUIBase.pas 24 Sep 2003 19:26:43 -0000 1.5 *************** *** 54,57 **** --- 54,66 ---- PPointer = ^Pointer; PPChar = ^PChar; + + PWord = ^Word; + PCardinal = ^Cardinal; + PSmallInt = ^SmallInt; + PInteger = ^Integer; + PDouble = ^Double; + PSingle = ^Single; + PInt64 = ^Int64; + {$ENDIF} {$ENDIF} Index: JvUIBLib.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUIBLib.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvUIBLib.pas 22 Sep 2003 20:55:05 -0000 1.4 --- JvUIBLib.pas 24 Sep 2003 19:26:44 -0000 1.5 *************** *** 699,712 **** {$IFNDEF DELPHI6_UP} ! {$IFNDEF FPC} ! type ! PWord = ^Word; ! PCardinal = ^Cardinal; ! PSmallInt = ^SmallInt; ! PInteger = ^Integer; ! PDouble = ^Double; ! PSingle = ^Single; ! PInt64 = ^Int64; ! {$ENDIF} function TryStrToInt(const S: string; out Value: Integer): Boolean; var --- 699,703 ---- {$IFNDEF DELPHI6_UP} ! function TryStrToInt(const S: string; out Value: Integer): Boolean; var Index: JvUIBMetaData.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUIBMetaData.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvUIBMetaData.pas 23 Sep 2003 22:29:03 -0000 1.1 --- JvUIBMetaData.pas 24 Sep 2003 19:26:44 -0000 1.2 *************** *** 238,242 **** FSubType: Smallint; FBytesPerCharacter: Smallint; ! procedure LoadFromQuery(QField, QCharset: TJvUIBQuery); virtual; procedure LoadFromStream(Stream: TStream); override; property SegmentLength: Smallint read FSegmentLength; --- 238,242 ---- FSubType: Smallint; FBytesPerCharacter: Smallint; ! procedure LoadFromQuery(QField, QCharset: TJvUIBStatement); virtual; procedure LoadFromStream(Stream: TStream); override; property SegmentLength: Smallint read FSegmentLength; *************** *** 256,260 **** TMetaField = class(TMetaBaseField) private ! procedure LoadFromQuery(Q, C: TJvUIBQuery); override; public procedure SaveToDDL(Stream: TStringStream); override; --- 256,260 ---- TMetaField = class(TMetaBaseField) private ! procedure LoadFromQuery(Q, C: TJvUIBStatement); override; public procedure SaveToDDL(Stream: TStringStream); override; *************** *** 276,280 **** FDefaultValue: string; FNotNull: boolean; ! procedure LoadFromQuery(Q, C: TJvUIBQuery); override; procedure LoadFromStream(Stream: TStream); override; public --- 276,280 ---- FDefaultValue: string; FNotNull: boolean; ! procedure LoadFromQuery(Q, C: TJvUIBStatement); override; procedure LoadFromStream(Stream: TStream); override; public *************** *** 308,312 **** TMetaPrimary = class(TMetaConstraint) private ! procedure LoadFromQuery(Q: TJvUIBQuery); public class function NodeClass: string; override; --- 308,312 ---- TMetaPrimary = class(TMetaConstraint) private ! procedure LoadFromQuery(Q: TJvUIBStatement); public class function NodeClass: string; override; *************** *** 375,379 **** class function DecodePrefix(value: Integer): TTriggerPrefix; class function DecodeSuffixes(value: Integer): TTriggerSuffixes; ! procedure LoadFromQuery(Q: TJvUIBQuery); procedure LoadFromStream(Stream: TStream); override; public --- 375,379 ---- class function DecodePrefix(value: Integer): TTriggerPrefix; class function DecodeSuffixes(value: Integer): TTriggerSuffixes; ! procedure LoadFromQuery(Q: TJvUIBStatement); procedure LoadFromStream(Stream: TStream); override; public *************** *** 393,397 **** function GetFieldsCount: Integer; procedure LoadFromDataBase(QNames, QFields, QCharset, QPrimary, ! QIndex, QForeign, QCheck, QTrigger: TJvUIBQuery); function FindFieldIndex(const name: String): Integer; function GetUniques(const Index: Integer): TMetaUnique; --- 393,397 ---- function GetFieldsCount: Integer; procedure LoadFromDataBase(QNames, QFields, QCharset, QPrimary, ! QIndex, QForeign, QCheck, QTrigger: TJvUIBStatement); function FindFieldIndex(const name: String): Integer; function GetUniques(const Index: Integer): TMetaUnique; *************** *** 445,449 **** function GetTriggers(const Index: Integer): TMetaTrigger; function GetTriggersCount: Integer; ! procedure LoadFromDataBase(QName, QFields, QTriggers, QCharset: TJvUIBQuery); procedure LoadFromStream(Stream: TStream); override; public --- 445,449 ---- function GetTriggers(const Index: Integer): TMetaTrigger; function GetTriggersCount: Integer; ! procedure LoadFromDataBase(QName, QFields, QTriggers, QCharset: TJvUIBStatement); procedure LoadFromStream(Stream: TStream); override; public *************** *** 467,471 **** private FSource: string; ! procedure LoadFromQuery(QNames, QFields, QCharset: TJvUIBQuery); function GetInputFields(const Index: Integer): TMetaProcInField; function GetInputFieldsCount: Integer; --- 467,471 ---- private FSource: string; ! procedure LoadFromQuery(QNames, QFields, QCharset: TJvUIBStatement); function GetInputFields(const Index: Integer): TMetaProcInField; function GetInputFieldsCount: Integer; *************** *** 495,499 **** FMessage: string; procedure LoadFromStream(Stream: TStream); override; ! procedure LoadFromQuery(QName: TJvUIBQuery); public procedure SaveToDDLNode(Stream: TStringStream); override; --- 495,499 ---- FMessage: string; procedure LoadFromStream(Stream: TStream); override; ! procedure LoadFromQuery(QName: TJvUIBStatement); public procedure SaveToDDLNode(Stream: TStringStream); override; *************** *** 507,511 **** FPosition: Smallint; FMechanism: Smallint; ! procedure LoadFromQuery(QField, QCharset: TJvUIBQuery); override; procedure LoadFromStream(Stream: TStream); override; public --- 507,511 ---- FPosition: Smallint; FMechanism: Smallint; ! procedure LoadFromQuery(QField, QCharset: TJvUIBStatement); override; procedure LoadFromStream(Stream: TStream); override; public *************** *** 522,526 **** FReturn: Smallint; procedure LoadFromStream(Stream: TStream); override; ! procedure LoadFromQuery(QNames, QFields, QCharset: TJvUIBQuery); function GetFields(const Index: Integer): TMetaUDFField; function GetFieldsCount: Integer; --- 522,526 ---- FReturn: Smallint; procedure LoadFromStream(Stream: TStream); override; ! procedure LoadFromQuery(QNames, QFields, QCharset: TJvUIBStatement); function GetFields(const Index: Integer): TMetaUDFField; function GetFieldsCount: Integer; *************** *** 770,777 **** procedure TMetaGenerator.LoadFromDataBase(Transaction: TJvUIBTransaction; const Name: string); ! var Query: TJvUIBQuery; begin CheckTransaction(Transaction); ! Query := TJvUIBQuery.Create(nil); Query.Transaction := Transaction; Query.CachedFetch := False; --- 770,777 ---- procedure TMetaGenerator.LoadFromDataBase(Transaction: TJvUIBTransaction; const Name: string); ! var Query: TJvUIBStatement; begin CheckTransaction(Transaction); ! Query := TJvUIBStatement.Create(nil); Query.Transaction := Transaction; Query.CachedFetch := False; *************** *** 869,873 **** procedure TMetaTable.LoadFromDataBase(QNames, QFields, QCharset, QPrimary, ! QIndex, QForeign, QCheck, QTrigger: TJvUIBQuery); var unk: string; --- 869,873 ---- procedure TMetaTable.LoadFromDataBase(QNames, QFields, QCharset, QPrimary, ! QIndex, QForeign, QCheck, QTrigger: TJvUIBStatement); var unk: string; *************** *** 1112,1116 **** end; ! procedure TMetaBaseField.LoadFromQuery(QField, QCharset: TJvUIBQuery); procedure FindCharset(const id: single; var Charset: string; var count: Smallint); var i: Integer; --- 1112,1116 ---- end; ! procedure TMetaBaseField.LoadFromQuery(QField, QCharset: TJvUIBStatement); procedure FindCharset(const id: single; var Charset: string; var count: Smallint); var i: Integer; *************** *** 1221,1230 **** QNames, QFields, QCharset, QPrimary, ! QIndex, QForeign, QCheck, QTrigger: TJvUIBQuery; ! procedure Configure(var Q: TJvUIBQuery; const QRY: string; CachedFetch: boolean = False); begin ! Q := TJvUIBQuery.Create(nil); Q.Transaction := Transaction; Q.CachedFetch := CachedFetch; --- 1221,1230 ---- QNames, QFields, QCharset, QPrimary, ! QIndex, QForeign, QCheck, QTrigger: TJvUIBStatement; ! procedure Configure(var Q: TJvUIBStatement; const QRY: string; CachedFetch: boolean = False); begin ! Q := TJvUIBStatement.Create(nil); Q.Transaction := Transaction; Q.CachedFetch := CachedFetch; *************** *** 1645,1649 **** end; ! procedure TMetaPrimary.LoadFromQuery(Q: TJvUIBQuery); var i: Integer; begin --- 1645,1649 ---- end; ! procedure TMetaPrimary.LoadFromQuery(Q: TJvUIBStatement); var i: Integer; begin *************** *** 1856,1860 **** end; ! procedure TMetaTrigger.LoadFromQuery(Q: TJvUIBQuery); begin FName := Trim(Q.Fields.AsString[0]); --- 1856,1860 ---- end; ! procedure TMetaTrigger.LoadFromQuery(Q: TJvUIBStatement); begin FName := Trim(Q.Fields.AsString[0]); *************** *** 1944,1948 **** procedure TMetaView.LoadFromDataBase(QName, QFields, QTriggers, ! QCharset: TJvUIBQuery); begin FName := Trim(QName.Fields.AsString[0]); --- 1944,1948 ---- procedure TMetaView.LoadFromDataBase(QName, QFields, QTriggers, ! QCharset: TJvUIBStatement); begin FName := Trim(QName.Fields.AsString[0]); *************** *** 2088,2092 **** procedure TMetaProcedure.LoadFromQuery(QNames, QFields, ! QCharset: TJvUIBQuery); begin FName := Trim(QNames.Fields.AsString[0]); --- 2088,2092 ---- procedure TMetaProcedure.LoadFromQuery(QNames, QFields, ! QCharset: TJvUIBStatement); begin FName := Trim(QNames.Fields.AsString[0]); *************** *** 2154,2158 **** end; ! procedure TMetaException.LoadFromQuery(QName: TJvUIBQuery); begin FName := Trim(QName.Fields.AsString[0]); --- 2154,2158 ---- end; ! procedure TMetaException.LoadFromQuery(QName: TJvUIBStatement); begin FName := Trim(QName.Fields.AsString[0]); *************** *** 2242,2246 **** end; ! procedure TMetaUDF.LoadFromQuery(QNames, QFields, QCharset: TJvUIBQuery); begin FName := Trim(QNames.Fields.AsString[0]); --- 2242,2246 ---- end; ! procedure TMetaUDF.LoadFromQuery(QNames, QFields, QCharset: TJvUIBStatement); begin FName := Trim(QNames.Fields.AsString[0]); *************** *** 2276,2280 **** { TMetaTableField } ! procedure TMetaTableField.LoadFromQuery(Q, C: TJvUIBQuery); begin inherited; --- 2276,2280 ---- { TMetaTableField } ! procedure TMetaTableField.LoadFromQuery(Q, C: TJvUIBStatement); begin inherited; *************** *** 2329,2333 **** { TMetaField } ! procedure TMetaField.LoadFromQuery(Q, C: TJvUIBQuery); begin inherited; --- 2329,2333 ---- { TMetaField } ! procedure TMetaField.LoadFromQuery(Q, C: TJvUIBStatement); begin inherited; *************** *** 2344,2348 **** { TMetaUDFField } ! procedure TMetaUDFField.LoadFromQuery(QField, QCharset: TJvUIBQuery); begin inherited; --- 2344,2348 ---- { TMetaUDFField } ! procedure TMetaUDFField.LoadFromQuery(QField, QCharset: TJvUIBStatement); begin inherited; |