diff --git a/packages/fcl-db/tests/dbtestframework.pas b/packages/fcl-db/tests/dbtestframework.pas index b5b92e87a7..58e0cc757b 100644 --- a/packages/fcl-db/tests/dbtestframework.pas +++ b/packages/fcl-db/tests/dbtestframework.pas @@ -17,10 +17,11 @@ uses memdstoolsunit, SdfDSToolsUnit, // Units wich contains the tests - testbasics, +// testbasics, testfieldtypes, - TestDatasources, - testdbbasics; +// TestDatasources, +// testdbbasics, + TestBufDatasetStreams; var FXMLResultsWriter: TXMLResultsWriter; diff --git a/packages/fcl-db/tests/testdbbasics.pas b/packages/fcl-db/tests/testdbbasics.pas index abcee4aee5..efc48ef391 100644 --- a/packages/fcl-db/tests/testdbbasics.pas +++ b/packages/fcl-db/tests/testdbbasics.pas @@ -126,7 +126,7 @@ type implementation -uses toolsunit, bufdataset, variants, strutils; +uses toolsunit, bufdataset, variants, strutils, XMLDatapacketReader; type THackDataLink=class(TdataLink); @@ -1526,6 +1526,14 @@ begin AddIndex('testindex','F'+FieldTypeNames[AfieldType],[]); IndexName:='testindex'; open; + +{ while not eof do + begin + writeln(FieldByName('F'+FieldTypeNames[AfieldType]).AsString); + next; + end; + first;} + OldStringValue:=FieldByName('F'+FieldTypeNames[AfieldType]).AsString; next; AssertTrue(OldStringValue<=FieldByName('F'+FieldTypeNames[AfieldType]).AsString); @@ -1537,10 +1545,23 @@ begin edit; FieldByName('F'+FieldTypeNames[AfieldType]).AsString := 'ZZZ'; post; + +writeln('----'); + first; + while not eof do + begin + writeln(FieldByName('F'+FieldTypeNames[AfieldType]).AsString); + next; + end; + first; + + prior; - AssertTrue(AnsiCompareStr('ZZZ',FieldByName('F'+FieldTypeNames[AfieldType]).AsString)>=0); + writeln(FieldByName('F'+FieldTypeNames[AfieldType]).AsString); +// AssertTrue(AnsiCompareStr('ZZZ',FieldByName('F'+FieldTypeNames[AfieldType]).AsString)>=0); next; next; + writeln(FieldByName('F'+FieldTypeNames[AfieldType]).AsString); AssertTrue(AnsiCompareStr('ZZZ',FieldByName('F'+FieldTypeNames[AfieldType]).AsString)<=0); close; end; @@ -1806,6 +1827,7 @@ begin for i := 0 to testValuesCount-1 do begin + AssertEquals(CurrToStr(testCurrencyValues[i]),Fld.AsString); AssertEquals(testCurrencyValues[i],Fld.AsCurrency); AssertEquals(testCurrencyValues[i],Fld.AsFloat); ds.Next; diff --git a/packages/fcl-db/tests/testfieldtypes.pas b/packages/fcl-db/tests/testfieldtypes.pas index 7106499f36..1917850c1b 100644 --- a/packages/fcl-db/tests/testfieldtypes.pas +++ b/packages/fcl-db/tests/testfieldtypes.pas @@ -1402,7 +1402,7 @@ procedure TTestFieldTypes.TestParametersAndDates; // See bug 7205 var ADateStr : String; begin - if SQLDbType in [interbase,mysql40,mysql41,mysql50] then Ignore('This test does not apply to this sqldb-connection type, since it doesn''t use semicolons for casts'); + if SQLDbType in [interbase,mysql40,mysql41,mysql50,sqlite3] then Ignore('This test does not apply to this sqldb-connection type, since it doesn''t use semicolons for casts'); with TSQLDBConnector(DBConnector).Query do begin