paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-07 12:07:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Merging revisions 43802 from trunk:

Browse Source 
------------------------------------------------------------------------
    r43802 | michael | 2019-12-28 15:10:59 +0100 (Sat, 28 Dec 2019) | 1 line
    
    * Fix bug ID #36486, add parameter to force use of largeint for sqlite
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43803 -
This commit is contained in:
michael 2019-12-28 16:19:14 +00:00
parent a00ee7af19
commit 75a8525c7f
2 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,6 +108,8 @@ Type
function stringsquery(const asql: string): TArrayStringArray;
procedure execsql(const asql: string);
function GetNextValueSQL(const SequenceName: string; IncrementBy: Integer): string; override;
function GetAlwaysUseBigint : Boolean; virtual;
Procedure SetAlwaysUseBigint(aValue : Boolean); virtual;
public
constructor Create(AOwner : TComponent); override;
procedure GetFieldNames(const TableName : string; List : TStrings); override;
@ -123,6 +125,7 @@ Type
procedure LoadExtension(const LibraryFile: string);
Published
Property OpenFlags : TSQLiteOpenFlags Read FOpenFlags Write SetOpenFlags default DefaultOpenFlags;
Property AlwaysUseBigint : Boolean Read GetAlwaysUseBigint Write SetAlwaysUseBigint;
end;
{ TSQLite3ConnectionDef }
@ -171,7 +174,6 @@ type
public
RowsAffected : Largeint;
end;
procedure freebindstring(astring: pointer); cdecl;
begin
StrDispose(astring);
@ -302,6 +304,32 @@ begin
FOpenFlags:=DefaultOpenFlags;
end;
Const
SUseBigint = 'AlwaysUseBigint';
function TSQLite3Connection.GetAlwaysUseBigint : Boolean;
begin
Result:=Params.Values[SUseBigint]='1'
end;
Procedure TSQLite3Connection.SetAlwaysUseBigint(aValue : Boolean);
Var
I : Integer;
begin
if aValue then
Params.Values[SUseBigint]:='1'
else
begin
I:=Params.IndexOfName(SUseBigint);
if I<>-1 then
Params.Delete(I);
end;
end;
procedure TSQLite3Connection.LoadBlobIntoBuffer(FieldDef: TFieldDef; ABlobBuf: PBufBlobField; cursor: TSQLCursor; ATransaction : TSQLTransaction);
var
@ -504,6 +532,11 @@ begin
size1:=0;
size2:=0;
case FT of
ftInteger,
ftSMallint,
ftWord:
If AlwaysUseBigint then
ft:=ftLargeInt;
ftString,
ftFixedChar,
ftFixedWideChar,

30
packages/fcl-db/tests/testfieldtypes.pas
View File

@ -133,6 +133,8 @@ type
procedure TestQueryAfterReconnect; // bug 16438
procedure TestStringsReplace;
// Test SQLIte3 AlwaysUseBigInt, introduced after bug ID 36486.
Procedure TestAlwaysUseBigint;
end;
@ -2427,6 +2429,34 @@ begin
inherited RunTest;
end;
Procedure TTestFieldTypes.TestAlwaysUseBigint;
var
I : byte;
begin
If SQLConnType<>sqlite3 then
Ignore('Test only for SQLite');
TSQLDBConnector(DBConnector).Connection.Params.Values['AlwaysUseBigint']:='1';
CreateTableWithFieldType(ftInteger,'INT');
TestFieldDeclaration(ftLargeInt,8);
for i := 0 to testIntValuesCount-1 do
TSQLDBConnector(DBConnector).Connection.ExecuteDirect('insert into FPDEV2 (FT) values (' + inttostr(testIntValues[i]) + ')');
with TSQLDBConnector(DBConnector).Query do
begin
Open;
for i := 0 to testIntValuesCount-1 do
begin
AssertEquals(testIntValues[i],fields[0].AsLargeInt);
Next;
end;
close;
end;
end;
initialization
// Only test if using sqldb