Fix connection charset and params (#10)

Author: glprog

MiniREST.SQL.Base.pas

@@ -137,12 +137,15 @@   TMiniRESTSQLConnectionFactoryParams = class(TInterfacedObject, IMiniRESTSQLCon
   private
     FConnectionCount: Integer;
     FConnectionFactoryEventLogger: IMiniRESTSQLConnectionFactoryEventLogger;
+    FCharSet: string;
   public
     function GetConnectionsCount: Integer;
     procedure SetConnectionsCount(const ACount: Integer);
     function GetObject: TObject;
     function GetConnectionFactoryEventLogger: IMiniRESTSQLConnectionFactoryEventLogger;
     procedure SetConnectionFactoryEventLogger(ALogger: IMiniRESTSQLConnectionFactoryEventLogger);
+    function GetCharSet: string;
+    procedure SetCharSet(const ACharSet: string);
   end;
 
 implementation
@@ -515,6 +518,16 @@ procedure TMiniRESTSQLConnectionBase.SetValid(const AValid: Boolean);
   FValid := AValid;  
 end;
 
+function TMiniRESTSQLConnectionFactoryParams.GetCharSet: string;
+begin
+  Result := FCharSet;
+end;
+
+procedure TMiniRESTSQLConnectionFactoryParams.SetCharSet(const ACharSet: string);
+begin
+  FCharSet := ACharSet;
+end;
+
 initialization
   gConnectionIDCounter := 0;
 

MiniREST.SQL.Common.pas

@@ -32,6 +32,8 @@ interface
     function GetAsVariant: Variant;
     procedure SetAsVariant(const AValue: Variant);
     function GetParamType: TMiniRESTSQLParamType;
+    function GetParamSize: Integer;
+    function SetParamSize(const AParamSize: Integer): IMiniRESTSQLParam;
     property AsString: string read GetAsString write SetAsString;
     property AsFloat: Double read GetAsFloat write SetAsFloat;
     property AsInteger: Integer read GetAsInteger write SetAsInteger;
@@ -44,6 +46,7 @@   TMiniRESTSQLParam = class(TInterfacedObject, IMiniRESTSQLParam)
   private
     FParamName: string;
     FParamType: TMiniRESTSQLParamType;
+    FParamSize: Integer;
     {$IFNDEF FPC}
     FValue: TValue;
     {$ELSE}
@@ -75,6 +78,8 @@   TMiniRESTSQLParam = class(TInterfacedObject, IMiniRESTSQLParam)
     function GetAsVariant: Variant;
     procedure SetAsVariant(const AValue: Variant);
     function GetParamType: TMiniRESTSQLParamType;
+    function GetParamSize: Integer;
+    function SetParamSize(const AParamSize: Integer): IMiniRESTSQLParam;
   end;
 
 implementation
@@ -239,4 +244,15 @@ procedure TMiniRESTSQLParam.SetParamName(const AName: string);
   FParamName := UpperCase(AName);
 end;
 
+function TMiniRESTSQLParam.GetParamSize: Integer;
+begin
+  Result := FParamSize;
+end;
+
+function TMiniRESTSQLParam.SetParamSize(const AParamSize: Integer): IMiniRESTSQLParam;
+begin
+  FParamSize := AParamSize;
+  Result := Self;
+end;
+
 end.

MiniREST.SQL.Intf.pas

@@ -20,6 +20,7 @@ interface
     procedure SetSQL(const ASQL: string);
     function ParamByName(const AParamName: string): IMiniRESTSQLParam;
     function AddParam(AParam: IMiniRESTSQLParam): IMiniRESTSQLQuery;
+    function GetParams: TArray<IMiniRESTSQLParam>;
     {function GetValue(AField: string) : Variant; overload;
     function GetValue(AField: string; ADefault: Variant): Variant; overload;
     function FieldByName(const AFieldName: string): TField;
@@ -139,6 +140,8 @@ interface
     procedure SetConnectionFactoryEventLogger(ALogger: IMiniRESTSQLConnectionFactoryEventLogger);
     function GetConnectionsCount: Integer;
     procedure SetConnectionsCount(const ACount: Integer);
+    function GetCharSet: string;
+    procedure SetCharSet(const ACharSet: string);    
     function GetObject: TObject;
   end;
 

MiniREST.SQL.SQLDb.pas

@@ -126,7 +126,8 @@   TMiniRESTSQLQuerySQLDb = class(TInterfacedObject, IMiniRESTSQLQuery)
     function ParamByName(const AParamName: string): IMiniRESTSQLParam;
     function AddParam(AParam: IMiniRESTSQLParam): IMiniRESTSQLQuery;
     function ApplyUpdates(const AMaxErrors: Integer): Integer;
-    function GetDataSet: TDataSet;    
+    function GetDataSet: TDataSet;
+    function GetParams: TArray<IMiniRESTSQLParam>;
   end;
 
 implementation
@@ -424,6 +425,15 @@ function TMiniRESTSQLQuerySQLDb.GetDataSet: TDataSet;
   Result := FQry;
 end;
 
+function TMiniRESTSQLQuerySQLDb.GetParams: TArray<IMiniRESTSQLParam>;
+var
+  I: Integer;
+begin
+  SetLength(Result, FParams.Count);
+  for I := 0 to FParams.Count -1 do
+    Result[I] := FParams.Items[I];
+end;
+
 procedure TMiniRESTSQLQuerySQLDb.BeforeOpenMiniRESTDataSet(DataSet: TDataSet);
 var
   LMiniRESTSQLParam: IMiniRESTSQLParam;
@@ -439,6 +449,8 @@ procedure TMiniRESTSQLQuerySQLDb.BeforeOpenMiniRESTDataSet(DataSet: TDataSet);
     //LMiniRESTSQLParam := FParams.Data[I];
     LMiniRESTSQLParam := FParams.Items[I];
     LParam := FQry.ParamByName(LMiniRESTSQLParam.GetParamName);
+    if LMiniRESTSQLParam.GetParamSize > 0 then
+      LParam.Size := LMiniRESTSQLParam.GetParamSize;
     TMiniRESTSQLConnectionSQLDb(FConnection.GetObject).SetMiniRESTSQLParamToSQLParam(LMiniRESTSQLParam, LParam);
   end;
 end;
@@ -526,6 +538,8 @@ procedure TMiniRESTSQLConnectionSQLDb.SetMiniRESTSQLParamToSQLParam(AMiniRESTSQL
     stBoolean: ASQLParam.AsBoolean := AMiniRESTSQLParam.AsBoolean;
     stVariant, stUndefined: ASQLParam.Value := AMiniRESTSQLParam.GetAsVariant;
   end;
+  if (AMiniRESTSQLParam.GetParamType = stString) and (AMiniRESTSQLParam.GetParamSize > 0) then
+    ASQLParam.AsString := Copy(ASQLParam.AsString, 1, AMiniRESTSQLParam.GetParamSize);
 end;
 
 function TMiniRESTSQLConnectionSQLDb.InTransaction: Boolean;
@@ -568,6 +582,8 @@ procedure TMiniRESTSQLConnectionSQLDb.SetConnectionParams;
   LStringList := TStringList.Create;
   try
     FSQLConnection.ConnectorType := GetConnectorType(FConnectionParams.GetDatabaseType);
+    if FConnectionParams.GetCharSet <> '' then
+      FSQLConnection.CharSet := FConnectionParams.GetCharSet;
     FSQLConnection.LoginPrompt := False;
     FSQLConnection.UserName := FConnectionParams.GetUserName;
     FSQLConnection.Password := FConnectionParams.GetPassword;

unittest/SQL/Test.SQL.Default.pas

@@ -126,6 +126,14 @@   TMiniRESTSQLTest = class({$IFNDEF FPC}TObject{$ELSE}TTestCase{$IFEND})
     [Test]
     {$IFEND}
     procedure TestSuccessWithDefaultServerPort;
+    {$IFNDEF FPC}
+    [Test]
+    {$IFEND}
+    procedure TestParamSize;
+    {$IFNDEF FPC}
+    [Test]
+    {$IFEND}
+    procedure TestCharSet;
 (*     {$IFNDEF FPC}
     [Test]
     {$IFEND}
@@ -830,4 +838,87 @@ procedure TMiniRESTSQLTest.TestSuccessWithDefaultServerPort;
   {$IFEND}
 end;
 
+procedure TMiniRESTSQLTest.TestParamSize;
+var
+  LConn1: IMiniRESTSQLConnection;
+  LQry, LQryID: IMiniRESTSQLQuery;
+  LId: Integer;
+  I: Integer;
+begin
+  {
+    LENGTH OF PHONE IS 15, THEN THE PARAM SIZE SHOULD BE 15,
+    IF THE VALUE SIZE OF PARAM ARE BIGGER THAN SIZE,
+    THE VALUE WILL TRUNCATED
+  }  
+  LConn1 := FConnectionFactory.GetConnection;
+  LQry := LConn1.GetQuery;
+  LQryID := LConn1.GetQuery;
+  LQry.SQL := 'SELECT * FROM CUSTOMER WHERE 1=0';
+  LQry.Open;
+  for I := 0 to 5 do
+  begin
+    LQryID.Close;
+    LQryID.SQL := 'select gen_id(gen_customer_id, 1) from rdb$database';
+    LQryID.Open;
+    LId := LQryID.DataSet.FieldByName('GEN_ID').AsInteger;      
+    LQry.DataSet.Append;
+    LQry.DataSet.FieldByName('ID').AsInteger := LId;
+    LQry.DataSet.FieldByName('NAME').AsString := 'HUE';
+    LQry.DataSet.FieldByName('PHONE').AsString := '999999999999999';
+    LQry.DataSet.Post;    
+  end;
+  LQry.ApplyUpdates(0);
+  LQry := LConn1.GetQuery;
+  LQry.SQL := 'SELECT * FROM CUSTOMER WHERE PHONE = :PHONE';
+  LQry.ParamByName('PHONE').SetParamSize(15);
+  LQry.ParamByName('PHONE').AsString := 'BIG BIG BIG BIG 999999999999999 BIG BIG';
+  LQry.Open;
+  {$IFNDEF FPC}
+  Assert.AreTrue(LQry.DataSet.Active);
+  {$ELSE}
+  CheckTrue(LQry.DataSet.Active);
+  {$IFEND}
+end;
+
+procedure TMiniRESTSQLTest.TestCharSet;
+var
+  LConn1: IMiniRESTSQLConnection;
+  LQry: IMiniRESTSQLQuery;  
+  LConnectionFactory: IMiniRESTSQLConnectionFactory;
+  LConnectionFactoryParams: IMiniRESTSQLConnectionFactoryParams;
+  LExpectedFilePath: string;
+begin
+  LConnectionFactoryParams := GetConnectionFactoryParams;  
+  LConnectionFactoryParams.SetCharSet('UTF8');
+  LConnectionFactory := GetConnectionFactory(LConnectionFactoryParams);
+  LExpectedFilePath := ParamStr(0);
+  LConn1 := LConnectionFactory.GetConnection;
+  LQry := LConn1.GetQuery;
+  LQry.SQL := 'SELECT * FROM MON$ATTACHMENTS WHERE MON$CHARACTER_SET_ID = :CHARSET_ID ' +
+  ' AND MON$REMOTE_PROCESS = :REMOTE_PROCESS';
+  LQry.ParamByName('CHARSET_ID').AsInteger := 4; // UTF8 FIREBIRD 2.5;
+  LQry.ParamByName('REMOTE_PROCESS').AsString := LExpectedFilePath;  
+  LQry.Open;    
+  {$IFNDEF FPC}
+  Assert.AreTrue(LQry.DataSet.RecordCount = 1);
+  {$ELSE}
+  CheckTrue(LQry.DataSet.RecordCount = 1);
+  {$IFEND}
+
+  LConnectionFactoryParams.SetCharSet('WIN1252');
+  LConnectionFactory := GetConnectionFactory(LConnectionFactoryParams);  
+  LConn1 := LConnectionFactory.GetConnection;
+  LQry := LConn1.GetQuery;
+  LQry.SQL := 'SELECT * FROM MON$ATTACHMENTS WHERE MON$CHARACTER_SET_ID = :CHARSET_ID ' +
+  ' AND MON$REMOTE_PROCESS = :REMOTE_PROCESS';
+  LQry.ParamByName('CHARSET_ID').AsInteger := 53; // WIN1252 FIREBIRD 2.5;
+  LQry.ParamByName('REMOTE_PROCESS').AsString := LExpectedFilePath;  
+  LQry.Open;    
+  {$IFNDEF FPC}
+  Assert.AreTrue(LQry.DataSet.RecordCount = 1);
+  {$ELSE}
+  CheckTrue(LQry.DataSet.RecordCount = 1);
+  {$IFEND}
+end;
+
 end.