|
@@ -141,7 +141,7 @@ begin
|
|
sqlite3_open(PAnsiChar(FFileName), @Result);
|
|
sqlite3_open(PAnsiChar(FFileName), @Result);
|
|
//sqlite3_open returns SQLITE_OK even for invalid files
|
|
//sqlite3_open returns SQLITE_OK even for invalid files
|
|
//do additional check here
|
|
//do additional check here
|
|
- FReturnCode := sqlite3_prepare(Result, CheckFileSql, -1, @vm, nil);
|
|
|
|
|
|
+ FReturnCode := sqlite3_prepare_v2(Result, CheckFileSql, -1, @vm, nil);
|
|
if FReturnCode <> SQLITE_OK then
|
|
if FReturnCode <> SQLITE_OK then
|
|
begin
|
|
begin
|
|
ErrorStr := SqliteCode2Str(FReturnCode) + ' - ' + sqlite3_errmsg(Result);
|
|
ErrorStr := SqliteCode2Str(FReturnCode) + ' - ' + sqlite3_errmsg(Result);
|
|
@@ -163,7 +163,7 @@ begin
|
|
{$endif}
|
|
{$endif}
|
|
FAutoIncFieldNo := -1;
|
|
FAutoIncFieldNo := -1;
|
|
FieldDefs.Clear;
|
|
FieldDefs.Clear;
|
|
- FReturnCode := sqlite3_prepare(FSqliteHandle, PAnsiChar(FEffectiveSQL), -1, @vm, nil);
|
|
|
|
|
|
+ FReturnCode := sqlite3_prepare_v2(FSqliteHandle, PAnsiChar(FEffectiveSQL), -1, @vm, nil);
|
|
if FReturnCode <> SQLITE_OK then
|
|
if FReturnCode <> SQLITE_OK then
|
|
DatabaseError(ReturnString, Self);
|
|
DatabaseError(ReturnString, Self);
|
|
sqlite3_step(vm);
|
|
sqlite3_step(vm);
|
|
@@ -263,7 +263,7 @@ procedure TSqlite3Dataset.ExecuteDirect(const ASQL: String);
|
|
var
|
|
var
|
|
vm: Pointer;
|
|
vm: Pointer;
|
|
begin
|
|
begin
|
|
- FReturnCode := sqlite3_prepare(FSqliteHandle, PAnsiChar(ASQL), -1, @vm, nil);
|
|
|
|
|
|
+ FReturnCode := sqlite3_prepare_v2(FSqliteHandle, PAnsiChar(ASQL), -1, @vm, nil);
|
|
if FReturnCode <> SQLITE_OK then
|
|
if FReturnCode <> SQLITE_OK then
|
|
DatabaseError(ReturnString, Self);
|
|
DatabaseError(ReturnString, Self);
|
|
FReturnCode := sqlite3_step(vm);
|
|
FReturnCode := sqlite3_step(vm);
|
|
@@ -281,7 +281,7 @@ begin
|
|
sqlite3_exec(FSqliteHandle, PAnsiChar('Select Max(' + FieldDefs[FAutoIncFieldNo].Name +
|
|
sqlite3_exec(FSqliteHandle, PAnsiChar('Select Max(' + FieldDefs[FAutoIncFieldNo].Name +
|
|
') from ' + FTableName), @GetAutoIncValue, @FNextAutoInc, nil);
|
|
') from ' + FTableName), @GetAutoIncValue, @FNextAutoInc, nil);
|
|
|
|
|
|
- FReturnCode := sqlite3_prepare(FSqliteHandle, PAnsiChar(FEffectiveSQL), -1, @vm, nil);
|
|
|
|
|
|
+ FReturnCode := sqlite3_prepare_v2(FSqliteHandle, PAnsiChar(FEffectiveSQL), -1, @vm, nil);
|
|
if FReturnCode <> SQLITE_OK then
|
|
if FReturnCode <> SQLITE_OK then
|
|
DatabaseError(ReturnString, Self);
|
|
DatabaseError(ReturnString, Self);
|
|
|
|
|
|
@@ -367,7 +367,7 @@ begin
|
|
if FSqliteHandle = nil then
|
|
if FSqliteHandle = nil then
|
|
GetSqliteHandle;
|
|
GetSqliteHandle;
|
|
Result := '';
|
|
Result := '';
|
|
- FReturnCode := sqlite3_prepare(FSqliteHandle,PAnsiChar(ASQL), -1, @vm, nil);
|
|
|
|
|
|
+ FReturnCode := sqlite3_prepare_v2(FSqliteHandle,PAnsiChar(ASQL), -1, @vm, nil);
|
|
if FReturnCode <> SQLITE_OK then
|
|
if FReturnCode <> SQLITE_OK then
|
|
DatabaseError(ReturnString, Self);
|
|
DatabaseError(ReturnString, Self);
|
|
|
|
|