paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-27 12:30:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-db: oracle:

Browse Source 
- add support for ftSmallInt, ftLargeInt, ftFixedChar params
- add support for BINARY_FLOAT, BINARY_DOUBLE data types

git-svn-id: trunk@27995 -
This commit is contained in:
lacak 2014-06-18 10:59:46 +00:00
parent e4fa4a72d2
commit 98f5e7cd57
1 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
packages/fcl-db/src/sqldb/oracle/oracleconnection.pp
View File

@ -85,7 +85,7 @@ type
procedure AddFieldDefs(cursor:TSQLCursor; FieldDefs:TFieldDefs); override; procedure AddFieldDefs(cursor:TSQLCursor; FieldDefs:TFieldDefs); override;
function Fetch(cursor:TSQLCursor):boolean; override; function Fetch(cursor:TSQLCursor):boolean; override;
function LoadField(cursor:TSQLCursor; FieldDef:TFieldDef; buffer:pointer; out CreateBlob : boolean):boolean; override; function LoadField(cursor:TSQLCursor; FieldDef:TFieldDef; buffer:pointer; out CreateBlob : boolean):boolean; override;
// function CreateBlobStream(Field:TField; Mode:TBlobStreamMode):TStream; override; // procedure LoadBlobIntoBuffer(FieldDef: TFieldDef; ABlobBuf: PBufBlobField; cursor: TSQLCursor; ATransaction: TSQLTransaction); override;
procedure FreeFldBuffers(cursor:TSQLCursor); override; procedure FreeFldBuffers(cursor:TSQLCursor); override;
procedure UpdateIndexDefs(IndexDefs : TIndexDefs;TableName : string); override; procedure UpdateIndexDefs(IndexDefs : TIndexDefs;TableName : string); override;
function GetSchemaInfoSQL(SchemaType : TSchemaType; SchemaObjectName, SchemaPattern : string) : string; override; function GetSchemaInfoSQL(SchemaType : TSchemaType; SchemaObjectName, SchemaPattern : string) : string; override;
@ -554,11 +554,18 @@ begin
begin begin
case AParams[counter].DataType of case AParams[counter].DataType of
ftInteger : begin OFieldType := SQLT_INT; OFieldSize := sizeof(integer); end; ftSmallInt, ftInteger :
ftFloat : begin OFieldType := SQLT_FLT; OFieldSize := sizeof(double); end; begin OFieldType := SQLT_INT; OFieldSize := sizeof(integer); end;
ftDate, ftDateTime : begin OFieldType := SQLT_DAT; OFieldSize := 7; end; ftLargeInt :
ftString : begin OFieldType := SQLT_STR; OFieldSize := 4000; end; begin OFieldType := SQLT_INT; OFieldSize := sizeof(int64); end;
ftFMTBcd,ftBCD : begin OFieldType := SQLT_VNU; OFieldSize := 22; end; ftFloat :
begin OFieldType := SQLT_FLT; OFieldSize := sizeof(double); end;
ftDate, ftDateTime :
begin OFieldType := SQLT_DAT; OFieldSize := 7; end;
ftFixedChar, ftString :
begin OFieldType := SQLT_STR; OFieldSize := 4000; end;
ftFMTBcd, ftBCD :
begin OFieldType := SQLT_VNU; OFieldSize := 22; end;
else else
DatabaseErrorFmt(SUnsupportedParameter,[Fieldtypenames[AParams[counter].DataType]],self); DatabaseErrorFmt(SUnsupportedParameter,[Fieldtypenames[AParams[counter].DataType]],self);
end; end;
@ -605,15 +612,18 @@ begin
parambuffers[SQLVarNr].ind := 0; parambuffers[SQLVarNr].ind := 0;
case DataType of case DataType of
ftSmallInt,
ftInteger : begin ftInteger : begin
i := asInteger; i := asInteger;
move(i,parambuffers[SQLVarNr].buffer^,sizeof(integer)); move(i,parambuffers[SQLVarNr].buffer^,sizeof(integer));
end; end;
ftLargeInt : PInt64(parambuffers[SQLVarNr].buffer)^ := AsLargeInt;
ftFloat : begin ftFloat : begin
f := asFloat; f := asFloat;
move(f,parambuffers[SQLVarNr].buffer^,sizeof(double)); move(f,parambuffers[SQLVarNr].buffer^,sizeof(double));
end; end;
ftString : begin ftString,
ftFixedChar : begin
s := asString+#0; s := asString+#0;
move(s[1],parambuffers[SQLVarNr].buffer^,length(s)+1); move(s[1],parambuffers[SQLVarNr].buffer^,length(s)+1);
end; end;
@ -792,7 +802,7 @@ begin
HandleError; HandleError;
if OCIAttrGet(Param,OCI_DTYPE_PARAM,@Oscale,nil,OCI_ATTR_SCALE,FOciError) = OCI_ERROR then if OCIAttrGet(Param,OCI_DTYPE_PARAM,@Oscale,nil,OCI_ATTR_SCALE,FOciError) = OCI_ERROR then
HandleError; HandleError;
if (Oscale = 0) and (Oprecision<9) then if (Oscale = 0) and (Oprecision < 10) then
begin begin
if Oprecision=0 then //Number(0,0) = number(32,4) if Oprecision=0 then //Number(0,0) = number(32,4)
begin begin
@ -837,23 +847,38 @@ begin
end; end;
OCI_TYPECODE_CHAR, OCI_TYPECODE_CHAR,
OCI_TYPECODE_VARCHAR, OCI_TYPECODE_VARCHAR,
OCI_TYPECODE_VARCHAR2 : begin FieldType := ftString; FieldSize := OFieldSize; inc(OFieldsize) ;OFieldType:=SQLT_STR end; OCI_TYPECODE_VARCHAR2 : begin
FieldType := ftString;
FieldSize := OFieldSize;
inc(OFieldSize);
OFieldType:=SQLT_STR;
end;
OCI_TYPECODE_DATE : FieldType := ftDate; OCI_TYPECODE_DATE : FieldType := ftDate;
OCI_TYPECODE_TIMESTAMP, OCI_TYPECODE_TIMESTAMP,
OCI_TYPECODE_TIMESTAMP_LTZ, OCI_TYPECODE_TIMESTAMP_LTZ,
OCI_TYPECODE_TIMESTAMP_TZ : begin OCI_TYPECODE_TIMESTAMP_TZ :
FieldType := ftDateTime; begin
OFieldType := SQLT_ODT; FieldType := ftDateTime;
end; OFieldType := SQLT_ODT;
end;
OCI_TYPECODE_BFLOAT,
OCI_TYPECODE_BDOUBLE : begin
FieldType := ftFloat;
OFieldType := SQLT_BDOUBLE;
OFieldSize := sizeof(double);
end
else else
FieldType := ftUnknown; FieldType := ftUnknown;
end; end;
FieldBuffers[counter-1].buffer := getmem(OFieldSize); FieldBuffers[counter-1].buffer := getmem(OFieldSize);
FOciDefine := nil; if FieldType <> ftUnknown then
if OciDefineByPos(FOciStmt,FOciDefine,FOciError,counter,fieldbuffers[counter-1].buffer,OFieldSize,OFieldType,@(fieldbuffers[counter-1].ind),nil,nil,OCI_DEFAULT) = OCI_ERROR then begin
HandleError; FOciDefine := nil;
if OciDefineByPos(FOciStmt,FOciDefine,FOciError,counter,fieldbuffers[counter-1].buffer,OFieldSize,OFieldType,@(fieldbuffers[counter-1].ind),nil,nil,OCI_DEFAULT) = OCI_ERROR then
HandleError;
end;
if OCIAttrGet(Param,OCI_DTYPE_PARAM,@OFieldName,@OFNameLength,OCI_ATTR_NAME,FOciError) <> OCI_SUCCESS then if OCIAttrGet(Param,OCI_DTYPE_PARAM,@OFieldName,@OFNameLength,OCI_ATTR_NAME,FOciError) <> OCI_SUCCESS then
HandleError; HandleError;
@ -936,14 +961,12 @@ begin
end; end;
else else
Result := False; Result := False;
end; end;
end; end;
end; end;
{function TOracleConnection.CreateBlobStream(Field: TField; Mode: TBlobStreamMode): TStream; {procedure TOracleConnection.LoadBlobIntoBuffer(FieldDef: TFieldDef; ABlobBuf: PBufBlobField; cursor: TSQLCursor; ATransaction: TSQLTransaction);
begin begin
// Result:=inherited CreateBlobStream(Field, Mode);
end;} end;}
procedure TOracleConnection.FreeFldBuffers(cursor: TSQLCursor); procedure TOracleConnection.FreeFldBuffers(cursor: TSQLCursor);