paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-21 12:29:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Patches from Lacak2 changing currency to odbc numeric type, and ftbcd parameters

Browse Source 
git-svn-id: trunk@20453 -
This commit is contained in:
marco 2012-03-01 10:54:54 +00:00
parent 8159d2ee3c
commit fa3ee5f605
2 changed files with 66 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/fcl-db/src/sqldb/odbc/odbcconn.pas
View File

@ -322,8 +322,10 @@ var
TimeVal: SQL_TIME_STRUCT;
TimeStampVal: SQL_TIMESTAMP_STRUCT;
BoolVal: byte;
NumericVal: SQL_NUMERIC_STRUCT;
ColumnSize, BufferLength, StrLenOrInd: SQLINTEGER;
CType, SqlType, DecimalDigits:SQLSMALLINT;
APD: SQLHDESC;
begin
// Note: it is assumed that AParams is the same as the one passed to PrepareStatement, in the sense that
// the parameters have the same order and names
@ -420,7 +422,7 @@ begin
else SqlType:=SQL_WVARCHAR;
end;
end;
ftFloat, ftCurrency:
ftFloat:
begin
FloatVal:=AParams[ParamIndex].AsFloat;
PVal:=@FloatVal;
@ -429,6 +431,16 @@ begin
SqlType:=SQL_DOUBLE;
ColumnSize:=15;
end;
ftCurrency, ftBCD:
begin
NumericVal:=CurrToNumericStruct(AParams[ParamIndex].AsCurrency);
PVal:=@NumericVal;
Size:=SizeOf(NumericVal);
CType:=SQL_C_NUMERIC;
SqlType:=SQL_NUMERIC;
ColumnSize:=NumericVal.precision;
DecimalDigits:=NumericVal.scale;
end;
ftDate:
begin
DateVal:=DateTimeToDateStruct(AParams[ParamIndex].AsDate);
@ -496,6 +508,16 @@ begin
PStrLenOrInd), // StrLen_or_IndPtr
SQL_HANDLE_STMT, ODBCCursor.FSTMTHandle, 'Could not bind parameter %d.', [i]
);
// required by MSSQL:
if CType = SQL_C_NUMERIC then
begin
ODBCCheckResult(
SQLGetStmtAttr(ODBCCursor.FSTMTHandle, SQL_ATTR_APP_PARAM_DESC, @APD, 0, nil),
SQL_HANDLE_STMT, ODBCCursor.FSTMTHandle, 'Could not get parameter descriptor.'
);
SQLSetDescRec(APD, i+1, SQL_C_NUMERIC, 0, ColumnSize+2, ColumnSize, DecimalDigits, Buf, nil, nil);
end;
end;
end;
@ -1206,7 +1228,7 @@ var
_Type :SQLSMALLINT; _TypeIndOrLen :SQLINTEGER;
OrdinalPos:SQLSMALLINT; OrdinalPosIndOrLen:SQLINTEGER;
ColName :string; ColNameIndOrLen :SQLINTEGER;
AscOrDesc :SQLCHAR; AscOrDescIndOrLen :SQLINTEGER;
AscOrDesc :char; AscOrDescIndOrLen :SQLINTEGER;
PKName :string; PKNameIndOrLen :SQLINTEGER;
const
DEFAULT_NAME_LEN = 255;

43
packages/odbc/src/odbcsql.inc
View File

