fcl-db: tests: add more field types to FieldDataSet

git-svn-id: trunk@25372 -

packages/fcl-db/tests/bufdatasettoolsunit.pas

@@ -139,9 +139,13 @@ begin
     FieldDefs.Add('FDATETIME',ftDateTime);
     FieldDefs.Add('FBLOB',ftBlob);
     FieldDefs.Add('FMEMO',ftMemo);
-    FieldDefs.Add('FLARGEINT',ftLargeint);
     FieldDefs.Add('FFIXEDCHAR',ftFixedChar,10);
+    FieldDefs.Add('FLARGEINT',ftLargeint);
+    FieldDefs.Add('FGUID',ftGuid,38);
     FieldDefs.Add('FFMTBCD',ftFmtBCD);
+    FieldDefs.Add('FWIDESTRING',ftWideString,10);
+    FieldDefs.Add('FFIXEDWIDECHAR',ftFixedWideChar,10);
+    FieldDefs.Add('FWIDEMEMO',ftWideMemo);
     CreateDataset;
     Open;
     for i := 0 to testValuesCount-1 do
@@ -161,9 +165,13 @@ begin
       FieldByName('FDATETIME').AsDateTime := StrToDateTime(testValues[ftDateTime,i], Self.FormatSettings);
       FieldByName('FBLOB').AsString := testStringValues[i];
       FieldByName('FMEMO').AsString := testStringValues[i];
-      FieldByName('FLARGEINT').AsLargeInt := testLargeIntValues[i];
       FieldByName('FFIXEDCHAR').AsString := PadRight(testStringValues[i], 10);
+      FieldByName('FLARGEINT').AsLargeInt := testLargeIntValues[i];
+      FieldByName('FGUID').AsString := GuidToString(GUID_NULL);
       FieldByName('FFMTBCD').AsBCD := StrToBCD(testFmtBCDValues[i], Self.FormatSettings);
+      FieldByName('FWIDESTRING').AsString := testStringValues[i];
+      FieldByName('FFIXEDWIDECHAR').AsString := PadRight(testStringValues[i], 10);
+      FieldByName('FWIDEMEMO').AsString := testStringValues[i];
       Post;
     end;
     MergeChangeLog;

packages/fcl-db/tests/sqldbtoolsunit.pas

@@ -222,6 +222,9 @@ begin
       FieldtypeDefinitions[ftBlob]    := 'IMAGE';
       FieldtypeDefinitions[ftMemo]    := 'TEXT';
       FieldtypeDefinitions[ftGraphic] := '';
+      FieldtypeDefinitions[ftWideString] := 'NVARCHAR(10)';
+      FieldtypeDefinitions[ftFixedWideChar] := 'NCHAR(10)';
+      FieldtypeDefinitions[ftWideMemo] := 'NTEXT';
       end;
     ssMySQL:
       begin
@@ -245,9 +248,10 @@ begin
     ssPostgreSQL:
       begin
       FieldtypeDefinitions[ftCurrency] := 'MONEY'; // ODBC?!
-      FieldtypeDefinitions[ftBlob] := 'BYTEA';
-      FieldtypeDefinitions[ftMemo] := 'TEXT';
-      FieldtypeDefinitions[ftGraphic] := '';
+      FieldtypeDefinitions[ftBlob]     := 'BYTEA';
+      FieldtypeDefinitions[ftMemo]     := 'TEXT';
+      FieldtypeDefinitions[ftGraphic]  := '';
+      FieldtypeDefinitions[ftGuid]     := 'UUID';
       end;
     ssSQLite:
       begin
@@ -257,6 +261,7 @@ begin
       FieldtypeDefinitions[ftVarBytes] := 'VARBINARY(10)';
       FieldtypeDefinitions[ftMemo] := 'CLOB'; //or TEXT SQLite supports both, but CLOB is sql standard (TEXT not)
       FieldtypeDefinitions[ftWideString] := 'NVARCHAR(10)';
+      FieldtypeDefinitions[ftFixedWideChar] := 'NCHAR(10)';
       FieldtypeDefinitions[ftWideMemo] := 'NCLOB';
       end;
   end;
@@ -393,7 +398,6 @@ begin
 
     for countID := 0 to testValuesCount-1 do
       begin
-      
       Sql :=  'insert into FPDEV_FIELD (ID';
       Sql1 := 'values ('+IntToStr(countID);
       for FType := low(TFieldType)to high(TFieldType) do
@@ -471,7 +475,7 @@ begin
     begin
     sql.clear;
     sql.add('SELECT * FROM FPDEV_FIELD');
-    tsqlquery(Result).UniDirectional:=TestUniDirectional;
+    UniDirectional:=TestUniDirectional;
     end;
 end;