Delphi/delphimvcframework
1
0
Fork 0
mirror of https://github.com/danieleteti/delphimvcframework.git synced 2024-11-15 07:45:54 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Loading of SQL generators refactored

Browse Source
This commit is contained in:
Daniele Teti 2024-10-16 08:10:50 +02:00
parent 2c4c10f60a
commit ac6011143c
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sources/MVCFramework.ActiveRecord.pas
View File

@ -46,7 +46,9 @@ uses
MVCFramework.RQL.Parser,
MVCFramework.Cache,
MVCFramework.Serializer.Intf,
MVCFramework.Serializer.Commons, System.SyncObjs, System.TypInfo;
MVCFramework.Serializer.Commons,
System.SyncObjs,
System.TypInfo;
type
EMVCActiveRecord = class(EMVCException)
@ -879,15 +881,15 @@ type
class var cInstance: TMVCSQLGeneratorRegistry;
class var
cLock: TObject;
fSQLGenerators: TDictionary<string, TMVCSQLGeneratorClass>;
cConnectionsLock: TObject;
protected
constructor Create;
public
destructor Destroy; override;
class function Instance: TMVCSQLGeneratorRegistry;
class destructor Destroy;
class constructor Create;
class destructor Destroy;
procedure RegisterSQLGenerator(const aBackend: string; const aRQLBackendClass: TMVCSQLGeneratorClass);
procedure UnRegisterSQLGenerator(const aBackend: string);
function GetSQLGenerator(const aBackend: string): TMVCSQLGeneratorClass;
@ -966,20 +968,12 @@ uses
FireDAC.Stan.Option,
Data.FmtBcd,
System.Variants,
System.Math,
{link all sql generators}
MVCFramework.SQLGenerators.PostgreSQL,
MVCFramework.SQLGenerators.Firebird,
MVCFramework.SQLGenerators.Sqlite,
MVCFramework.SQLGenerators.MySQL,
MVCFramework.SQLGenerators.MSSQL,
MVCFramework.SQLGenerators.Interbase;
System.Math;
var
gCtx: TRttiContext;
gEntitiesRegistry: IMVCEntitiesRegistry;
gConnections: IMVCActiveRecordConnections;
gConnectionsLock: TObject;
gTableMap: IMVCActiveRecordTableMap;
gTableMapLock: TObject;
@ -3844,13 +3838,13 @@ end;
class constructor TMVCSQLGeneratorRegistry.Create;
begin
cLock := TObject.Create;
cConnectionsLock := TObject.Create;
end;
class destructor TMVCSQLGeneratorRegistry.Destroy;
begin
cLock.Free;
cInstance.Free;
cConnectionsLock.Free;
end;
destructor TMVCSQLGeneratorRegistry.Destroy;
@ -3871,14 +3865,14 @@ class function TMVCSQLGeneratorRegistry.Instance: TMVCSQLGeneratorRegistry;
begin
if not Assigned(cInstance) then
begin
TMonitor.Enter(cLock);
TMonitor.Enter(cConnectionsLock);
try
if not Assigned(cInstance) then
begin
cInstance := TMVCSQLGeneratorRegistry.Create;
end;
finally
TMonitor.Exit(cLock);
TMonitor.Exit(cConnectionsLock);
end;
end;
Result := cInstance;
@ -4838,7 +4832,6 @@ end;
initialization
gConnectionsLock := TObject.Create;
gTableMapLock := TObject.Create;
gCtx := TRttiContext.Create;
gCtx.FindType('');
@ -4846,7 +4839,6 @@ gCtx.FindType('');
finalization
gCtx.Free;
gConnectionsLock.Free;
gTableMapLock.Free;
end.