Browse Source

* Make SqliteVersion a class method

git-svn-id: trunk@12770 -
blikblum 16 years ago
parent
commit
df7a6b0f5d

+ 1 - 2
packages/fcl-db/src/sqlite/customsqliteds.pas

@@ -142,7 +142,6 @@ type
     procedure InternalCloseHandle; virtual; abstract;
     function InternalGetHandle: Pointer; virtual; abstract;
     procedure GetSqliteHandle;
-    function GetSqliteVersion: String; virtual; abstract;
     procedure BuildLinkedList; virtual; abstract;
     procedure FreeItem(AItem: PDataRecord);
     procedure DisposeLinkedList;
@@ -216,6 +215,7 @@ type
     function QuickQuery(const ASql: String; const AStrList: TStrings; FillObjects: Boolean):String; virtual; abstract; overload;
     procedure RefetchData;
     function ReturnString: String; virtual; abstract;
+    class function SqliteVersion: String; virtual; abstract;
     function TableExists: Boolean;
     function TableExists(const ATableName: String): Boolean;
     function UpdatesPending: Boolean;
@@ -230,7 +230,6 @@ type
     property RowsAffected: Integer read GetRowsAffected;
     property ReturnCode: Integer read FReturnCode;
     property SqliteHandle: Pointer read FSqliteHandle;
-    property SqliteVersion: String read GetSqliteVersion;
     property SQLList:TStrings read FSQLList;
    published
     property AutoIncrementKey: Boolean read FAutoIncrementKey write FAutoIncrementKey;

+ 3 - 3
packages/fcl-db/src/sqlite/sqlite3ds.pas

@@ -47,7 +47,6 @@ type
   private
     function SqliteExec(ASQL: PChar; ACallback: TSqliteCdeclCallback; Data: Pointer): Integer; override;
     function InternalGetHandle: Pointer; override;
-    function GetSqliteVersion: String; override;
     procedure InternalCloseHandle; override;
     procedure BuildLinkedList; override;
   protected
@@ -55,8 +54,9 @@ type
     procedure RetrieveFieldDefs; override;
   public
     procedure ExecuteDirect(const ASQL: String); override;
-    function ReturnString: String; override;
     function QuickQuery(const ASQL: String; const AStrList: TStrings; FillObjects: Boolean): String; override;
+    function ReturnString: String; override;
+    class function SqliteVersion: String; override;
   end;
 
 implementation
@@ -328,7 +328,7 @@ begin
   Result := SqliteCode2Str(FReturnCode) + ' - ' + sqlite3_errmsg(FSqliteHandle);
 end;
 
-function TSqlite3Dataset.GetSqliteVersion: String;
+class function TSqlite3Dataset.SqliteVersion: String;
 begin
   Result := String(sqlite3_version());
 end;

+ 3 - 3
packages/fcl-db/src/sqlite/sqliteds.pas

@@ -48,7 +48,6 @@ type
     function SqliteExec(ASQL: PChar; ACallback: TSqliteCdeclCallback; Data: Pointer): Integer; override;
     function InternalGetHandle: Pointer; override;
     function GetSqliteEncoding: String;
-    function GetSqliteVersion: String; override;
     procedure InternalCloseHandle; override;
     procedure BuildLinkedList; override;
   protected
@@ -56,8 +55,9 @@ type
     function GetRowsAffected:Integer; override;
   public
     procedure ExecuteDirect(const ASQL: String); override;
-    function ReturnString: String; override;
     function QuickQuery(const ASQL: String; const AStrList: TStrings; FillObjects: Boolean): String; override;
+    function ReturnString: String; override;
+    class function SqliteVersion: String; override;
     property SqliteEncoding: String read GetSqliteEncoding;
   end;
 
@@ -325,7 +325,7 @@ begin
   Result := String(sqlite_encoding);
 end;
   
-function TSqliteDataset.GetSqliteVersion: String;
+class function TSqliteDataset.SqliteVersion: String;
 begin
   Result := String(sqlite_version);
 end;