Browse Source

* odbc ftguid fixes, correct size (38) in setparameters. Mantis #19774, patch by lacak2

git-svn-id: trunk@18993 -
marco 14 years ago
parent
commit
3f167a1582
1 changed files with 2 additions and 2 deletions
  1. 2 2
      packages/fcl-db/src/sqldb/odbc/odbcconn.pas

+ 2 - 2
packages/fcl-db/src/sqldb/odbc/odbcconn.pas

@@ -353,7 +353,7 @@ begin
           SqlType:=SQL_BIGINT;
           SqlType:=SQL_BIGINT;
           ColumnSize:=19;
           ColumnSize:=19;
         end;
         end;
-      ftString, ftFixedChar, ftBlob, ftMemo:
+      ftString, ftFixedChar, ftBlob, ftMemo, ftGuid:
         begin
         begin
           StrVal:=AParams[ParamIndex].AsString;
           StrVal:=AParams[ParamIndex].AsString;
           StrLenOrInd:=Length(StrVal);
           StrLenOrInd:=Length(StrVal);
@@ -1097,7 +1097,7 @@ begin
 {      SQL_INTERVAL_HOUR_TO_SECOND:  FieldType:=ftUnknown;}
 {      SQL_INTERVAL_HOUR_TO_SECOND:  FieldType:=ftUnknown;}
 {      SQL_INTERVAL_MINUTE_TO_SECOND:FieldType:=ftUnknown;}
 {      SQL_INTERVAL_MINUTE_TO_SECOND:FieldType:=ftUnknown;}
 {$IF (FPC_VERSION>=2) AND (FPC_RELEASE>=1)}
 {$IF (FPC_VERSION>=2) AND (FPC_RELEASE>=1)}
-      SQL_GUID:          begin FieldType:=ftGuid;       FieldSize:=ColumnSize; end;
+      SQL_GUID:          begin FieldType:=ftGuid;       FieldSize:=38; end; //SQL_GUID defines 36, but TGuidField requires 38
 {$ENDIF}
 {$ENDIF}
     else
     else
       begin FieldType:=ftUnknown; FieldSize:=ColumnSize; end
       begin FieldType:=ftUnknown; FieldSize:=ColumnSize; end