Update of /cvsroot/instantobjects/Source/Brokers/ADO
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv436/Source/Brokers/ADO
Modified Files:
InstantADO.pas
Removed Files:
ioado50.dpk
Log Message:
Porting to Delphi 5
Index: InstantADO.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/ADO/InstantADO.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** InstantADO.pas 16 Sep 2004 11:29:22 -0000 1.5
--- InstantADO.pas 10 Feb 2005 23:06:21 -0000 1.6
***************
*** 179,183 ****
function CreateDataSet(const Statement: string; Params: TParams): TDataSet; override;
function DataTypeToColumnType(DataType: TInstantDataType; Size: Integer): string; override;
! function Execute(const Statement: string; Params: TParams): Integer; override;
end;
--- 179,183 ----
function CreateDataSet(const Statement: string; Params: TParams): TDataSet; override;
function DataTypeToColumnType(DataType: TInstantDataType; Size: Integer): string; override;
! function Execute(const AStatement: string; AParams: TParams): Integer; override;
end;
***************
*** 186,191 ****
TInstantADOMSSQLQuery = class(TInstantSQLQuery)
- protected
- function CreateDataSet(const AStatement: string; AParams: TParams): TDataSet; override;
end;
--- 186,189 ----
***************
*** 224,228 ****
Param := Params.ParamByName(Parameter.Name);
Parameter.DataType := Param.DataType;
! Parameter.Assign(Param);
end;
end;
--- 222,234 ----
Param := Params.ParamByName(Parameter.Name);
Parameter.DataType := Param.DataType;
! if Param.ParamType = DB.ptUnknown then
! Parameter.Direction := pdInput else
! Parameter.Direction := TParameterDirection(Param.ParamType);
! Parameter.Attributes := [];
! Parameter.NumericScale := Param.NumericScale;
! Parameter.Precision := Param.NumericScale;
! Parameter.Size := Param.Size;
! Parameter.Value := Param.Value;
! // Parameter.Assign(Param);
end;
end;
***************
*** 1041,1051 ****
begin
Query := TADOQuery.Create(nil);
! with Query do
! begin
! Connection := (Connector as TInstantADOConnector).Connection;
! SQL.Text := Statement;
! AssignParameters(Params, Parameters);
! end;
! Result := Query;
end;
--- 1047,1062 ----
begin
Query := TADOQuery.Create(nil);
! Try
! Query.CursorType := ctOpenForwardOnly;
! Query.LockType := ltReadOnly;
! Query.Connection := (Connector as TInstantADOConnector).Connection;
! Query.SQL.Text := Statement;
! if Assigned(Params) then
! AssignParameters(Params, Query.Parameters);
! Result := Query;
! Except
! Query.Free;
! raise;
! End;
end;
***************
*** 1074,1085 ****
end;
! function TInstantADOMSSQLBroker.Execute(const Statement: string;
! Params: TParams): Integer;
begin
! with CreateDataSet(Statement, Params) as TADOQuery do
try
! Result := ExecSQL;
finally
! Free;
end;
end;
--- 1085,1098 ----
end;
! function TInstantADOMSSQLBroker.Execute(const AStatement: string;
! AParams: TParams): Integer;
! var
! DataSet : TADOQuery;
begin
! DataSet := AcquireDataSet(AStatement, AParams) as TADOQuery;
try
! Result := DataSet.ExecSQL;
finally
! ReleaseDataSet(DataSet);
end;
end;
***************
*** 1112,1135 ****
{ TInstantADOMSSQLQuery }
- function TInstantADOMSSQLQuery.CreateDataSet(const AStatement: string;
- AParams: TParams): TDataSet;
- var
- Query: TADOQuery;
- begin
- Query := TADOQuery.Create(nil);
- try
- Query.SQL.Text := AStatement;
- AssignParameters(AParams, Query.Parameters);
- Query.CursorType := ctOpenForwardOnly;
- Query.LockType := ltReadOnly;
- Query.MaxRecords := MaxCount;
- Query.Connection := (Connector as TInstantADOConnector).Connection;
- Result := Query;
- except
- Query.Free;
- raise;
- end;
- end;
-
initialization
RegisterClass(TInstantADOConnectionDef);
--- 1125,1128 ----
--- ioado50.dpk DELETED ---
|
