Skip to content
Permalink
Browse files

some paranoid fixes for FPC variant support

  • Loading branch information...
Arnaud Bouchez
Arnaud Bouchez committed Jul 18, 2019
1 parent 9ba4e69 commit 212439ced70342af1f9d83c14d67d3c169667c72
Showing with 6 additions and 6 deletions.
  1. +3 −3 SynDB.pas
  2. +1 −1 SynDBOracle.pas
  3. +1 −1 SynOleDB.pas
  4. +1 −1 SynopseCommit.inc
@@ -3745,7 +3745,7 @@ procedure TQueryValue.SetString(const aValue: string);
fValue := aValue;
{$else}
with TVarData(fValue) do begin
if VType and VTYPE_STATIC<>0 then
{$ifndef FPC}if VType and VTYPE_STATIC<>0 then{$endif}
VarClear(fValue);
VType := varString;
VAny := nil; // avoid GPF below when assigning a string variable to VAny
@@ -6812,7 +6812,7 @@ function TSQLDBStatement.ColumnToVariant(Col: integer; var Value: Variant): TSQL
ColumnToSQLVar(Col,V,tmp);
result := V.VType;
with TVarData(Value) do begin
if VType and VTYPE_STATIC<>0 then
{$ifndef FPC}if VType and VTYPE_STATIC<>0 then{$endif}
VarClear(Value);
VType := MAP_FIELDTYPE2VARTYPE[V.VType];
case result of
@@ -7498,7 +7498,7 @@ function TSQLDBStatement.RowData: Variant;
if SQLDBRowVariantType=nil then
SQLDBRowVariantType := SynRegisterCustomVariantType(TSQLDBRowVariantType);
with TVarData(result) do begin
if VType and VTYPE_STATIC<>0 then
{$ifndef FPC}if VType and VTYPE_STATIC<>0 then{$endif}
VarClear(result);
VType := SQLDBRowVariantType.VarType;
VPointer := self;
@@ -2408,7 +2408,7 @@ function TSQLDBOracleStatement.ColumnToVariant(Col: integer;
result := ftNull else
result := C^.ColumnType;
with TVarData(Value) do begin
if VType and VTYPE_STATIC<>0 then
{$ifndef FPC}if VType and VTYPE_STATIC<>0 then{$endif}
VarClear(Value);
VType := MAP_FIELDTYPE2VARTYPE[result];
case result of
@@ -1662,7 +1662,7 @@ function TOleDBStatement.ColumnToVariant(Col: integer;
result := ftNull else
result := C^.ColumnType;
with TVarData(Value) do begin
if VType and VTYPE_STATIC<>0 then
{$ifndef FPC}if VType and VTYPE_STATIC<>0 then{$endif}
VarClear(Value);
VType := MAP_FIELDTYPE2VARTYPE[result];
case result of
@@ -1 +1 @@
'1.18.5274'
'1.18.5275'

0 comments on commit 212439c

Please sign in to comment.
You can’t perform that action at this time.