@ -61,7 +61,8 @@ uses
*)
type
SQLCHAR = char;
SQLCHAR = cuchar;
SQLSCHAR = cschar;
SQLSMALLINT = csshort;
SQLUSMALLINT = cushort;
SQLRETURN = SQLSMALLINT;
@ -284,6 +285,13 @@ type
end;
PSQL_TIMESTAMP_STRUCT = ^SQL_TIMESTAMP_STRUCT;
SQL_NUMERIC_STRUCT = packed record
precision: SQLCHAR;
scale : SQLSCHAR;
sign : SQLCHAR; // 1 if positive, 0 if negative
val : array[0..15] of SQLCHAR;
end;
const
SQL_NAME_LEN = 128;
@ -1115,6 +1123,15 @@ type TSQLGetStmtAttr=function (StatementHandle:SQLHSTMT;
Attribute:SQLINTEGER;Value:SQLPOINTER;
BufferLength:SQLINTEGER;StringLength:PSQLINTEGER):SQLRETURN;{$ifdef fpc} extdecl {$else} stdcall {$endif};
type TSQLSetDescField=function (DescriptorHandle:SQLHDESC;
RecNumber:SQLSMALLINT; FieldIdentifier:SQLSMALLINT;
ValuePtr:SQLPOINTER; BufferLength:SQLINTEGER):SQLRETURN;{$ifdef fpc} extdecl {$else} stdcall {$endif};
type TSQLSetDescRec=function (DescriptorHandle:SQLHDESC;
RecNumber:SQLSMALLINT; DescType, SubType:SQLSMALLINT;
Length:SQLINTEGER; Precision, Scale: SQLSMALLINT;
DataPtr:SQLPOINTER; StringLengthPtr,IndicatorPtr:PSQLINTEGER):SQLRETURN;{$ifdef fpc} extdecl {$else} stdcall {$endif};
type tSQLGetInfo=function (ConnectionHandle:SQLHDBC;
InfoType:SQLUSMALLINT;InfoValue:SQLPOINTER;
BufferLength:SQLSMALLINT;StringLength:PSQLSMALLINT):SQLRETURN;{$ifdef fpc} extdecl {$else} stdcall {$endif};
@ -1242,6 +1259,8 @@ var SQLExtendedFetch:TSQLExtendedFetch;
var SQLGetData:TSQLGetData;
var SQLSetStmtAttr:TSQLSetStmtAttr;
var SQLGetStmtAttr:TSQLGetStmtAttr;
//var SQLSetDescField:TSQLSetDescField;
var SQLSetDescRec:TSQLSetDescRec;
var SQLBulkOperations:TSQLBulkOperations;
var SQLPutData:TSQLPutData;
var SQLBindCol:TSQLBindCol;
@ -1525,6 +1544,7 @@ procedure DateTime2TimeStampStruct( var Value:SQL_TIMESTAMP_STRUCT; b:TDateTime)
Function TimeStampStructToDateTime( B : PSQL_TIMESTAMP_STRUCT) : TDateTime;
Function TimeStructToDateTime (B : PSQL_TIME_STRUCT) : TDateTime;
function DateTimeToTimeStruct(b: TDateTime) : SQL_TIME_STRUCT;
function CurrToNumericStruct(c: currency): SQL_NUMERIC_STRUCT;
{$IFDEF DYNLOADINGODBC}
@ -1584,6 +1604,8 @@ begin
pointer(SQLGetData) := GetProcedureAddress(ODBCLibraryHandle,'SQLGetData');
pointer(SQLSetStmtAttr) := GetProcedureAddress(ODBCLibraryHandle,'SQLSetStmtAttr');
pointer(SQLGetStmtAttr) := GetProcedureAddress(ODBCLibraryHandle,'SQLGetStmtAttr');
//pointer(SQLSetDescField) := GetProcedureAddress(ODBCLibraryHandle,'SQLSetDescField');
pointer(SQLSetDescRec) := GetProcedureAddress(ODBCLibraryHandle,'SQLSetDescRec');
pointer(SQLBulkOperations) := GetProcedureAddress(ODBCLibraryHandle,'SQLBulkOperations');
pointer(SQLPutData) := GetProcedureAddress(ODBCLibraryHandle,'SQLPutData');
pointer(SQLBindCol) := GetProcedureAddress(ODBCLibraryHandle,'SQLBindCol');
@ -1627,6 +1649,8 @@ begin
SQLGetData := GetProcedureAddress(ODBCLibraryHandle,'SQLGetData');
SQLSetStmtAttr := GetProcedureAddress(ODBCLibraryHandle,'SQLSetStmtAttr');
SQLGetStmtAttr := GetProcedureAddress(ODBCLibraryHandle,'SQLGetStmtAttr');
//SQLSetDescField := GetProcedureAddress(ODBCLibraryHandle,'SQLSetDescField');
SQLSetDescRec := GetProcedureAddress(ODBCLibraryHandle,'SQLSetDescRec');
SQLBulkOperations := GetProcedureAddress(ODBCLibraryHandle,'SQLBulkOperations');
SQLPutData := GetProcedureAddress(ODBCLibraryHandle,'SQLPutData');
SQLBindCol := GetProcedureAddress(ODBCLibraryHandle,'SQLBindCol');
@ -1731,3 +1755,20 @@ begin
Result.Second:=w3;
end;
function CurrToNumericStruct(c: currency): SQL_NUMERIC_STRUCT;
var n: int64; i: integer;
begin
Result.precision:=18;
Result.scale:=4;
if c >= 0 then
Result.sign:=1
else begin
Result.sign:=0;
c := -c;
end;
n := int64(c);
for i:=0 to 15 do begin
Result.val[i] := n and $ff;
n := n shr 8;
end;
end;