Browse Source

* Fixed TestSupportLargeintFields
* Disabled TestBug9744 for Interbase/firebird

git-svn-id: trunk@8880 -

joost 18 years ago
parent
commit
58d1c628de

+ 5 - 1
packages/fcl-db/tests/sqldbtoolsunit.pas

@@ -117,7 +117,11 @@ begin
     FieldtypeDefinitions[ftGraphic] := '';
     FieldtypeDefinitions[ftGraphic] := '';
     FieldtypeDefinitions[ftCurrency] := 'MONEY';
     FieldtypeDefinitions[ftCurrency] := 'MONEY';
     end;
     end;
-  if SQLDbType = INTERBASE then Fconnection := tIBConnection.Create(nil);
+  if SQLDbType = INTERBASE then
+    begin
+    Fconnection := tIBConnection.Create(nil);
+    FieldtypeDefinitions[ftLargeint] := 'BIGINT';
+    end;
   if SQLDbType = ODBC then Fconnection := tODBCConnection.Create(nil);
   if SQLDbType = ODBC then Fconnection := tODBCConnection.Create(nil);
   if SQLDbType = ORACLE then Fconnection := TOracleConnection.Create(nil);
   if SQLDbType = ORACLE then Fconnection := TOracleConnection.Create(nil);
 
 

+ 2 - 0
packages/fcl-db/tests/testsqlfieldtypes.pas

@@ -995,6 +995,8 @@ end;
 procedure TTestFieldTypes.TestBug9744;
 procedure TTestFieldTypes.TestBug9744;
 var i : integer;
 var i : integer;
 begin
 begin
+  AssertTrue('This test does not apply to Interbase/Firebird, since it has no double field-type',SQLDbType<>interbase);
+
   with TSQLDBConnector(DBConnector) do
   with TSQLDBConnector(DBConnector) do
     begin
     begin
     try
     try

+ 1 - 0
packages/fcl-db/tests/toolsunit.pas

@@ -229,6 +229,7 @@ begin
     testValues[ftFloat,i] := FloatToStr(testFloatValues[i]);
     testValues[ftFloat,i] := FloatToStr(testFloatValues[i]);
     testValues[ftSmallint,i] := IntToStr(testSmallIntValues[i]);
     testValues[ftSmallint,i] := IntToStr(testSmallIntValues[i]);
     testValues[ftInteger,i] := IntToStr(testIntValues[i]);
     testValues[ftInteger,i] := IntToStr(testIntValues[i]);
+    testValues[ftLargeint,i] := IntToStr(testLargeIntValues[i]);
     DecimalSeparator:=',';
     DecimalSeparator:=',';
     testValues[ftCurrency,i] := CurrToStr(testCurrencyValues[i]);
     testValues[ftCurrency,i] := CurrToStr(testCurrencyValues[i]);
     DecimalSeparator:='.';
     DecimalSeparator:='.';