소스 검색

Up to now TSQLite3Connection used the variable SQLiteLibraryName to control the name of the SQLite library to use. The sqlite3dyn unit also contains a variable to control the library to use: SQLiteDefaultLibrary. To avoid potential confusion the variable from sqlite3dyn will be used from now on.

packages/fcl-db/src/sqldb/sqlite3/sqlite3conn.pp:
	* Declare SQLiteLibraryName as an absolute alias for SQLiteDefaultLibrary and deprecate it with an approbiate hint
	* TSQLite3Connection.DoInternalConnect & GetConnectionInfo: use SQLiteDefaultLibrary instead of SQLiteLibraryName

git-svn-id: trunk@23708 -
svenbarth 12 년 전
부모
커밋
c7f1569156
1개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp

+ 3 - 3
packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp

@@ -115,7 +115,7 @@ type
   end;
   
 Var
-  SQLiteLibraryName : String = sqlite3lib; 
+  SQLiteLibraryName : String absolute sqlite3dyn.SQLiteDefaultLibrary deprecated 'use sqlite3dyn.SQLiteDefaultLibrary instead';
    
 implementation
 
@@ -732,7 +732,7 @@ var
 begin
   if Length(databasename)=0 then
     DatabaseError(SErrNoDatabaseName,self);
-  InitializeSqlite(SQLiteLibraryName);
+  InitializeSqlite(SQLiteDefaultLibrary);
   str1:= databasename;
   checkerror(sqlite3_open(pchar(str1),@fhandle));
   if (Length(Password)>0) and assigned(sqlite3_key) then
@@ -933,7 +933,7 @@ function TSQLite3Connection.GetConnectionInfo(InfoType: TConnInfoType): string;
 begin
   Result:='';
   try
-    InitializeSqlite(SQLiteLibraryName);
+    InitializeSqlite(SQLiteDefaultLibrary);
     case InfoType of
       citServerType:
         Result:=TSQLite3ConnectionDef.TypeName;