fcl-db: base: avoid code page conversion to CP_NONE as this kind of conversion is for now undefined (see bug #30622)

git-svn-id: trunk@35268 -

packages/fcl-db/src/base/fields.inc

@@ -1315,7 +1315,7 @@ begin
   else
     begin
     if StringCodePage(AValue) <> FCodePage then
-      SetCodePage(AValue, FCodePage, True);
+      SetCodePage(AValue, FCodePage, FCodePage<>CP_NONE);
     if DataSize <= dsMaxStringSize then
       begin
       if FTransliterate then
@@ -3217,7 +3217,7 @@ procedure TMemoField.SetAsAnsiString(const AValue: AnsiString);
 var s: RawByteString;
 begin
   s := AValue;
-  SetCodePage(s, FCodePage, True);
+  SetCodePage(s, FCodePage, FCodePage<>CP_NONE);
   inherited SetAsAnsiString(s);
 end;
 

packages/fcl-db/src/sqldb/sqldb.pp

@@ -1687,7 +1687,7 @@ begin
   // converts parameter value to connection charset
   if FCodePage = CP_UTF8 then
     Result := Param.AsUTF8String
-  else if FCodePage in [DefaultSystemCodePage, CP_ACP] then
+  else if FCodePage in [DefaultSystemCodePage, CP_ACP, CP_NONE] then
     Result := Param.AsAnsiString
   else
   begin
@@ -1699,7 +1699,7 @@ end;
 function TSQLConnection.GetAsSQLText(Field : TField) : string;
 begin
   if (not assigned(Field)) or Field.IsNull then Result := 'Null'
-  else case field.DataType of
+  else case Field.DataType of
     ftString   : Result := QuotedStr(Field.AsString);
     ftDate     : Result := '''' + FormatDateTime('yyyy-mm-dd',Field.AsDateTime,FSqlFormatSettings) + '''';
     ftDateTime : Result := '''' + FormatDateTime('yyyy-mm-dd hh:nn:ss.zzz',Field.AsDateTime,FSqlFormatSettings) + '''';