paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-11 20:26:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
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 -
This commit is contained in:
svenbarth 2013-03-07 21:11:40 +00:00
parent da7b24e242
commit c7f1569156
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
View File

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