ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/branches/udr/client/3.0/FB30Statement.pas
(Generate patch)

Comparing:
ibx/trunk/fbintf/client/3.0/FB30Statement.pas (file contents), Revision 347 by tony, Mon Sep 20 22:08:20 2021 UTC vs.
ibx/branches/udr/client/3.0/FB30Statement.pas (file contents), Revision 389 by tony, Thu Jan 20 23:33:40 2022 UTC

# Line 88 | Line 88 | type
88      FStatement: TFB30Statement;
89      FFirebird30ClientAPI: TFB30ClientAPI;
90      FBlob: IBlob;             {Cache references}
91    FArray: IArray;
91      FNullIndicator: short;
92      FOwnsSQLData: boolean;
93      FBlobMetaData: IBlobMetaData;
# Line 99 | Line 98 | type
98      FSQLSubType: integer;
99      FSQLData: PByte; {Address of SQL Data in Message Buffer}
100      FSQLNullIndicator: PShort; {Address of null indicator}
101 <    FDataLength: integer;
102 <    FMetadataSize: integer;
101 >    FDataLength: cardinal;
102 >    FMetadataSize: cardinal;
103      FNullable: boolean;
104      FScale: integer;
105      FCharSetID: cardinal;
# Line 117 | Line 116 | type
116       function GetRelationName: AnsiString;  override;
117       function GetScale: integer; override;
118       function GetCharSetID: cardinal; override;
120     function GetCodePage: TSystemCodePage; override;
121     function GetCharSetWidth: integer; override;
119       function GetIsNull: Boolean;   override;
120       function GetIsNullable: boolean; override;
121       function GetSQLData: PByte;  override;
122       function GetDataLength: cardinal; override;
123       function GetSize: cardinal; override;
127     function GetAttachment: IAttachment; override;
124       function GetDefaultTextSQLType: cardinal; override;
125       procedure SetIsNull(Value: Boolean); override;
126       procedure SetIsNullable(Value: Boolean);  override;
127 <     procedure SetSQLData(AValue: PByte; len: cardinal); override;
128 <     procedure SetScale(aValue: integer); override;
129 <     procedure SetDataLength(len: cardinal); override;
134 <     procedure SetSQLType(aValue: cardinal); override;
127 >     procedure InternalSetScale(aValue: integer); override;
128 >     procedure InternalSetDataLength(len: cardinal); override;
129 >     procedure InternalSetSQLType(aValue: cardinal); override;
130       procedure SetCharSetID(aValue: cardinal); override;
131       procedure SetMetaSize(aValue: cardinal); override;
132    public
133      constructor Create(aParent: TIBXSQLDA; aIndex: integer);
134      procedure Changed; override;
135 +    procedure InitColumnMetaData(aMetaData: Firebird.IMessageMetadata);
136      procedure ColumnSQLDataInit;
137      procedure RowChange; override;
138      procedure FreeSQLData;
139 <    function GetAsArray(Array_ID: TISC_QUAD): IArray; override;
139 >    function GetAsArray: IArray; override;
140      function GetAsBlob(Blob_ID: TISC_QUAD; BPB: IBPB): IBlob; override;
141      function GetArrayMetaData: IArrayMetaData; override;
142      function GetBlobMetaData: IBlobMetaData; override;
143      function CreateBlob: IBlob; override;
144 +    procedure SetSQLData(AValue: PByte; len: cardinal); override;
145    end;
146  
147    { TIBXSQLDA }
# Line 158 | Line 155 | type
155   protected
156      FStatement: TFB30Statement;
157      FFirebird30ClientAPI: TFB30ClientAPI;
158 +    FMessageBuffer: PByte; {Message Buffer}
159 +    FMsgLength: integer; {Message Buffer length}
160      function GetTransactionSeqNo: integer; override;
161      procedure FreeXSQLDA; virtual;
162      function GetStatement: IStatement; override;
163      function GetPrepareSeqNo: integer; override;
164      procedure SetCount(Value: Integer); override;
165 +    procedure AllocMessageBuffer(len: integer); virtual;
166 +    procedure FreeMessageBuffer; virtual;
167    public
168 <    constructor Create(aStatement: TFB30Statement);
168 >    constructor Create(aStatement: TFB30Statement); overload;
169 >    constructor Create(api: IFirebirdAPI); overload;
170      destructor Destroy; override;
171      procedure Changed; virtual;
172      function CheckStatementStatus(Request: TStatementStatus): boolean; override;
173      function ColumnsInUseCount: integer; override;
174 <    function GetTransaction: TFB30Transaction; virtual;
174 >    function GetMetaData: Firebird.IMessageMetadata; virtual;
175      procedure Initialize; override;
176      function StateChanged(var ChangeSeqNo: integer): boolean; override;
177      function CanChangeMetaData: boolean; override;
176    property MetaData: Firebird.IMessageMetadata read FMetaData;
178      property Count: Integer read FCount write SetCount;
179      property Statement: TFB30Statement read FStatement;
180    end;
# Line 182 | Line 183 | type
183  
184    TIBXINPUTSQLDA = class(TIBXSQLDA)
185    private
185    FMessageBuffer: PByte; {Message Buffer}
186    FMsgLength: integer; {Message Buffer length}
186      FCurMetaData: Firebird.IMessageMetadata;
188    procedure FreeMessageBuffer;
187      procedure FreeCurMetaData;
188      function GetMessageBuffer: PByte;
191    function GetMetaData: Firebird.IMessageMetadata;
189      function GetModified: Boolean;
190      function GetMsgLength: integer;
191      procedure BuildMetadata;
195    procedure PackBuffer;
192    protected
193 +    procedure PackBuffer;
194      procedure FreeXSQLDA; override;
195    public
196 <    constructor Create(aStatement: TFB30Statement);
196 >    constructor Create(aStatement: TFB30Statement); overload;
197 >    constructor Create(api: IFirebirdAPI); overload;
198      destructor Destroy; override;
199      procedure Bind(aMetaData: Firebird.IMessageMetadata);
200      procedure Changed; override;
201 +    function GetMetaData: Firebird.IMessageMetadata; override;
202      procedure ReInitialise;
203      function IsInputDataArea: boolean; override;
205    property MetaData: Firebird.IMessageMetadata read GetMetaData;
204      property MessageBuffer: PByte read GetMessageBuffer;
205      property MsgLength: integer read GetMsgLength;
206    end;
# Line 212 | Line 210 | type
210    TIBXOUTPUTSQLDA = class(TIBXSQLDA)
211    private
212      FTransaction: TFB30Transaction; {transaction used to execute the statement}
215    FMessageBuffer: PByte; {Message Buffer}
216    FMsgLength: integer; {Message Buffer length}
213    protected
214 <    procedure FreeXSQLDA; override;
214 >    function GetTransaction: ITransaction; override;
215    public
216      procedure Bind(aMetaData: Firebird.IMessageMetadata);
217      procedure GetData(index: integer; var aIsNull: boolean; var len: short;
# Line 231 | Line 227 | type
227    private
228      FResults: TIBXOUTPUTSQLDA;
229      FCursorSeqNo: integer;
230 +    procedure RowChange;
231    public
232      constructor Create(aResults: TIBXOUTPUTSQLDA);
233      destructor Destroy; override;
234      {IResultSet}
235 <    function FetchNext: boolean;
235 >    function FetchNext: boolean; {fetch next record}
236 >    function FetchPrior: boolean; {fetch previous record}
237 >    function FetchFirst:boolean; {fetch first record}
238 >    function FetchLast: boolean; {fetch last record}
239 >    function FetchAbsolute(position: Integer): boolean; {fetch record by its absolute position in result set}
240 >    function FetchRelative(offset: Integer): boolean; {fetch record by position relative to current}
241      function GetCursorName: AnsiString;
242 <    function GetTransaction: ITransaction; override;
242 >    function IsBof: boolean;
243      function IsEof: boolean;
244      procedure Close;
245    end;
# Line 259 | Line 261 | type
261      function getUpdated: integer;
262    end;
263  
264 +  TFetchType = (ftNext,ftPrior,ftFirst,ftLast,ftAbsolute,ftRelative);
265 +
266    { TFB30Statement }
267  
268    TFB30Statement = class(TFBStatement,IStatement)
# Line 269 | Line 273 | type
273      FSQLRecord: TIBXOUTPUTSQLDA;
274      FResultSet: Firebird.IResultSet;
275      FCursorSeqNo: integer;
276 +    FCursor: AnsiString;
277      FBatch: Firebird.IBatch;
278      FBatchCompletion: IBatchCompletion;
279      FBatchRowCount: integer;
# Line 279 | Line 284 | type
284      procedure CheckHandle; override;
285      procedure CheckBatchModeAvailable;
286      procedure GetDSQLInfo(info_request: byte; buffer: ISQLInfoResults); override;
287 <    procedure InternalPrepare; override;
287 >    function GetStatementIntf: IStatement; override;
288 >    procedure InternalPrepare(CursorName: AnsiString=''); override;
289      function InternalExecute(aTransaction: ITransaction): IResults; override;
290 <    function InternalOpenCursor(aTransaction: ITransaction): IResultSet; override;
290 >    function InternalOpenCursor(aTransaction: ITransaction; Scrollable: boolean
291 >      ): IResultSet; override;
292      procedure ProcessSQL(sql: AnsiString; GenerateParamNames: boolean; var processedSQL: AnsiString); override;
293      procedure FreeHandle; override;
294      procedure InternalClose(Force: boolean); override;
295      function SavePerfStats(var Stats: TPerfStatistics): boolean;
296    public
297      constructor Create(Attachment: TFB30Attachment; Transaction: ITransaction;
298 <      sql: AnsiString; aSQLDialect: integer);
298 >      sql: AnsiString; aSQLDialect: integer; CursorName: AnsiString='');
299      constructor CreateWithParameterNames(Attachment: TFB30Attachment; Transaction: ITransaction;
300        sql: AnsiString;  aSQLDialect: integer; GenerateParamNames: boolean =false;
301 <      CaseSensitiveParams: boolean=false);
301 >      CaseSensitiveParams: boolean=false; CursorName: AnsiString='');
302      destructor Destroy; override;
303 <    function FetchNext: boolean;
303 >    function Fetch(FetchType: TFetchType; PosOrOffset: integer=0): boolean;
304      property StatementIntf: Firebird.IStatement read FStatementIntf;
305 +    property SQLParams: TIBXINPUTSQLDA read FSQLParams;
306 +    property SQLRecord: TIBXOUTPUTSQLDA read FSQLRecord;
307  
308    public
309      {IStatement}
# Line 302 | Line 311 | type
311      function GetMetaData: IMetaData; override;
312      function GetPlan: AnsiString;
313      function IsPrepared: boolean;
314 +    function GetFlags: TStatementFlags; override;
315      function CreateBlob(column: TColumnMetaData): IBlob; override;
316      function CreateArray(column: TColumnMetaData): IArray; override;
317      procedure SetRetainInterfaces(aValue: boolean); override;
# Line 418 | Line 428 | begin
428      status := MasterIntf.getStatus;
429      FCompletionState.getStatus(StatusIntf,status,updateNo);
430      Check4DataBaseError;
431 <    Result := FormatFBStatus(status);
431 >    Result := FormatStatus(status);
432    end;
433   end;
434  
# Line 450 | Line 460 | begin
460    TIBXSQLDA(Parent).Changed;
461   end;
462  
463 + procedure TIBXSQLVAR.InitColumnMetaData(aMetaData: Firebird.IMessageMetadata);
464 + begin
465 +  with FFirebird30ClientAPI do
466 +  begin
467 +    FSQLType := aMetaData.getType(StatusIntf,Index);
468 +    Check4DataBaseError;
469 +    if FSQLType = SQL_BLOB then
470 +    begin
471 +      FSQLSubType := aMetaData.getSubType(StatusIntf,Index);
472 +      Check4DataBaseError;
473 +    end
474 +    else
475 +      FSQLSubType := 0;
476 +    FDataLength := aMetaData.getLength(StatusIntf,Index);
477 +    Check4DataBaseError;
478 +    FMetadataSize := FDataLength;
479 +    FRelationName := strpas(aMetaData.getRelation(StatusIntf,Index));
480 +    Check4DataBaseError;
481 +    FFieldName := strpas(aMetaData.getField(StatusIntf,Index));
482 +    Check4DataBaseError;
483 +    FNullable := aMetaData.isNullable(StatusIntf,Index);
484 +    Check4DataBaseError;
485 +    FScale := aMetaData.getScale(StatusIntf,Index);
486 +    Check4DataBaseError;
487 +    FCharSetID :=  aMetaData.getCharSet(StatusIntf,Index) and $FF;
488 +    Check4DataBaseError;
489 +  end;
490 + end;
491 +
492   procedure TIBXSQLVAR.ColumnSQLDataInit;
493   begin
494    FreeSQLData;
# Line 495 | Line 534 | begin
534   end;
535  
536   function TIBXSQLVAR.GetAliasName: AnsiString;
537 + var metadata: Firebird.IMessageMetadata;
538   begin
539 <  with FFirebird30ClientAPI do
540 <  begin
541 <    result := strpas(TIBXSQLDA(Parent).MetaData.getAlias(StatusIntf,Index));
542 <    Check4DataBaseError;
539 >  metadata := TIBXSQLDA(Parent).GetMetaData;
540 >  try
541 >    with FFirebird30ClientAPI do
542 >    begin
543 >      result := strpas(metaData.getAlias(StatusIntf,Index));
544 >      Check4DataBaseError;
545 >    end;
546 >  finally
547 >    metadata.release;
548    end;
549   end;
550  
# Line 509 | Line 554 | begin
554   end;
555  
556   function TIBXSQLVAR.GetOwnerName: AnsiString;
557 + var metadata: Firebird.IMessageMetadata;
558   begin
559 <  with FFirebird30ClientAPI do
560 <  begin
561 <    result := strpas(TIBXSQLDA(Parent).MetaData.getOwner(StatusIntf,Index));
562 <    Check4DataBaseError;
559 >  metadata := TIBXSQLDA(Parent).GetMetaData;
560 >  try
561 >    with FFirebird30ClientAPI do
562 >    begin
563 >      result := strpas(metaData.getOwner(StatusIntf,Index));
564 >      Check4DataBaseError;
565 >    end;
566 >  finally
567 >    metadata.release;
568    end;
569   end;
570  
# Line 548 | Line 599 | begin
599    end;
600   end;
601  
551 function TIBXSQLVAR.GetCodePage: TSystemCodePage;
552 begin
553  result := CP_NONE;
554  with Statement.GetAttachment do
555     CharSetID2CodePage(GetCharSetID,result);
556 end;
557
558 function TIBXSQLVAR.GetCharSetWidth: integer;
559 begin
560  result := 1;
561  with Statement.GetAttachment DO
562    CharSetWidth(GetCharSetID,result);
563 end;
564
602   function TIBXSQLVAR.GetIsNull: Boolean;
603   begin
604    Result := IsNullable and (FSQLNullIndicator^ = -1);
# Line 587 | Line 624 | begin
624    Result := FMetadataSize;
625   end;
626  
590 function TIBXSQLVAR.GetAttachment: IAttachment;
591 begin
592  Result := FStatement.GetAttachment;
593 end;
594
627   function TIBXSQLVAR.GetArrayMetaData: IArrayMetaData;
628   begin
629    if GetSQLType <> SQL_ARRAY then
630      IBError(ibxeInvalidDataConversion,[nil]);
631  
632    if FArrayMetaData = nil then
633 <    FArrayMetaData := TFB30ArrayMetaData.Create(FStatement.GetAttachment as TFB30Attachment,
634 <                FStatement.GetTransaction as TFB30Transaction,
633 >    FArrayMetaData := TFB30ArrayMetaData.Create(GetAttachment as TFB30Attachment,
634 >                GetTransaction as TFB30Transaction,
635                  GetRelationName,GetFieldName);
636    Result := FArrayMetaData;
637   end;
# Line 610 | Line 642 | begin
642      IBError(ibxeInvalidDataConversion,[nil]);
643  
644    if FBlobMetaData = nil then
645 <    FBlobMetaData := TFB30BlobMetaData.Create(FStatement.GetAttachment as TFB30Attachment,
646 <              FStatement.GetTransaction as TFB30Transaction,
645 >    FBlobMetaData := TFB30BlobMetaData.Create(GetAttachment as TFB30Attachment,
646 >              GetTransaction as TFB30Transaction,
647                GetRelationName,GetFieldName,
648                GetSubType);
649    (FBlobMetaData as TFBBlobMetaData).SetCharSetID(GetCharSetID);
# Line 654 | Line 686 | begin
686    Changed;
687   end;
688  
689 < procedure TIBXSQLVAR.SetScale(aValue: integer);
689 > procedure TIBXSQLVAR.InternalSetScale(aValue: integer);
690   begin
691    FScale := aValue;
692    Changed;
693   end;
694  
695 < procedure TIBXSQLVAR.SetDataLength(len: cardinal);
695 > procedure TIBXSQLVAR.InternalSetDataLength(len: cardinal);
696   begin
697    if not FOwnsSQLData then
698      FSQLData := nil;
# Line 671 | Line 703 | begin
703    Changed;
704   end;
705  
706 < procedure TIBXSQLVAR.SetSQLType(aValue: cardinal);
706 > procedure TIBXSQLVAR.InternalSetSQLType(aValue: cardinal);
707   begin
676  if (FSQLType <> aValue) and not CanChangeSQLType then
677    IBError(ibxeSQLTypeUnchangeable,[TSQLDataItem.GetSQLTypeName(FSQLType),TSQLDataItem.GetSQLTypeName(aValue)]);
708    FSQLType := aValue;
709    Changed;
710   end;
# Line 708 | Line 738 | procedure TIBXSQLVAR.RowChange;
738   begin
739    inherited;
740    FBlob := nil;
711  FArray := nil;
741   end;
742  
743   procedure TIBXSQLVAR.FreeSQLData;
# Line 719 | Line 748 | begin
748    FOwnsSQLData := true;
749   end;
750  
751 < function TIBXSQLVAR.GetAsArray(Array_ID: TISC_QUAD): IArray;
751 > function TIBXSQLVAR.GetAsArray: IArray;
752   begin
753    if SQLType <> SQL_ARRAY then
754      IBError(ibxeInvalidDataConversion,[nil]);
# Line 728 | Line 757 | begin
757      Result := nil
758    else
759    begin
760 <    if FArray = nil then
761 <      FArray := TFB30Array.Create(FStatement.GetAttachment as TFB30Attachment,
762 <                                TIBXSQLDA(Parent).GetTransaction,
763 <                                GetArrayMetaData,Array_ID);
764 <    Result := FArray;
760 >    if FArrayIntf = nil then
761 >      FArrayIntf := TFB30Array.Create(GetAttachment as TFB30Attachment,
762 >                                GetTransaction as TFB30Transaction,
763 >                                GetArrayMetaData,PISC_QUAD(SQLData)^);
764 >    Result := FArrayIntf;
765    end;
766   end;
767  
# Line 747 | Line 776 | begin
776      if IsNull then
777        Result := nil
778      else
779 <      Result := TFB30Blob.Create(FStatement.GetAttachment as TFB30Attachment,
780 <                               TIBXSQLDA(Parent).GetTransaction,
779 >      Result := TFB30Blob.Create(GetAttachment as TFB30Attachment,
780 >                               GetTransaction as TFB30Transaction,
781                                 GetBlobMetaData,
782                                 Blob_ID,BPB);
783      FBlob := Result;
# Line 757 | Line 786 | end;
786  
787   function TIBXSQLVAR.CreateBlob: IBlob;
788   begin
789 <  Result := TFB30Blob.Create(FStatement.GetAttachment as TFB30Attachment,
790 <                             FStatement.GetTransaction as TFB30Transaction,
789 >  Result := TFB30Blob.Create(GetAttachment as TFB30Attachment,
790 >                             GetTransaction as TFB30Transaction,
791                               GetSubType,GetCharSetID,nil);
792   end;
793  
794   { TResultSet }
795  
796 + procedure TResultSet.RowChange;
797 + var i: integer;
798 + begin
799 +  for i := 0 to getCount - 1 do
800 +    FResults.Column[i].RowChange;
801 + end;
802 +
803   constructor TResultSet.Create(aResults: TIBXOUTPUTSQLDA);
804   begin
805    inherited Create(aResults);
# Line 778 | Line 814 | begin
814   end;
815  
816   function TResultSet.FetchNext: boolean;
781 var i: integer;
817   begin
818    CheckActive;
819 <  Result := FResults.FStatement.FetchNext;
819 >  Result := FResults.FStatement.Fetch(ftNext);
820    if Result then
821 <    for i := 0 to getCount - 1 do
822 <      FResults.Column[i].RowChange;
821 >    RowChange;
822 > end;
823 >
824 > function TResultSet.FetchPrior: boolean;
825 > begin
826 >  CheckActive;
827 >  Result := FResults.FStatement.Fetch(ftPrior);
828 >  if Result then
829 >    RowChange;
830 > end;
831 >
832 > function TResultSet.FetchFirst: boolean;
833 > begin
834 >  CheckActive;
835 >  Result := FResults.FStatement.Fetch(ftFirst);
836 >  if Result then
837 >    RowChange;
838 > end;
839 >
840 > function TResultSet.FetchLast: boolean;
841 > begin
842 >  CheckActive;
843 >  Result := FResults.FStatement.Fetch(ftLast);
844 >  if Result then
845 >    RowChange;
846 > end;
847 >
848 > function TResultSet.FetchAbsolute(position: Integer): boolean;
849 > begin
850 >  CheckActive;
851 >  Result := FResults.FStatement.Fetch(ftAbsolute,position);
852 >  if Result then
853 >    RowChange;
854 > end;
855 >
856 > function TResultSet.FetchRelative(offset: Integer): boolean;
857 > begin
858 >  CheckActive;
859 >  Result := FResults.FStatement.Fetch(ftRelative,offset);
860 >  if Result then
861 >    RowChange;
862   end;
863  
864   function TResultSet.GetCursorName: AnsiString;
865   begin
866 <  IBError(ibxeNotSupported,[nil]);
793 <  Result := '';
866 >  Result := FResults.FStatement.FCursor;
867   end;
868  
869 < function TResultSet.GetTransaction: ITransaction;
869 > function TResultSet.IsBof: boolean;
870   begin
871 <  Result := FResults.FTransaction;
871 >  Result := FResults.FStatement.FBof;
872   end;
873  
874   function TResultSet.IsEof: boolean;
# Line 824 | Line 897 | begin
897      end;
898   end;
899  
827 procedure TIBXINPUTSQLDA.FreeMessageBuffer;
828 begin
829  if FMessageBuffer <> nil then
830  begin
831    FreeMem(FMessageBuffer);
832    FMessageBuffer := nil;
833  end;
834  FMsgLength := 0;
835 end;
836
900   procedure TIBXINPUTSQLDA.FreeCurMetaData;
901   begin
902    if FCurMetaData <> nil then
# Line 853 | Line 916 | function TIBXINPUTSQLDA.GetMetaData: Fir
916   begin
917    BuildMetadata;
918    Result := FCurMetaData;
919 +  if Result <> nil then
920 +    Result.addRef;
921   end;
922  
923   function TIBXINPUTSQLDA.GetMsgLength: integer;
# Line 864 | Line 929 | end;
929   procedure TIBXINPUTSQLDA.BuildMetadata;
930   var Builder: Firebird.IMetadataBuilder;
931      i: integer;
932 +    version: NativeInt;
933   begin
934    if (FCurMetaData = nil) and (Count > 0) then
935    with FFirebird30ClientAPI do
# Line 874 | Line 940 | begin
940        for i := 0 to Count - 1 do
941        with TIBXSQLVar(Column[i]) do
942        begin
943 <        Builder.setType(StatusIntf,i,FSQLType+1);
943 >        version := Builder.vtable.version;
944 >        if version >= 4 then
945 >        {Firebird 4 or later}
946 >        begin
947 >          Builder.setField(StatusIntf,i,PAnsiChar(Name));
948 >          Check4DataBaseError;
949 >          Builder.setAlias(StatusIntf,i,PAnsiChar(Name));
950 >          Check4DataBaseError;
951 >        end;
952 >        Builder.setType(StatusIntf,i,FSQLType);
953          Check4DataBaseError;
954          Builder.setSubType(StatusIntf,i,FSQLSubType);
955          Check4DataBaseError;
# Line 906 | Line 981 | end;
981   procedure TIBXINPUTSQLDA.PackBuffer;
982   var i: integer;
983      P: PByte;
984 +    MsgLen: cardinal;
985 +    aNullIndicator: short;
986   begin
987    BuildMetadata;
988  
989    if (FMsgLength = 0) and (FCurMetaData <> nil) then
990    with FFirebird30ClientAPI do
991    begin
992 <    FMsgLength := FCurMetaData.getMessageLength(StatusIntf);
992 >    MsgLen := FCurMetaData.getMessageLength(StatusIntf);
993      Check4DataBaseError;
994  
995 <    IBAlloc(FMessageBuffer,0,FMsgLength);
995 >    AllocMessageBuffer(MsgLen);
996  
997      for i := 0 to Count - 1 do
998      with TIBXSQLVar(Column[i]) do
# Line 946 | Line 1023 | begin
1023        begin
1024          Move(FNullIndicator,(FMessageBuffer + FCurMetaData.getNullOffset(StatusIntf,i))^,sizeof(FNullIndicator));
1025          Check4DataBaseError;
1026 +      end
1027 +      else
1028 +      begin
1029 +        aNullIndicator := 0;
1030 +        Move(aNullIndicator,(FMessageBuffer + FCurMetaData.getNullOffset(StatusIntf,i))^,sizeof(aNullIndicator));
1031        end;
1032      end;
1033    end;
# Line 955 | Line 1037 | procedure TIBXINPUTSQLDA.FreeXSQLDA;
1037   begin
1038    inherited FreeXSQLDA;
1039    FreeCurMetaData;
958  FreeMessageBuffer;
1040   end;
1041  
1042   constructor TIBXINPUTSQLDA.Create(aStatement: TFB30Statement);
# Line 964 | Line 1045 | begin
1045    FMessageBuffer := nil;
1046   end;
1047  
1048 + constructor TIBXINPUTSQLDA.Create(api: IFirebirdAPI);
1049 + begin
1050 +  inherited Create(api);
1051 +  FMessageBuffer := nil;
1052 + end;
1053 +
1054   destructor TIBXINPUTSQLDA.Destroy;
1055   begin
1056    FreeXSQLDA;
# Line 974 | Line 1061 | procedure TIBXINPUTSQLDA.Bind(aMetaData:
1061   var i: integer;
1062   begin
1063    FMetaData := aMetaData;
1064 +  FMetaData.AddRef;
1065    with FFirebird30ClientAPI do
1066    begin
1067      Count := aMetadata.getCount(StatusIntf);
# Line 983 | Line 1071 | begin
1071      for i := 0 to Count - 1 do
1072      with TIBXSQLVar(Column[i]) do
1073      begin
1074 <      FSQLType := aMetaData.getType(StatusIntf,i);
1075 <      Check4DataBaseError;
988 <      if FSQLType = SQL_BLOB then
989 <      begin
990 <        FSQLSubType := aMetaData.getSubType(StatusIntf,i);
991 <        Check4DataBaseError;
992 <      end
993 <      else
994 <        FSQLSubType := 0;
995 <      FDataLength := aMetaData.getLength(StatusIntf,i);
996 <      Check4DataBaseError;
997 <      FMetadataSize := FDataLength;
998 <      FNullable := aMetaData.isNullable(StatusIntf,i);
999 <      Check4DataBaseError;
1074 >      InitColumnMetaData(aMetaData);
1075 >      SaveMetaData;
1076        if FNullable then
1077          FSQLNullIndicator := @FNullIndicator
1078        else
1079          FSQLNullIndicator := nil;
1004      FScale := aMetaData.getScale(StatusIntf,i);
1005      Check4DataBaseError;
1006      FCharSetID :=  aMetaData.getCharSet(StatusIntf,i) and $FF;
1007      Check4DataBaseError;
1080        ColumnSQLDataInit;
1081      end;
1082    end;
# Line 1032 | Line 1104 | end;
1104  
1105   { TIBXOUTPUTSQLDA }
1106  
1107 < procedure TIBXOUTPUTSQLDA.FreeXSQLDA;
1107 > function TIBXOUTPUTSQLDA.GetTransaction: ITransaction;
1108   begin
1109 <  inherited FreeXSQLDA;
1110 <  FreeMem(FMessageBuffer);
1111 <  FMessageBuffer := nil;
1112 <  FMsgLength := 0;
1109 >  if FTransaction <> nil then
1110 >    Result := FTransaction
1111 >  else
1112 >    Result := inherited GetTransaction;
1113   end;
1114  
1115   procedure TIBXOUTPUTSQLDA.Bind(aMetaData: Firebird.IMessageMetadata);
1116   var i: integer;
1117 +    MsgLen: cardinal;
1118   begin
1119    FMetaData := aMetaData;
1120 +  FMetaData.AddRef;
1121    with FFirebird30ClientAPI do
1122    begin
1123 <    Count := metadata.getCount(StatusIntf);
1123 >    Count := aMetaData.getCount(StatusIntf);
1124      Check4DataBaseError;
1125      Initialize;
1126  
1127 <    FMsgLength := metaData.getMessageLength(StatusIntf);
1127 >    MsgLen := aMetaData.getMessageLength(StatusIntf);
1128      Check4DataBaseError;
1129 <    IBAlloc(FMessageBuffer,0,FMsgLength);
1129 >    AllocMessageBuffer(MsgLen);
1130  
1131      for i := 0 to Count - 1 do
1132      with TIBXSQLVar(Column[i]) do
1133      begin
1134 <      FSQLType := aMetaData.getType(StatusIntf,i);
1135 <      Check4DataBaseError;
1062 <      if FSQLType = SQL_BLOB then
1063 <      begin
1064 <        FSQLSubType := aMetaData.getSubType(StatusIntf,i);
1065 <        Check4DataBaseError;
1066 <      end
1067 <      else
1068 <        FSQLSubType := 0;
1069 <      FBlob := nil;
1070 <      FArray := nil;
1071 <      FSQLData := FMessageBuffer + metaData.getOffset(StatusIntf,i);
1072 <      Check4DataBaseError;
1073 <      FDataLength := aMetaData.getLength(StatusIntf,i);
1074 <      Check4DataBaseError;
1075 <      FMetadataSize := FDataLength;
1076 <      FRelationName := strpas(aMetaData.getRelation(StatusIntf,i));
1077 <      Check4DataBaseError;
1078 <      FFieldName := strpas(aMetaData.getField(StatusIntf,i));
1079 <      Check4DataBaseError;
1080 <      FNullable := aMetaData.isNullable(StatusIntf,i);
1134 >      InitColumnMetaData(aMetaData);
1135 >      FSQLData := FMessageBuffer + aMetaData.getOffset(StatusIntf,i);
1136        Check4DataBaseError;
1137        if FNullable then
1138        begin
# Line 1086 | Line 1141 | begin
1141        end
1142        else
1143          FSQLNullIndicator := nil;
1144 <      FScale := aMetaData.getScale(StatusIntf,i);
1145 <      Check4DataBaseError;
1091 <      FCharSetID :=  aMetaData.getCharSet(StatusIntf,i) and $FF;
1092 <      Check4DataBaseError;
1144 >      FBlob := nil;
1145 >      FArrayIntf := nil;
1146      end;
1147    end;
1148    SetUniqueRelationName;
# Line 1127 | Line 1180 | begin
1180   //  writeln('Creating ',ClassName);
1181   end;
1182  
1183 + constructor TIBXSQLDA.Create(api: IFirebirdAPI);
1184 + begin
1185 +  inherited Create;
1186 +  FStatement := nil;
1187 +  FSize := 0;
1188 +  FFirebird30ClientAPI := api as TFB30ClientAPI;
1189 + end;
1190 +
1191   destructor TIBXSQLDA.Destroy;
1192   begin
1193    FreeXSQLDA;
# Line 1142 | Line 1203 | end;
1203   function TIBXSQLDA.CheckStatementStatus(Request: TStatementStatus): boolean;
1204   begin
1205    Result := false;
1206 +  if FStatement <> nil then
1207    case Request of
1208    ssPrepared:
1209      Result := FStatement.IsPrepared;
1210  
1211    ssExecuteResults:
1212 <    Result :=FStatement.FSingleResults;
1212 >    Result := FStatement.FSingleResults;
1213  
1214    ssCursorOpen:
1215      Result := FStatement.FOpen;
# Line 1165 | Line 1227 | begin
1227    Result := FCount;
1228   end;
1229  
1168 function TIBXSQLDA.GetTransaction: TFB30Transaction;
1169 begin
1170  Result := FStatement.GetTransaction as TFB30Transaction;
1171 end;
1172
1230   procedure TIBXSQLDA.Initialize;
1231   begin
1232    if FMetaData <> nil then
# Line 1178 | Line 1235 | end;
1235  
1236   function TIBXSQLDA.StateChanged(var ChangeSeqNo: integer): boolean;
1237   begin
1238 <  Result := FStatement.ChangeSeqNo <> ChangeSeqNo;
1238 >  Result := (FStatement <> nil) and (FStatement.ChangeSeqNo <> ChangeSeqNo);
1239    if Result then
1240      ChangeSeqNo := FStatement.ChangeSeqNo;
1241   end;
# Line 1204 | Line 1261 | begin
1261    end;
1262   end;
1263  
1264 + procedure TIBXSQLDA.AllocMessageBuffer(len: integer);
1265 + begin
1266 +  with FFirebird30ClientAPI do
1267 +    IBAlloc(FMessageBuffer,0,len);
1268 +  FMsgLength := len;
1269 + end;
1270 +
1271 + procedure TIBXSQLDA.FreeMessageBuffer;
1272 + begin
1273 +  if FMessageBuffer <> nil then
1274 +  begin
1275 +    FreeMem(FMessageBuffer);
1276 +    FMessageBuffer := nil;
1277 +  end;
1278 +  FMsgLength := 0;
1279 + end;
1280 +
1281 + function TIBXSQLDA.GetMetaData: Firebird.IMessageMetadata;
1282 + begin
1283 +  Result := FMetadata;
1284 +  if Result <> nil then
1285 +    Result.addRef;
1286 + end;
1287 +
1288   function TIBXSQLDA.GetTransactionSeqNo: integer;
1289   begin
1290    Result := FTransactionSeqNo;
# Line 1222 | Line 1303 | begin
1303    FCount := 0;
1304    SetLength(FColumnList,0);
1305    FSize := 0;
1306 +  FreeMessageBuffer;
1307   end;
1308  
1309   function TIBXSQLDA.GetStatement: IStatement;
# Line 1231 | Line 1313 | end;
1313  
1314   function TIBXSQLDA.GetPrepareSeqNo: integer;
1315   begin
1316 <  Result := FStatement.FPrepareSeqNo;
1316 >  if FStatement = nil then
1317 >    Result := 0
1318 >  else
1319 >    Result := FStatement.FPrepareSeqNo;
1320   end;
1321  
1322   { TFB30Statement }
# Line 1271 | Line 1356 | begin
1356    end;
1357   end;
1358  
1359 < procedure TFB30Statement.InternalPrepare;
1359 > function TFB30Statement.GetStatementIntf: IStatement;
1360 > begin
1361 >  Result := self;
1362 > end;
1363 >
1364 > procedure TFB30Statement.InternalPrepare(CursorName: AnsiString);
1365 > var GUID : TGUID;
1366 >    metadata: Firebird.IMessageMetadata;
1367   begin
1368    if FPrepared then
1369      Exit;
1370 +
1371 +  FCursor := CursorName;
1372    if (FSQL = '') then
1373      IBError(ibxeEmptyQuery, [nil]);
1374    try
1375      CheckTransaction(FTransactionIntf);
1376      with FFirebird30ClientAPI do
1377      begin
1378 +      if FCursor = '' then
1379 +      begin
1380 +        CreateGuid(GUID);
1381 +        FCursor := GUIDToString(GUID);
1382 +      end;
1383 +
1384        if FHasParamNames then
1385        begin
1386          if FProcessedSQL = '' then
# Line 1303 | Line 1403 | begin
1403        FSQLStatementType := TIBSQLStatementTypes(FStatementIntf.getType(StatusIntf));
1404        Check4DataBaseError;
1405  
1406 +      if FSQLStatementType = SQLSelect then
1407 +      begin
1408 +        FStatementIntf.setCursorName(StatusIntf,PAnsiChar(FCursor));
1409 +        Check4DataBaseError;
1410 +      end;
1411        { Done getting the type }
1412        case FSQLStatementType of
1413          SQLGetSegment,
# Line 1319 | Line 1424 | begin
1424          SQLExecProcedure:
1425          begin
1426            {set up input sqlda}
1427 <          FSQLParams.Bind(FStatementIntf.getInputMetadata(StatusIntf));
1427 >          metadata := FStatementIntf.getInputMetadata(StatusIntf);
1428            Check4DataBaseError;
1429 +          try
1430 +            FSQLParams.Bind(metadata);
1431 +          finally
1432 +            metadata.release;
1433 +          end;
1434  
1435            {setup output sqlda}
1436            if FSQLStatementType in [SQLSelect, SQLSelectForUpdate,
1437                            SQLExecProcedure] then
1438 <            FSQLRecord.Bind(FStatementIntf.getOutputMetadata(StatusIntf));
1439 <          Check4DataBaseError;
1438 >          begin
1439 >            metadata := FStatementIntf.getOutputMetadata(StatusIntf);
1440 >            Check4DataBaseError;
1441 >            try
1442 >              FSQLRecord.Bind(metadata);
1443 >            finally
1444 >              metadata.release;
1445 >            end;
1446 >          end;
1447          end;
1448        end;
1449      end;
# Line 1340 | Line 1457 | begin
1457      end;
1458    end;
1459    FPrepared := true;
1460 +
1461    FSingleResults := false;
1462    if RetainInterfaces then
1463    begin
# Line 1359 | Line 1477 | end;
1477   function TFB30Statement.InternalExecute(aTransaction: ITransaction): IResults;
1478  
1479    procedure ExecuteQuery(outMetaData: Firebird.IMessageMetaData=nil; outBuffer: pointer=nil);
1480 +  var inMetadata: Firebird.IMessageMetaData;
1481    begin
1482      with FFirebird30ClientAPI do
1483      begin
1484        SavePerfStats(FBeforeStats);
1485 <      FStatementIntf.execute(StatusIntf,
1486 <                             (aTransaction as TFB30Transaction).TransactionIntf,
1487 <                             FSQLParams.MetaData,
1488 <                             FSQLParams.MessageBuffer,
1489 <                             outMetaData,
1490 <                             outBuffer);
1491 <      Check4DataBaseError;
1485 >      inMetadata := FSQLParams.GetMetaData;
1486 >      try
1487 >        FStatementIntf.execute(StatusIntf,
1488 >                               (aTransaction as TFB30Transaction).TransactionIntf,
1489 >                               inMetaData,
1490 >                               FSQLParams.MessageBuffer,
1491 >                               outMetaData,
1492 >                               outBuffer);
1493 >        Check4DataBaseError;
1494 >      finally
1495 >        if inMetadata <> nil then
1496 >          inMetadata.release;
1497 >      end;
1498        FStatisticsAvailable := SavePerfStats(FAfterStats);
1499      end;
1500    end;
1501  
1502 + var Cursor: IResultSet;
1503 +    outMetadata: Firebird.IMessageMetaData;
1504  
1505   begin
1506    Result := nil;
# Line 1399 | Line 1526 | begin
1526      begin
1527        case FSQLStatementType of
1528        SQLSelect:
1529 <        IBError(ibxeIsAExecuteProcedure,[]);
1529 >       {e.g. Update...returning with a single row in Firebird 5 and later}
1530 >      begin
1531 >        Cursor := InternalOpenCursor(aTransaction,false);
1532 >        if not Cursor.IsEof then
1533 >          Cursor.FetchNext;
1534 >        Result := Cursor; {note only first row}
1535 >        FSingleResults := true;
1536 >      end;
1537  
1538        SQLExecProcedure:
1539        begin
1540 <        ExecuteQuery(FSQLRecord.MetaData,FSQLRecord.MessageBuffer);
1541 <        Result := TResults.Create(FSQLRecord);
1542 <        FSingleResults := true;
1540 >        outMetadata := FSQLRecord.GetMetaData;
1541 >        try
1542 >          ExecuteQuery(outMetadata,FSQLRecord.MessageBuffer);
1543 >          Result := TResults.Create(FSQLRecord);
1544 >          FSingleResults := true;
1545 >        finally
1546 >          if outMetadata <> nil then
1547 >            outMetadata.release;
1548 >        end;
1549        end;
1550  
1551        else
# Line 1423 | Line 1563 | begin
1563    Inc(FChangeSeqNo);
1564   end;
1565  
1566 < function TFB30Statement.InternalOpenCursor(aTransaction: ITransaction
1567 <  ): IResultSet;
1566 > function TFB30Statement.InternalOpenCursor(aTransaction: ITransaction;
1567 >  Scrollable: boolean): IResultSet;
1568 > var flags: cardinal;
1569 >    inMetadata,
1570 >    outMetadata: Firebird.IMessageMetadata;
1571   begin
1572 <  if FSQLStatementType <> SQLSelect then
1572 >  flags := 0;
1573 >  if (FSQLStatementType <> SQLSelect) and not (stHasCursor in getFlags) then
1574     IBError(ibxeIsASelectStatement,[]);
1575  
1576    FBatchCompletion := nil;
# Line 1439 | Line 1583 | begin
1583    if FStaleReferenceChecks and (FSQLParams.FTransactionSeqNo < (FTransactionIntf as TFB30transaction).TransactionSeqNo) then
1584      IBError(ibxeInterfaceOutofDate,[nil]);
1585  
1586 + if Scrollable then
1587 +   flags := Firebird.IStatement.CURSOR_TYPE_SCROLLABLE;
1588 +
1589   with FFirebird30ClientAPI do
1590   begin
1591     if FCollectStatistics then
# Line 1449 | Line 1596 | begin
1596       Check4DataBaseError;
1597     end;
1598  
1599 <   FResultSet := FStatementIntf.openCursor(StatusIntf,
1599 >   inMetadata := FSQLParams.GetMetaData;
1600 >   outMetadata := FSQLRecord.GetMetaData;
1601 >   try
1602 >     FResultSet := FStatementIntf.openCursor(StatusIntf,
1603                            (aTransaction as TFB30Transaction).TransactionIntf,
1604 <                          FSQLParams.MetaData,
1604 >                          inMetaData,
1605                            FSQLParams.MessageBuffer,
1606 <                          FSQLRecord.MetaData,
1607 <                          0);
1608 <   Check4DataBaseError;
1606 >                          outMetaData,
1607 >                          flags);
1608 >     Check4DataBaseError;
1609 >   finally
1610 >     if inMetadata <> nil then
1611 >       inMetadata.release;
1612 >     if outMetadata <> nil then
1613 >       outMetadata.release;
1614 >   end;
1615  
1616     if FCollectStatistics then
1617     begin
# Line 1500 | Line 1656 | begin
1656      FStatementIntf := nil;
1657      FPrepared := false;
1658    end;
1659 +  FCursor := '';
1660   end;
1661  
1662   procedure TFB30Statement.InternalClose(Force: boolean);
# Line 1545 | Line 1702 | begin
1702   end;
1703  
1704   constructor TFB30Statement.Create(Attachment: TFB30Attachment;
1705 <  Transaction: ITransaction; sql: AnsiString; aSQLDialect: integer);
1705 >  Transaction: ITransaction; sql: AnsiString; aSQLDialect: integer;
1706 >  CursorName: AnsiString);
1707   begin
1708    inherited Create(Attachment,Transaction,sql,aSQLDialect);
1709    FFirebird30ClientAPI := Attachment.Firebird30ClientAPI;
1710    FSQLParams := TIBXINPUTSQLDA.Create(self);
1711    FSQLRecord := TIBXOUTPUTSQLDA.Create(self);
1712 <  InternalPrepare;
1712 >  InternalPrepare(CursorName);
1713   end;
1714  
1715   constructor TFB30Statement.CreateWithParameterNames(
1716    Attachment: TFB30Attachment; Transaction: ITransaction; sql: AnsiString;
1717    aSQLDialect: integer; GenerateParamNames: boolean;
1718 <  CaseSensitiveParams: boolean);
1718 >  CaseSensitiveParams: boolean; CursorName: AnsiString);
1719   begin
1720    inherited CreateWithParameterNames(Attachment,Transaction,sql,aSQLDialect,GenerateParamNames);
1721    FFirebird30ClientAPI := Attachment.Firebird30ClientAPI;
1722    FSQLParams := TIBXINPUTSQLDA.Create(self);
1723    FSQLParams.CaseSensitiveParams := CaseSensitiveParams;
1724    FSQLRecord := TIBXOUTPUTSQLDA.Create(self);
1725 <  InternalPrepare;
1725 >  InternalPrepare(CursorName);
1726   end;
1727  
1728   destructor TFB30Statement.Destroy;
# Line 1574 | Line 1732 | begin
1732    if assigned(FSQLRecord) then FSQLRecord.Free;
1733   end;
1734  
1735 < function TFB30Statement.FetchNext: boolean;
1735 > function TFB30Statement.Fetch(FetchType: TFetchType; PosOrOffset: integer
1736 >  ): boolean;
1737   var fetchResult: integer;
1738   begin
1739 <  result := false;
1739 >    result := false;
1740    if not FOpen then
1741      IBError(ibxeSQLClosed, [nil]);
1583  if FEOF then
1584    IBError(ibxeEOF,[nil]);
1742  
1743    with FFirebird30ClientAPI do
1744    begin
1745 <    { Go to the next record... }
1746 <    fetchResult := FResultSet.fetchNext(StatusIntf,FSQLRecord.MessageBuffer);
1747 <    if fetchResult = Firebird.IStatus.RESULT_NO_DATA then
1748 <    begin
1749 <      FBOF := false;
1750 <      FEOF := true;
1751 <      Exit; {End of File}
1752 <    end
1753 <    else
1754 <    if fetchResult <> Firebird.IStatus.RESULT_OK then
1755 <    begin
1756 <      try
1757 <        IBDataBaseError;
1758 <      except
1759 <        Close;
1760 <        raise;
1745 >    case FetchType of
1746 >    ftNext:
1747 >      begin
1748 >        if FEOF then
1749 >          IBError(ibxeEOF,[nil]);
1750 >        { Go to the next record... }
1751 >        fetchResult := FResultSet.fetchNext(StatusIntf,FSQLRecord.MessageBuffer);
1752 >        Check4DataBaseError;
1753 >        if fetchResult = Firebird.IStatus.RESULT_NO_DATA then
1754 >        begin
1755 >          FBOF := false;
1756 >          FEOF := true;
1757 >          Exit; {End of File}
1758 >        end
1759 >      end;
1760 >
1761 >    ftPrior:
1762 >      begin
1763 >        if FBOF then
1764 >          IBError(ibxeBOF,[nil]);
1765 >        { Go to the next record... }
1766 >        fetchResult := FResultSet.fetchPrior(StatusIntf,FSQLRecord.MessageBuffer);
1767 >        Check4DataBaseError;
1768 >        if fetchResult = Firebird.IStatus.RESULT_NO_DATA then
1769 >        begin
1770 >          FBOF := true;
1771 >          FEOF := false;
1772 >          Exit; {Top of File}
1773 >        end
1774 >      end;
1775 >
1776 >    ftFirst:
1777 >      begin
1778 >        fetchResult := FResultSet.fetchFirst(StatusIntf,FSQLRecord.MessageBuffer);
1779 >        Check4DataBaseError;
1780 >      end;
1781 >
1782 >    ftLast:
1783 >      begin
1784 >        fetchResult := FResultSet.fetchLast(StatusIntf,FSQLRecord.MessageBuffer);
1785 >        Check4DataBaseError;
1786 >      end;
1787 >
1788 >    ftAbsolute:
1789 >      begin
1790 >        fetchResult := FResultSet.fetchAbsolute(StatusIntf,PosOrOffset,FSQLRecord.MessageBuffer);
1791 >        Check4DataBaseError;
1792 >      end;
1793 >
1794 >    ftRelative:
1795 >      begin
1796 >        fetchResult := FResultSet.fetchRelative(StatusIntf,PosOrOffset,FSQLRecord.MessageBuffer);
1797 >        Check4DataBaseError;
1798        end;
1605    end
1606    else
1607    begin
1608      FBOF := false;
1609      result := true;
1799      end;
1800 +
1801 +    if fetchResult <> Firebird.IStatus.RESULT_OK then
1802 +      exit; {result = false}
1803 +
1804 +    {Result OK}
1805 +    FBOF := false;
1806 +    FEOF := false;
1807 +    result := true;
1808 +
1809      if FCollectStatistics then
1810      begin
1811        UtilIntf.getPerfCounters(StatusIntf,
# Line 1693 | Line 1891 | end;
1891  
1892   procedure TFB30Statement.AddToBatch;
1893   var BatchPB: TXPBParameterBlock;
1894 +    inMetadata: Firebird.IMessageMetadata;
1895  
1896   const SixteenMB = 16 * 1024 * 1024;
1897 +      MB256 = 256* 1024 *1024;
1898   begin
1899    FBatchCompletion := nil;
1900    if not FPrepared then
1901      InternalPrepare;
1902    CheckHandle;
1903    CheckBatchModeAvailable;
1904 <  with FFirebird30ClientAPI do
1905 <  begin
1906 <    if FBatch = nil then
1904 >  inMetadata := FSQLParams.GetMetaData;
1905 >  try
1906 >    with FFirebird30ClientAPI do
1907      begin
1908 <      {Start Batch}
1909 <      BatchPB := TXPBParameterBlock.Create(FFirebird30ClientAPI,Firebird.IXpbBuilder.BATCH);
1910 <      with FFirebird30ClientAPI do
1911 <      try
1912 <        FBatchBufferSize := FBatchRowLimit * FSQLParams.MetaData.getAlignedLength(StatusIntf);
1913 <        Check4DatabaseError;
1914 <        if FBatchBufferSize < SixteenMB then
1915 <          FBatchBufferSize := SixteenMB;
1916 <        if FBatchBufferSize > 256 * 1024 *1024 {assumed limit} then
1917 <          IBError(ibxeBatchBufferSizeTooBig,[FBatchBufferSize]);
1918 <
1919 <        BatchPB.insertInt(Firebird.IBatch.TAG_RECORD_COUNTS,1);
1920 <        BatchPB.insertInt(Firebird.IBatch.TAG_BUFFER_BYTES_SIZE,FBatchBufferSize);
1921 <        FBatch := FStatementIntf.createBatch(StatusIntf,
1922 <                                             FSQLParams.MetaData,
1923 <                                             BatchPB.getDataLength,
1924 <                                             BatchPB.getBuffer);
1925 <        Check4DataBaseError;
1908 >      if FBatch = nil then
1909 >      begin
1910 >        {Start Batch}
1911 >        BatchPB := TXPBParameterBlock.Create(FFirebird30ClientAPI,Firebird.IXpbBuilder.BATCH);
1912 >        with FFirebird30ClientAPI do
1913 >        try
1914 >          if FBatchRowLimit = maxint then
1915 >            FBatchBufferSize := MB256
1916 >          else
1917 >          begin
1918 >            FBatchBufferSize := FBatchRowLimit * inMetadata.getAlignedLength(StatusIntf);
1919 >            Check4DatabaseError;
1920 >            if FBatchBufferSize < SixteenMB then
1921 >              FBatchBufferSize := SixteenMB;
1922 >            if FBatchBufferSize > MB256 {assumed limit} then
1923 >              IBError(ibxeBatchBufferSizeTooBig,[FBatchBufferSize]);
1924 >          end;
1925 >          BatchPB.insertInt(Firebird.IBatch.TAG_RECORD_COUNTS,1);
1926 >          BatchPB.insertInt(Firebird.IBatch.TAG_BUFFER_BYTES_SIZE,FBatchBufferSize);
1927 >          FBatch := FStatementIntf.createBatch(StatusIntf,
1928 >                                               inMetadata,
1929 >                                               BatchPB.getDataLength,
1930 >                                               BatchPB.getBuffer);
1931 >          Check4DataBaseError;
1932  
1933 <      finally
1934 <        BatchPB.Free;
1933 >        finally
1934 >          BatchPB.Free;
1935 >        end;
1936 >        FBatchRowCount := 0;
1937 >        FBatchBufferUsed := 0;
1938        end;
1730      FBatchRowCount := 0;
1731      FBatchBufferUsed := 0;
1732    end;
1939  
1940 <    Inc(FBatchRowCount);
1941 <    Inc(FBatchBufferUsed,FSQLParams.MetaData.getAlignedLength(StatusIntf));
1942 <    Check4DataBaseError;
1943 <    if FBatchBufferUsed > FBatchBufferSize then
1944 <      raise EIBBatchBufferOverflow.Create(Ord(ibxeBatchRowBufferOverflow),
1945 <                              Format(GetErrorMessage(ibxeBatchRowBufferOverflow),
1946 <                              [FBatchRowCount,FBatchBufferSize]));
1940 >      Inc(FBatchRowCount);
1941 >      Inc(FBatchBufferUsed,inMetadata.getAlignedLength(StatusIntf));
1942 >      Check4DataBaseError;
1943 >      if FBatchBufferUsed > FBatchBufferSize then
1944 >        raise EIBBatchBufferOverflow.Create(Ord(ibxeBatchRowBufferOverflow),
1945 >                                Format(GetErrorMessage(ibxeBatchRowBufferOverflow),
1946 >                                [FBatchRowCount,FBatchBufferSize]));
1947  
1948 <    FBatch.Add(StatusIntf,1,FSQLParams.GetMessageBuffer);
1949 <      Check4DataBaseError
1948 >      FBatch.Add(StatusIntf,1,FSQLParams.GetMessageBuffer);
1949 >        Check4DataBaseError
1950 >    end;
1951 >  finally
1952 >    if inMetadata <> nil then
1953 >      inMetadata.release;
1954    end;
1955   end;
1956  
# Line 1799 | Line 2009 | begin
2009    Result := FStatementIntf <> nil;
2010   end;
2011  
2012 + function TFB30Statement.GetFlags: TStatementFlags;
2013 + var flags: cardinal;
2014 + begin
2015 +  CheckHandle;
2016 +  Result := [];
2017 +  with FFirebird30ClientAPI do
2018 +  begin
2019 +    flags := FStatementIntf.getFlags(StatusIntf);
2020 +    Check4DataBaseError;
2021 +  end;
2022 +  if flags and Firebird.IStatement.FLAG_HAS_CURSOR <> 0 then
2023 +    Result := Result + [stHasCursor];
2024 +  if flags and Firebird.IStatement.FLAG_REPEAT_EXECUTE <> 0 then
2025 +    Result := Result + [stRepeatExecute];
2026 +  if flags and Firebird.IStatement.CURSOR_TYPE_SCROLLABLE <> 0 then
2027 +    Result := Result + [stScrollable];
2028 + end;
2029 +
2030   end.
2031  

Comparing:
ibx/trunk/fbintf/client/3.0/FB30Statement.pas (property svn:eol-style), Revision 347 by tony, Mon Sep 20 22:08:20 2021 UTC vs.
ibx/branches/udr/client/3.0/FB30Statement.pas (property svn:eol-style), Revision 389 by tony, Thu Jan 20 23:33:40 2022 UTC

# Line 0 | Line 1
1 + native

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines