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

Comparing ibx/trunk/fbintf/client/FBMessages.pas (file contents):
Revision 47 by tony, Mon Jan 9 15:31:51 2017 UTC vs.
Revision 270 by tony, Fri Jan 18 11:10:37 2019 UTC

# Line 60 | Line 60
60   {                                                                        }
61   {************************************************************************}
62   unit FBMessages;
63 + {$IFDEF MSWINDOWS}
64 + {$DEFINE WINDOWS}
65 + {$ENDIF}
66  
67   {$IFDEF FPC}
68 < {$mode objfpc}{$H+}
68 > {$mode delphi}
69   {$codepage UTF8}
70   {$ENDIF}
71  
# Line 237 | Line 240 | type
240        ibxeInvalidParamCount,
241        ibxeInvalidVariantType,
242        ibxeServiceRunning,
243 <      ibxeUniqueRelationReqd
243 >      ibxeUniqueRelationReqd,
244 >      ibxeInterfaceNotSupported,
245 >      ibxeCharacterSetExists,
246 >      ibxeUnknownUserCharSet,
247 >      ibxeUninitializedInputParameter,
248 >      ibxeNegativeGenerator,
249 >      ibxeServiceUnavailable,
250 >      ibxeBadConnectString,
251 >      ibxeServiceNotStarted,
252 >      ibxeNotRequiredDataSetSource,
253 >      ibxeNoLimboTransactionInsert,
254 >      ibxeDatabaseNotConnected,
255 >      ibxeMultiThreadRequired,
256 >      ibxeODSVersionRequired,
257 >      ibxeTokenQueueOverflow,
258 >      ibxeTokenQueueUnderflow,
259 >      ibxErrorParsing,
260 >      ibxeDLInfoError,
261 >      ibxeDifferentAPIs,
262 >      ibxeParameterNameNotFound
263        );
264  
265 < function GetErrorMessage(ErrMess: TIBClientError): string;
265 > function GetErrorMessage(ErrMess: TIBClientError): AnsiString;
266  
267   resourcestring
268    { generic strings used in code }
# Line 260 | Line 282 | resourcestring
282    SDefaultTransaction = '%s, Default';
283    SFirebirdAPIFuncNotFound = 'Unable to load Firebird Client Library Function "%s"';
284    SDatabaseFilter = 'Database Files (*.fdb; *.gdb)|*.gdb; *.fdb|All files (*.*)|*.*';
285 +  {$IFDEF WINDOWS}
286 +  SLibraryNameFilter = 'DLLs (*.dll)|*.dll|All files (*.*)|*.*';
287 +  {$ELSE}
288 +  SLibraryNameFilter = 'All files (*.*)|*.*';
289 +  {$ENDIF}
290    STrue = 'true';
291    SFalse = 'false';
292    SArray = '(array)';
# Line 373 | Line 400 | resourcestring
400    SServerNameMissing = 'Server Name Missing';
401    SQueryParamsError = 'Query Parameters missing or incorrect';
402    SStartParamsError = 'start Parameters missing or incorrect';
403 <  SOutputParsingError = 'Unexpected Output buffer value (%d)';
403 >  SOutputParsingError = 'Unexpected Output buffer value (%d) - %s';
404    SUseSpecificProcedures = 'Generic ServiceStart not applicable: Use Specific Procedures to set configuration params';
405    SSQLMonitorAlreadyPresent = 'SQL Monitor Instance is already present';
406    SDelphiException = 'DelphiException %s';
# Line 433 | Line 460 | resourcestring
460    SInvalidVariantType = 'Invalid variant type';
461    SServiceRunning = 'Cannot start a new service while an existing service is running';
462    SUniqueRelationReqd = 'All Output Fields must derived from the same table';
463 +  SInterfaceNotSupported = 'Interface not supported; Guid %s not found';
464 +  SCharacterSetExists = 'Character set "%s" is already defined';
465 +  SUnknownUserCharSet = 'Unknown user character set "%s"';
466 +  SUninitializedInputParameter = 'SQL Param No. %d (%s) is uninitialised';
467 +  SNegativeGenerator = 'A Generator Increment cannot be negative';
468 +  SServiceUnavailable = 'Request Service is not available';
469 +  SBadConnectString = 'Parse Error in Connect String';
470 +  SServiceNotStarted = 'Cannot Query running service until the service has been started';
471 +  SNotRequiredDataSetSource = 'Object of class %s is not a valid dataset source';
472 +  SNoLimboTransactionInsert = 'You cannot add to a Limbo Transaction list';
473 +  SDatabaseNotConnected = 'Cannot connect using an unattached database';
474 +  SMultiThreadRequired = 'Multi-threading required for %s but not enabled. Please recompile with multi-threading support enabled. '+
475 +                         'Hint: you probably need to add -dUseCThreads to the Custom Options.';
476 +  SODSVersionRequired = 'This feature requires ODS Version %s or later';
477 +  STokenQueueOverflow = 'Error in SQL Token Analyser - token queue overflow';
478 +  STokenQueueUnderflow = 'Error in SQL Token Analyser - token queue underflow';
479 +  SErrorParsing = 'Error parsing SQL Statement at clause starting with %s';
480 +  SDLInfoError = 'dlinfo returned error - %s';
481 +  SDifferentAPIs = 'All transaction attachments must use the same Firebird Library';
482 +  SParameterNameNotFound = 'Parameter Name (%s) not found';
483  
484   const
485    IBErrorMessages: array[TIBClientError] of string = (
# Line 595 | Line 642 | const
642      SInvalidParamCount,
643      SInvalidVariantType,
644      SServiceRunning,
645 <    SUniqueRelationReqd
645 >    SUniqueRelationReqd,
646 >    SInterfaceNotSupported,
647 >    SCharacterSetExists,
648 >    SUnknownUserCharSet,
649 >    SUninitializedInputParameter,
650 >    SNegativeGenerator,
651 >    SServiceUnavailable,
652 >    SBadConnectString,
653 >    SServiceNotStarted,
654 >    SNotRequiredDataSetSource,
655 >    SNoLimboTransactionInsert,
656 >    SDatabaseNotConnected,
657 >    SMultiThreadRequired,
658 >    SODSVersionRequired,
659 >    STokenQueueOverflow,
660 >    STokenQueueUnderflow,
661 >    SErrorParsing,
662 >    SDLInfoError,
663 >    SDifferentAPIs,
664 >    SParameterNameNotFound
665    );
666  
667 < function GetErrorMessage(ErrMess: TIBClientError): string;
667 > function GetErrorMessage(ErrMess: TIBClientError): AnsiString;
668   begin
669    Result := IBErrorMessages[ErrMess];
670   end;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines