소스 검색

* ftWideMemo should be the last TFieldType

git-svn-id: trunk@6886 -
joost 18 년 전
부모
커밋
aa508a6033
3개의 변경된 파일9개의 추가작업 그리고 9개의 파일을 삭제
  1. 4 4
      packages/fcl-db/src/db.pas
  2. 1 1
      packages/fcl-db/src/sqldb/postgres/pqconnection.pp
  3. 4 4
      packages/fcl-db/tests/database.ini

+ 4 - 4
packages/fcl-db/src/db.pas

@@ -110,10 +110,10 @@ type
   TFieldType = (ftUnknown, ftString, ftSmallint, ftInteger, ftWord,
     ftBoolean, ftFloat, ftCurrency, ftBCD, ftDate,  ftTime, ftDateTime,
     ftBytes, ftVarBytes, ftAutoInc, ftBlob, ftMemo, ftGraphic, ftFmtMemo,
-    ftParadoxOle, ftDBaseOle, ftTypedBinary, ftWideMemo, ftCursor, ftFixedChar,
+    ftParadoxOle, ftDBaseOle, ftTypedBinary, ftCursor, ftFixedChar,
     ftWideString, ftLargeint, ftADT, ftArray, ftReference,
     ftDataSet, ftOraBlob, ftOraClob, ftVariant, ftInterface,
-    ftIDispatch, ftGuid, ftTimeStamp, ftFMTBcd, ftFixedWideChar);
+    ftIDispatch, ftGuid, ftTimeStamp, ftFMTBcd, ftFixedWideChar, ftWideMemo);
 
 { Part of DBCommon, but temporary defined here (bug 8206) }
 
@@ -1885,7 +1885,6 @@ const
       { ftParadoxOle} TBlobField,
       { ftDBaseOle} TBlobField,
       { ftTypedBinary} TBlobField,
-      { ftWideMemo} TWideMemoField,
       { ftCursor} Nil,
       { ftFixedChar} TStringField,
       { ftWideString} TWideStringField,
@@ -1902,7 +1901,8 @@ const
       { ftGuid} TGuidField,
       { ftTimeStamp} Nil,
       { ftFMTBcd} Nil,
-      { ftFixedWideString} TWideStringField
+      { ftFixedWideString} TWideStringField,
+      { ftWideMemo} TWideMemoField
     );
 
   dsEditModes = [dsEdit, dsInsert, dsSetKey];

+ 1 - 1
packages/fcl-db/src/sqldb/postgres/pqconnection.pp

@@ -446,7 +446,6 @@ const TypeStrings : array[TFieldType] of string =
       'Unknown',
       'Unknown',
       'Unknown',
-      'Unknown',
       'int',
       'Unknown',
       'Unknown',
@@ -460,6 +459,7 @@ const TypeStrings : array[TFieldType] of string =
       'Unknown',
       'Unknown',
       'Unknown',
+      'Unknown',
       'Unknown'
     );
 

+ 4 - 4
packages/fcl-db/tests/database.ini

@@ -1,7 +1,7 @@
 [Database]
 ; This file contains several sections, one for each database-type. Select here
 ; which database has to be tested currently.
-type=dbf
+type=interbase
 
 
 
@@ -59,10 +59,10 @@ hostname=192.168.1.1
 [interbase]
 connector=sql
 connectorparams=interbase
-name=/path/to/database.fdb
+name=/opt/firebird/data/test.fdb
 user=sysdba
-password=masterkey
-hostname=192.168.1.1
+password=rosivrepus
+hostname=127.0.0.1
 
 [odbc]
 connector=sql