Merge branch 'main' into Relations

Author: Al-Muhandis

.github/workflows/make.yml

@@ -26,7 +26,7 @@ jobs:
           - ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         submodules: true
 

core/dopf.pas

@@ -707,7 +707,7 @@ destructor TdGConnection.Destroy;
 procedure TdGConnection.CheckBrokerClass;
 begin
   if not T1.InheritsFrom(TdConnectionBroker) then
-    raise EdConnection.CreateFmt('Invalid broker class: "%s".', [T1.ClassName]);
+    raise EdConnection.CreateFmt('Invalid broker class: "%s".', [ShortString(T1.ClassName)]);
 end;
 
 procedure TdGConnection.CheckBroker;
@@ -719,7 +719,7 @@ procedure TdGConnection.CheckBroker;
 procedure TdGConnection.CheckLoggerClass;
 begin
   if not T2.InheritsFrom(TdLogger) then
-    raise EdConnection.CreateFmt('Invalid logger class: "%s".', [T2.ClassName]);
+    raise EdConnection.CreateFmt('Invalid logger class: "%s".', [ShortString(T2.ClassName)]);
 end;
 
 function TdGConnection.GetConnected: Boolean;
@@ -1297,7 +1297,7 @@ procedure TdGQuery.SetParams(AEntity: TObject);
 procedure TdGQuery.CheckBrokerClass;
 begin
   if not T1.InheritsFrom(TdQueryBroker) then
-    raise EdQuery.CreateFmt('Invalid broker class: "%s".', [T1.ClassName]);
+    raise EdQuery.CreateFmt('Invalid broker class: "%s".', [ShortString(T1.ClassName)]);
 end;
 
 procedure TdGQuery.CheckBroker;

tests/console.lpr

@@ -3,7 +3,8 @@
 {$mode objfpc}{$H+}
 
 uses
-  Classes, consoletestrunner, test_insertbuilder
+  Classes, consoletestrunner,
+  test_insertbuilder, test_dclasses, test_dopf, test_dutils
   ;
 type
 

tests/test_dclasses.pas

@@ -0,0 +1,31 @@
+unit test_dclasses;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  fpcunit, testregistry, dclasses, Classes;
+
+type
+  TTestDClasses = class(TTestCase)
+  published
+    procedure TestInheritances;
+  end;
+
+implementation
+
+uses
+  SysUtils
+  ;
+
+procedure TTestDClasses.TestInheritances;
+begin
+  AssertTrue(EdException.InheritsFrom(Exception));
+  AssertTrue(TdObject.InheritsFrom(TObject));
+  AssertTrue(TdComponent.InheritsFrom(TComponent));
+end;
+
+initialization
+  RegisterTest(TTestDClasses);
+end.

tests/test_dopf.pas

@@ -0,0 +1,54 @@
+unit test_dopf;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  fpcunit, testregistry, dopf, Classes;
+
+type
+  TTestDOpf = class(TTestCase)
+  published
+    procedure TestConnectionBrokerConnect;
+    procedure TestGConnectionCreate;
+  end;
+
+implementation
+
+type
+  TMyConnection = class(specialize TdGConnection<TdConnectionBroker, TdLogger>);
+
+procedure TTestDOpf.TestConnectionBrokerConnect;
+var
+  B: TdConnectionBroker;
+begin
+  B := TdConnectionBroker.Create;
+  try
+    try
+      B.Connect;
+      Fail('Expected exception');
+    except
+      on E: EdNotImplemented do ;
+    end;
+  finally
+    B.Free;
+  end;
+end;
+
+procedure TTestDOpf.TestGConnectionCreate;
+var
+  C: TMyConnection;
+begin
+  C := TMyConnection.Create(nil);
+  try
+    AssertTrue(Assigned(C.Broker));
+    AssertTrue(Assigned(C.Logger));
+  finally
+    C.Free;
+  end;
+end;
+
+initialization
+  RegisterTest(TTestDOpf);
+end.

tests/test_dutils.pas

@@ -0,0 +1,81 @@
+unit test_dutils;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  fpcunit, testregistry, dutils;
+
+type
+  TTestDUtils = class(TTestCase)
+  published
+    procedure TestParameterizeSQLNilParams;
+    procedure TestGetFieldsNilObject;
+    procedure TestSetFieldsNilObject;
+    procedure TestGetParamsNilObject;
+    procedure TestSetParamsNilObject;
+  end;
+
+implementation
+
+uses
+  dClasses
+  ;
+
+procedure TTestDUtils.TestParameterizeSQLNilParams;
+var
+  S: string;
+begin
+  S := 'select * from t where id=:id';
+  try
+    dParameterizeSQL(S, nil);
+    Fail('Expected exception');
+  except
+    on E: EdException do ;
+  end;
+end;
+
+procedure TTestDUtils.TestGetFieldsNilObject;
+begin
+  try
+    dGetFields(nil, nil);
+    Fail('Expected exception');
+  except
+    on E: EdException do ;
+  end;
+end;
+
+procedure TTestDUtils.TestSetFieldsNilObject;
+begin
+  try
+    dSetFields(nil, nil);
+    Fail('Expected exception');
+  except
+    on E: EdException do ;
+  end;
+end;
+
+procedure TTestDUtils.TestGetParamsNilObject;
+begin
+  try
+    dGetParams(nil, nil);
+    Fail('Expected exception');
+  except
+    on E: EdException do ;
+  end;
+end;
+
+procedure TTestDUtils.TestSetParamsNilObject;
+begin
+  try
+    dSetParams(nil, nil);
+    Fail('Expected exception');
+  except
+    on E: EdException do ;
+  end;
+end;
+
+initialization
+  RegisterTest(TTestDUtils);
+end.