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

Comparing ibx/trunk/fbintf/client/FBClientAPI.pas (file contents):
Revision 308 by tony, Sat Jul 18 10:26:30 2020 UTC vs.
Revision 345 by tony, Mon Aug 23 14:22:29 2021 UTC

# Line 76 | Line 76 | uses
76    Classes,
77      {$IFDEF WINDOWS}Windows, {$ENDIF}
78      {$IFDEF FPC} Dynlibs, {$ENDIF}
79 <   IB, IBHeader, FBActivityMonitor, FBMessages, IBExternals;
79 >   IB, IBHeader, FBActivityMonitor, FBMessages, IBExternals, FmtBCD;
80  
81 < {For Linux see result of GetFirebirdLibList method}
81 > {For Linux see result of GetFirebirdLibListruntime/nongui/winipc.inc method}
82   {$IFDEF DARWIN}
83   const
84   FIREBIRD_SO2 = 'libfbclient.dylib';
# Line 91 | Line 91 | FIREBIRD_EMBEDDED = 'fbembed.dll';
91   {$ENDIF}
92  
93   const
94 +  {fb_shutdown reasons}
95 +  fb_shutrsn_svc_stopped          = -1;
96 +  fb_shutrsn_no_connection        = -2;
97 +  fb_shutrsn_app_stopped          = -3;
98 +  fb_shutrsn_signal               = -5;
99 +  fb_shutrsn_services             = -6;
100 +  fb_shutrsn_exit_called          = -7;
101 +
102 + const
103 +    DefaultTimeZoneFile = '/etc/timezone';
104 +
105 + const
106    IBLocalBufferLength = 512;
107    IBBigLocalBufferLength = IBLocalBufferLength * 2;
108    IBHugeLocalBufferLength = IBBigLocalBufferLength * 20;
# Line 106 | Line 118 | type
118    TFBStatus = class(TFBInterfacedObject)
119    private
120      FIBDataBaseErrorMessages: TIBDataBaseErrorMessages;
121 +    FPrefix: AnsiString;
122    protected
123      FOwner: TFBClientAPI;
124    public
125 <    constructor Create(aOwner: TFBClientAPI);
125 >    constructor Create(aOwner: TFBClientAPI; prefix: AnsiString='');
126      function StatusVector: PStatusVector; virtual; abstract;
127  
128      {IStatus}
129 <    function GetIBErrorCode: Long;
130 <    function Getsqlcode: Long;
129 >    function GetIBErrorCode: TStatusCode;
130 >    function Getsqlcode: TStatusCode;
131      function GetMessage: AnsiString;
132      function CheckStatusVector(ErrorCodes: array of TFBStatusCode): Boolean;
133      function GetIBDataBaseErrorMessages: TIBDataBaseErrorMessages;
# Line 127 | Line 140 | type
140    private
141      class var FEnvSetupDone: boolean;
142      class var FLibraryList: array of IFirebirdLibrary;
143 +  private
144      FFirebirdAPI: IFirebirdAPI;
145      FRequestedLibName: string;
146      function LoadIBLibrary: boolean;
# Line 144 | Line 158 | type
158      destructor Destroy; override;
159      class function GetFBLibrary(aLibPathName: string): IFirebirdLibrary;
160      class procedure FreeLibraries;
161 +    function SameLibrary(aLibName: string): boolean;
162  
163 +  public
164      {IFirebirdLibrary}
165      function GetHandle: TLibHandle;
166      function GetLibraryName: string;
# Line 157 | Line 173 | type
173  
174    TFBClientAPI = class(TFBInterfacedObject)
175    private
176 +    FLocalTimeZoneName: AnsiString; {Informal Time Zone Name from tzname e.g. GMT or BST}
177 +    FTZDataTimeZoneID: AnsiString; {TZData DB ID e.g. Europe/London}
178 +    FLocalTimeOffset: integer;
179 +    FIsDaylightSavingsTime: boolean;
180      class var FIBCS: TRTLCriticalSection;
181 +    function FBTimeStampToDateTime(aDate, aTime: longint): TDateTime;
182 +    procedure GetTZDataSettings;
183    protected
184      FFBLibrary: TFBLibrary;
185      function GetProcAddr(ProcName: PAnsiChar): Pointer;
186 +
187 +  protected type
188 +    Tfb_shutdown = function (timeout: uint;
189 +                                 const reason: int): int;
190 +                   {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
191 +  protected
192 +    {FB Shutdown API}
193 +    fb_shutdown: Tfb_shutdown;
194 +
195    public
196      {Taken from legacy API}
197      isc_sqlcode: Tisc_sqlcode;
# Line 168 | Line 199 | type
199      isc_event_counts: Tisc_event_counts;
200      isc_event_block: Tisc_event_block;
201      isc_free: Tisc_free;
202 +    isc_portable_integer: Tisc_portable_integer;
203  
204      constructor Create(aFBLibrary: TFBLibrary);
205      procedure IBAlloc(var P; OldSize, NewSize: Integer);
206      procedure IBDataBaseError;
207      function LoadInterface: boolean; virtual;
208 +    procedure FBShutdown; virtual;
209      function GetAPI: IFirebirdAPI; virtual; abstract;
210      {$IFDEF UNIX}
211      function GetFirebirdLibList: string; virtual; abstract;
212      {$ENDIF}
213 +    function HasDecFloatSupport: boolean;
214 +    function HasInt128Support: boolean; virtual;
215 +    function HasLocalTZDB: boolean; virtual;
216 +    function HasExtendedTZSupport: boolean; virtual;
217 +    function HasTimeZoneSupport: boolean; virtual;
218  
219 +  public
220 +    property LocalTimeZoneName: AnsiString read FLocalTimeZoneName;
221 +    property TZDataTimeZoneID: AnsiString read FTZDataTimeZoneID;
222 +    property LocalTimeOffset: integer read FLocalTimeOffset;
223 +  public
224      {Encode/Decode}
225      procedure EncodeInteger(aValue: integer; len: integer; buffer: PByte);
226 <    function DecodeInteger(bufptr: PByte; len: short): integer; virtual; abstract;
227 <    procedure SQLEncodeDate(aDate: TDateTime; bufptr: PByte); virtual; abstract;
228 <    function SQLDecodeDate(byfptr: PByte): TDateTime; virtual; abstract;
229 <    procedure SQLEncodeTime(aTime: TDateTime; bufptr: PByte); virtual; abstract;
226 >    function DecodeInteger(bufptr: PByte; len: short): int64;
227 >    procedure SQLEncodeDate(aDate: TDateTime; bufptr: PByte);  virtual; abstract;
228 >    function SQLDecodeDate(byfptr: PByte): TDateTime;  virtual; abstract;
229 >    procedure SQLEncodeTime(aTime: TDateTime; bufptr: PByte);  virtual; abstract;
230      function SQLDecodeTime(bufptr: PByte): TDateTime;  virtual; abstract;
231      procedure SQLEncodeDateTime(aDateTime: TDateTime; bufptr: PByte); virtual; abstract;
232 <    function SQLDecodeDateTime(bufptr: PByte): TDateTime; virtual; abstract;
232 >    function  SQLDecodeDateTime(bufptr: PByte): TDateTime; virtual; abstract;
233      function FormatStatus(Status: TFBStatus): AnsiString; virtual; abstract;
234 +    function Int128ToStr(bufptr: PByte; scale: integer): AnsiString; virtual;
235 +    procedure StrToInt128(scale: integer; aValue: AnsiString; bufptr: PByte);
236 +      virtual;
237 +    procedure SQLDecFloatEncode(aValue: tBCD; SQLType: cardinal; bufptr: PByte); virtual;
238 +    function SQLDecFloatDecode(SQLType: cardinal;  bufptr: PByte): tBCD; virtual;
239  
240      {IFirebirdAPI}
241      function GetStatus: IStatus; virtual; abstract;
# Line 202 | Line 250 | end;
250   implementation
251  
252   uses IBUtils, Registry,
253 <  {$IFDEF Unix} initc, dl, {$ENDIF}
253 >  {$IFDEF Unix} unix, initc, dl, {$ENDIF}
254   {$IFDEF FPC}
255   {$IFDEF WINDOWS }
256   WinDirs,
# Line 235 | Line 283 | end;
283  
284   procedure TFBLibrary.FreeFBLibrary;
285   begin
286 +  (FFirebirdAPI as TFBClientAPI).FBShutdown;
287    if FIBLibrary <> NilHandle then
288      FreeLibrary(FIBLibrary);
289    FIBLibrary := NilHandle;
290 +  FFBLibraryName := '';
291   end;
292  
293   function TFBLibrary.GetLibraryName: string;
# Line 289 | Line 339 | end;
339  
340   destructor TFBLibrary.Destroy;
341   begin
292  FFirebirdAPI := nil;
342    FreeFBLibrary;
343 +  FFirebirdAPI := nil;
344    inherited Destroy;
345   end;
346  
# Line 301 | Line 351 | begin
351    if aLibPathName <> '' then
352    begin
353      for i := 0 to Length(FLibraryList) - 1 do
354 <      if (FLibraryList[i] as TFBLibrary).FRequestedLibName = aLibPathName then
354 >    begin
355 >      if (FLibraryList[i] as TFBLibrary).SameLibrary(aLibPathName) then
356        begin
357          Result := FLibraryList[i];
358          Exit;
359        end;
360 +    end;
361      Result := Create(aLibPathName);
362    end;
363  
# Line 319 | Line 371 | begin
371    SetLength(FLibraryList,0);
372   end;
373  
374 + function TFBLibrary.SameLibrary(aLibName: string): boolean;
375 + begin
376 +  Result := FRequestedLibName = aLibName;
377 + end;
378 +
379   function TFBLibrary.GetHandle: TLibHandle;
380   begin
381    Result := FIBLibrary;
# Line 330 | Line 387 | constructor TFBClientAPI.Create(aFBLibra
387   begin
388    inherited Create;
389    FFBLibrary := aFBLibrary;
390 +  GetTZDataSettings;
391   end;
392  
393   procedure TFBClientAPI.IBAlloc(var P; OldSize, NewSize: Integer);
# Line 345 | Line 403 | begin
403    raise EIBInterBaseError.Create(GetStatus);
404   end;
405  
348 {Under Unixes, if using an embedded server then set up local TMP and LOCK Directories}
349
406   procedure TFBClientAPI.EncodeInteger(aValue: integer; len: integer; buffer: PByte);
407   begin
408    while len > 0 do
# Line 358 | Line 414 | begin
414    end;
415   end;
416  
417 + function TFBClientAPI.DecodeInteger(bufptr: PByte; len: short): int64;
418 + begin
419 +  Result := isc_portable_integer(bufptr,len);
420 + end;
421 +
422 + function TFBClientAPI.Int128ToStr(bufptr: PByte; scale: integer): AnsiString;
423 + begin
424 +  if not HasInt128Support then
425 +    IBError(ibxeNotSupported,[]);
426 + end;
427 +
428 + procedure TFBClientAPI.StrToInt128(scale: integer; aValue: AnsiString; bufptr: PByte);
429 + begin
430 +  if not HasInt128Support then
431 +    IBError(ibxeNotSupported,[]);
432 + end;
433 +
434 + procedure TFBClientAPI.SQLDecFloatEncode(aValue: tBCD; SQLType: cardinal;
435 +  bufptr: PByte);
436 + begin
437 +  if not HasDecFloatSupport then
438 +    IBError(ibxeNotSupported,[]);
439 + end;
440 +
441 + function TFBClientAPI.SQLDecFloatDecode(SQLType: cardinal; bufptr: PByte): tBCD;
442 + begin
443 +  if not HasDecFloatSupport then
444 +    IBError(ibxeNotSupported,[]);
445 + end;
446 +
447   function TFBClientAPI.IsLibraryLoaded: boolean;
448   begin
449    Result := FFBLibrary.IBLibrary <> NilHandle;
# Line 368 | Line 454 | begin
454    Result := FFBLibrary;
455   end;
456  
457 < function TFBClientAPI.GetImplementationVersion: AnsiString;
457 > function TFBClientAPI.FBTimeStampToDateTime(aDate, aTime: longint): TDateTime;
458   begin
459 <  Result := Format('%d.%d',[GetClientMajor,GetClientMinor]);
459 >  {aDate/aTime are in TTimestamp format but aTime is decimilliseconds}
460 >  aDate := aDate - DateDelta;
461 >  if aDate < 0 then
462 >    Result := trunc(aDate) - abs(frac(aTime / (MSecsPerDay*10)))
463 >  else
464 >    Result := trunc(aDate) + abs(frac(aTime / (MSecsPerDay*10)));
465 > end;
466 >
467 > {$IFDEF UNIX}
468 > procedure TFBClientAPI.GetTZDataSettings;
469 > var S: TStringList;
470 > begin
471 >  FLocalTimeOffset := GetLocalTimeOffset;
472 >  FLocalTimeZoneName := strpas(tzname[tzdaylight]);
473 >  FIsDaylightSavingsTime := tzdaylight;
474 >  if FileExists(DefaultTimeZoneFile) then
475 >  begin
476 >    S := TStringList.Create;
477 >    try
478 >      S.LoadFromFile(DefaultTimeZoneFile);
479 >      if S.Count > 0 then
480 >        FTZDataTimeZoneID := S[0];
481 >    finally
482 >      S.Free;
483 >    end;
484 >  end;
485 > end;
486 > {$ENDIF}
487 >
488 > {$IFDEF WINDOWS}
489 > procedure TFBClientAPI.GetTZDataSettings;
490 > var TZInfo: TTimeZoneInformation;
491 > begin
492 >  FIsDaylightSavingsTime := false;
493 >  {is there any way of working out the default TZData DB time zone ID under Windows?}
494 >  case GetTimeZoneInformation(TZInfo) of
495 >    TIME_ZONE_ID_UNKNOWN:
496 >      begin
497 >        FLocalTimeZoneName := '';
498 >        FLocalTimeOffset := 0;
499 >      end;
500 >    TIME_ZONE_ID_STANDARD:
501 >      begin
502 >        FLocalTimeZoneName := strpas(PWideChar(@TZInfo.StandardName));
503 >        FLocalTimeOffset := TZInfo.Bias;
504 >      end;
505 >    TIME_ZONE_ID_DAYLIGHT:
506 >      begin
507 >        FLocalTimeZoneName := strpas(PWideChar(@TZInfo.DaylightName));
508 >        FLocalTimeOffset := TZInfo.DayLightBias;
509 >        FIsDaylightSavingsTime := true;
510 >      end;
511 >  end;
512   end;
513 + {$ENDIF}
514  
515   function TFBClientAPI.GetProcAddr(ProcName: PAnsiChar): Pointer;
516   begin
# Line 380 | Line 519 | begin
519      raise Exception.CreateFmt(SFirebirdAPIFuncNotFound,[ProcName]);
520   end;
521  
522 + function TFBClientAPI.HasDecFloatSupport: boolean;
523 + begin
524 +  Result := GetClientMajor >= 4;
525 + end;
526 +
527 + function TFBClientAPI.HasInt128Support: boolean;
528 + begin
529 +  Result := false;
530 + end;
531 +
532 + function TFBClientAPI.HasLocalTZDB: boolean;
533 + begin
534 +  Result := false;
535 + end;
536 +
537 + function TFBClientAPI.HasExtendedTZSupport: boolean;
538 + begin
539 +  Result := false;
540 + end;
541 +
542 + function TFBClientAPI.HasTimeZoneSupport: boolean;
543 + begin
544 +  Result := false;
545 + end;
546 +
547 + function TFBClientAPI.GetImplementationVersion: AnsiString;
548 + begin
549 +  Result := Format('%d.%d',[GetClientMajor,GetClientMinor]);
550 + end;
551 +
552   function TFBClientAPI.LoadInterface: boolean;
553   begin
554    isc_sqlcode := GetProcAddr('isc_sqlcode'); {do not localize}
# Line 387 | Line 556 | begin
556    isc_event_counts := GetProcAddr('isc_event_counts'); {do not localize}
557    isc_event_block := GetProcAddr('isc_event_block'); {do not localize}
558    isc_free := GetProcAddr('isc_free'); {do not localize}
559 +  isc_portable_integer := GetProcAddr('isc_portable_integer'); {do not localize}
560 +  fb_shutdown := GetProcAddr('fb_shutdown'); {do not localize}
561    Result := assigned(isc_free);
562   end;
563  
564 + procedure TFBClientAPI.FBShutdown;
565 + begin
566 +  if assigned(fb_shutdown) then
567 +    fb_shutdown(0,fb_shutrsn_exit_called);
568 + end;
569 +
570   { TFBStatus }
571  
572 < constructor TFBStatus.Create(aOwner: TFBClientAPI);
572 > constructor TFBStatus.Create(aOwner: TFBClientAPI; prefix: AnsiString);
573   begin
574    inherited Create;
575    FOwner := aOwner;
576 <  FIBDataBaseErrorMessages := [ShowSQLMessage, ShowIBMessage];
576 >  FPrefix := prefix;
577 >  FIBDataBaseErrorMessages := [ShowSQLCode, ShowSQLMessage, ShowIBMessage];
578   end;
579  
580 < function TFBStatus.GetIBErrorCode: Long;
580 > function TFBStatus.GetIBErrorCode: TStatusCode;
581   begin
582    Result := StatusVector^[1];
583   end;
584  
585 < function TFBStatus.Getsqlcode: Long;
585 > function TFBStatus.Getsqlcode: TStatusCode;
586   begin
587    with FOwner do
588      Result := isc_sqlcode(PISC_STATUS(StatusVector));
# Line 415 | Line 593 | var local_buffer: array[0..IBHugeLocalBu
593      IBDataBaseErrorMessages: TIBDataBaseErrorMessages;
594      sqlcode: Long;
595   begin
596 <  Result := '';
596 >  Result := FPrefix;
597    IBDataBaseErrorMessages := FIBDataBaseErrorMessages;
598    sqlcode := Getsqlcode;
599    if (ShowSQLCode in IBDataBaseErrorMessages) then
600      Result := Result + 'SQLCODE: ' + IntToStr(sqlcode); {do not localize}
601  
424  Exclude(IBDataBaseErrorMessages, ShowSQLMessage);
602    if (ShowSQLMessage in IBDataBaseErrorMessages) then
603    begin
604      with FOwner do
605        isc_sql_interprete(sqlcode, local_buffer, sizeof(local_buffer));
606      if (ShowSQLCode in FIBDataBaseErrorMessages) then
607 <      Result := Result + CRLF;
608 <    Result := Result + strpas(local_buffer);
607 >      Result := Result + LineEnding;
608 >    Result := Result + 'Engine Code: ' + IntToStr(GetIBErrorCode) + ' ' + strpas(local_buffer);
609    end;
610  
611    if (ShowIBMessage in IBDataBaseErrorMessages) then
# Line 436 | Line 613 | begin
613      if (ShowSQLCode in IBDataBaseErrorMessages) or
614         (ShowSQLMessage in IBDataBaseErrorMessages) then
615        Result := Result + LineEnding;
616 <    Result := Result + LineEnding + FOwner.FormatStatus(self);
616 >    Result := Result + FOwner.FormatStatus(self);
617    end;
618    if (Result <> '') and (Result[Length(Result)] = '.') then
619      Delete(Result, Length(Result), 1);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines