Merge branch 'HashLoad:master' into master

.gitignore

@@ -5,60 +5,17 @@
 *.tvsconfig
 *.txaPackage
 *.local
+*.otares
+*.identcache
+*.stat
+*.exe
+*.map
+*.rsm
 __history/
 __recovery/
+Win32/
 Lib/
 # Examples/
-Examples/Data/
-Examples/JSON/
-Win32/
-Source/CQLBr/
-Source/DBEBr/
-Source/DBCBr/
-Source/JSONBr/
-Source/RESTful/
-*.identcache
-*.stat
-Examples/Data/Blob/Exemplo_ORMBr.exe
-Examples/Data/ORMBrDataExamples.groupproj.local
-Examples/Data/Blob Sem DataSet/ORMBrBlob.exe
-Examples/Data/DBExpress/ORMBrDBExpress.dproj.local
-Examples/Data/DBExpress/ORMBrDBExpress.exe
-Examples/Data/ADO/ORMBrADO.dproj.local
-Examples/Data/ADO/ORMBrADO.exe
-Examples/Data/DBExpress Sem DataSet/ORMBrDBExpressSemDataSet.exe
-Examples/Data/FireDAC/ORMBrFireDAC.exe
-Examples/Data/FireDAC Crud Simples/ORMBrFireDACCrudSimples.exe
-Examples/Data/FireDAC Sem DataSet/ORMBrFireDACSemDataSet.exe
-Examples/Data/FireDAC/ORMBrFireDAC.map
-Examples/Data/IBExpress/ORMBrIBExpress.exe
-Examples/Data/Blob/ORMBrBlob.exe
-Examples/Data/Blob Sem DataSet/ORMBrBlobSemDataSet.exe
-Examples/Data/Quatro Niveis de Dados/ORMBr_QuatroNiveisDeDados.exe
-Examples/Data/SQLite Native/ORMBr_SQLite.exe
-Examples/Data/SQLite Native Sem DataSet/ORMBr_SQLiteSemDataSet.exe
-Examples/Data/Usando ICriteria/ORMBr_FiredacUsandoICriteria.exe
-Examples/Data/Uso TManagerDataSet/ORMBr_FiredacManagerDataSet.exe
-Examples/Data/Uso TManagerObjectSet/ORMBr_FireDACManagerObjectSet.exe
-Examples/Data/Varios Niveis de Dados/ORMBr_VariosNiveisDeDados.exe
-Examples/Data/Zeos Sem DataSet/ORMBr_ZeosSemDataSet.exe
-Examples/Data/Zeos/ORMBr_Zeos.exe
-Examples/Data/Blob Sem DataSet/ORMBr_BlobSemDataSet.exe
-Examples/Data/Blob/ORMBr_Blob.exe
-Examples/Data/DBExpress/ORMBr_DBExpress.exe
-Examples/Data/DBExpress Sem DataSet/ORMBr_DBExpressSemDataSet.exe
-Examples/Data/FireDAC Crud Simples/ORMBr_FireDACCrudSimples.exe
-Examples/Data/FireDAC Sem DataSet/ORMBr_FireDACSemDataSet.exe
-Examples/Data/FireDAC/ORMBr_FireDAC.exe
-Examples/Data/FireDAC/ORMBr_FireDAC.map
-Examples/Data/ADO/ORMBr_ADO.exe
-Examples/Data/ADO Sem DataSet/ORMBr_ADOSemDataSet.exe
-Examples/Datasnap/Client/ORMBrFireDAC.exe
-Examples/Datasnap/Client/ORMBrFireDAC.map
-Examples/Datasnap/Server/ORMBrServer.exe
-Examples/JSON/PJson.exe
-Examples/JSON/PJson.rsm
-Examples/NoSQL/MongoDB/FireDAC MongoDB Crud/ORMBrFireDAC.exe
-Examples/Metadata/FireDAC/Firemonkey/ORMBrMetadata.otares
-Examples/Data/IBExpress/ORMBr_IBExpress.exe
+# Examples/Data/
+# Examples/JSON/
 /modules

Examples/Data/Blob Sem DataSet/ormbr.model.PERSON.pas

@@ -19,7 +19,10 @@ interface
 type
   [Entity]
   [Table('PERSON', '')]
-  [PrimaryKey('ID', NotInc, NoSort, False, 'Chave primária')]
+  [PrimaryKey('ID', TAutoIncType.NotInc,
+                    TGeneratorType.NoneInc,
+                    TSortingOrder.NoSort,
+                    False, 'Chave primária')]
   TPERSON = class
   private
     { Private declarations } 
@@ -42,12 +45,12 @@   TPERSON = class
     FPERSON_FLD13: TBlob;
   public
     { Public declarations }
-    [Restrictions([NotNull])]
+    [Restrictions([TRestriction.NotNull])]
     [Column('ID', ftInteger)]
     [Dictionary('ID', 'Mensagem de validação', '', '', '', taCenter)]
     property ID: Integer read FID write FID;
 
-    [Restrictions([NotNull])]
+    [Restrictions([TRestriction.NotNull])]
     [Column('FIRSTNAME', ftString, 40)]
     [Dictionary('FIRSTNAME', 'Mensagem de validação', '', '', '', taLeftJustify)]
     property FIRSTNAME: String read FFIRSTNAME write FFIRSTNAME;
@@ -56,12 +59,12 @@   TPERSON = class
     [Dictionary('LASTNAME', 'Mensagem de validação', '', '', '', taLeftJustify)]
     property LASTNAME: Nullable<String> read FLASTNAME write FLASTNAME;
 
-    [Restrictions([NotNull])]
+    [Restrictions([TRestriction.NotNull])]
     [Column('AGE', ftInteger)]
     [Dictionary('AGE', 'Mensagem de validação', '', '', '', taCenter)]
     property AGE: Integer read FAGE write FAGE;
 
-    [Restrictions([NotNull])]
+    [Restrictions([TRestriction.NotNull])]
     [Column('SALARY', ftBCD, 18, 3)]
     [Dictionary('SALARY', 'Mensagem de validação', '0', '', '', taRightJustify)]
     property SALARY: Double read FSALARY write FSALARY;

Examples/Data/Blob Sem DataSet/uMainForm.pas

@@ -23,8 +23,7 @@ interface
 //  ormbr.rest.json,
 //  ormbr.json.utils,
   ormbr.json,
-  FMX.ScrollBox, FMX.Memo, REST.JSON, FMX.Memo.Types,
-  FireDAC.Phys.SQLiteWrapper.Stat;
+  FMX.ScrollBox, FMX.Memo, REST.JSON, FMX.Memo.Types;
 
 type
   TForm2 = class(TForm)

Examples/Data/Blob/ormbr.model.PERSON.pas

@@ -19,7 +19,10 @@ interface
 type
   [Entity]
   [Table('PERSON', '')]
-  [PrimaryKey('ID', NotInc, NoSort, False, 'Chave primária')]
+  [PrimaryKey('ID', TAutoIncType.NotInc,
+                    TGeneratorType.NoneInc,
+                    TSortingOrder.NoSort,
+                    False, 'Chave primária')]
   TPERSON = class
   private
     { Private declarations } 
@@ -42,12 +45,12 @@   TPERSON = class
     FPERSON_FLD13: TBlob;
   public
     { Public declarations } 
-    [Restrictions([NotNull])]
+    [Restrictions([TRestriction.NotNull])]
     [Column('ID', ftInteger)]
     [Dictionary('ID', 'Mensagem de validação', '', '', '', taCenter)]
     property ID: Integer read FID write FID;
 
-    [Restrictions([NotNull])]
+    [Restrictions([TRestriction.NotNull])]
     [Column('FIRSTNAME', ftString, 40)]
     [Dictionary('FIRSTNAME', 'Mensagem de validação', '', '', '', taLeftJustify)]
     property FIRSTNAME: String read FFIRSTNAME write FFIRSTNAME;
@@ -56,12 +59,12 @@   TPERSON = class
     [Dictionary('LASTNAME', 'Mensagem de validação', '', '', '', taLeftJustify)]
     property LASTNAME: Nullable<String> read FLASTNAME write FLASTNAME;
 
-    [Restrictions([NotNull])]
+    [Restrictions([TRestriction.NotNull])]
     [Column('AGE', ftInteger)]
     [Dictionary('AGE', 'Mensagem de validação', '', '', '', taCenter)]
     property AGE: Integer read FAGE write FAGE;
 
-    [Restrictions([NotNull])]
+    [Restrictions([TRestriction.NotNull])]
     [Column('SALARY', ftBCD, 18, 3)]
     [Dictionary('SALARY', 'Mensagem de validação', '0', '', '', taRightJustify)]
     property SALARY: Double read FSALARY write FSALARY;

Examples/Data/FireDAC/ormbr.model.client.pas

@@ -29,7 +29,7 @@   Tclient = class
 //    Fclient_foto: TBlob;
   public
     { Public declarations }
-    [Restrictions([NoUpdate, NotNull])]
+    [Restrictions([TRestriction.NoUpdate, TRestriction.NotNull])]
     [Column('client_id', ftInteger)]
     [Dictionary('client_id','Mensagem de validação','','','',taCenter)]
     property client_id: Integer read Fclient_id write Fclient_id;

Examples/Data/FireDAC/ormbr.model.detail.pas

@@ -31,33 +31,33 @@   Tdetail = class
     FVisto: Boolean;
   public
     { Public declarations }
-    [Restrictions([NoUpdate, NotNull])]
+    [Restrictions([TRestriction.NoUpdate, TRestriction.NotNull])]
     [Column('detail_id', ftInteger)]
     [Dictionary('ID Detalhe','Mensagem de validação','','','',taCenter)]
     property detail_id: Integer read Fdetail_id write Fdetail_id;
 
-    [Restrictions([NotNull])]
+    [Restrictions([TRestriction.NotNull])]
     [Column('master_id', ftInteger)]
-    [ForeignKey('FK_IDMASTER', 'master_id', 'master', 'master_id', Cascade, Cascade)]
+    [ForeignKey('FK_IDMASTER', 'master_id', 'master', 'master_id', TRuleAction.Cascade, TRuleAction.Cascade)]
     [Dictionary('ID Mestre','Mensagem de validação','','','',taCenter)]
     property master_id: Integer read Fmaster_id write Fmaster_id;
 
-    [Restrictions([NotNull])]
+    [Restrictions([TRestriction.NotNull])]
     [Column('lookup_id', ftInteger)]
-    [ForeignKey('FK_IDLOOKUP', 'lookup_id', 'lookup', 'lookup_id', None, None)]
+    [ForeignKey('FK_IDLOOKUP', 'lookup_id', 'lookup', 'lookup_id', TRuleAction.None,  TRuleAction.None)]
     [Dictionary('ID Lookup','Mensagem de validação','0','','',taCenter)]
     property lookup_id: Integer read Flookup_id write Flookup_id;
 
     [Column('lookup_description', ftString, 30)]
     [Dictionary('Descrição Lookup','Mensagem de validação','','','',taLeftJustify)]
     property lookup_description: String read Flookup_description write Flookup_description;
 
-    [Restrictions([NoUpdate, NotNull])]
+    [Restrictions([TRestriction.NoUpdate, TRestriction.NotNull])]
     [Column('price', ftFloat, 18, 3)]
     [Dictionary('Preço Unitário','Mensagem de validação','','#,###,##0.00','',taRightJustify)]
     property price: Double read Fprice write Fprice;
 
-    [Restrictions([NoUpdate, NoInsert, VirtualData])]
+    [Restrictions([TRestriction.NoUpdate, TRestriction.NoInsert, TRestriction.VirtualData])]
     [Column('Visto', ftBoolean)]
     [Dictionary('Virtual','Mensagem de validação','','','',taRightJustify)]
     property Visto: Boolean read FVisto write FVisto;

Examples/Data/FireDAC/ormbr.model.lookup.pas

@@ -24,7 +24,7 @@   Tlookup = class
     Flookup_description: String;
   public
     { Public declarations }
-    [Restrictions([NoUpdate, NotNull])]
+    [Restrictions([TRestriction.NoUpdate, TRestriction.NotNull])]
     [Column('lookup_id', ftInteger)]
     [Dictionary('lookup_id','Mensagem de validação','','','',taCenter)]
     property lookup_id: Integer read Flookup_id write Flookup_id;

Examples/Data/FireDAC/ormbr.model.master.pas

@@ -23,7 +23,10 @@ interface
 
   [Entity]
   [Table('master','')]
-  [PrimaryKey('master_id', AutoInc, SequenceInc, NoSort, True, 'Chave primária')]
+  [PrimaryKey('master_id', TAutoIncType.AutoInc,
+                           TGeneratorType.SequenceInc,
+                           TSortingOrder.NoSort,
+                           True, 'Chave primária')]
   [Sequence('seq_master')]
   [OrderBy('master_id')]
   Tmaster = class
@@ -47,7 +50,7 @@   Tmaster = class
     constructor Create;
     destructor Destroy; override;
 
-    [Restrictions([NoUpdate, NotNull])]
+    [Restrictions([TRestriction.NoUpdate, TRestriction.NotNull])]
     [Column('master_id', ftInteger)]
     [Dictionary('master_id','Mensagem de validação','1','','',taCenter)]
     property master_id: Integer read Fmaster_id write Fmaster_id;
@@ -56,25 +59,25 @@   Tmaster = class
     [Dictionary('description','Mensagem de validação','','','',taLeftJustify)]
     property description: Nullable<String> read Fdescription write Fdescription;
 
-    [Restrictions([NotNull])]
+    [Restrictions([TRestriction.NotNull])]
     [Column('updatedate', ftDate)]
     [Dictionary('updatedate','Mensagem de validação','Date','','!##/##/####;1;_',taCenter)]
     property updatedate: TDate read Fupdatedate write Fupdatedate;
 
-    [Restrictions([NotNull])]
+    [Restrictions([TRestriction.NotNull])]
     [Column('registerdate', ftDate)]
     [Dictionary('registerdate','Mensagem de validação','Date','','!##/##/####;1;_',taCenter)]
     property registerdate: TDateTime read Fregisterdate write Fregisterdate;
 
-    [Restrictions([NotNull])]
+    [Restrictions([TRestriction.NotNull])]
     [Column('client_id', ftInteger)]
     [ForeignKey('FK_IDCLIENT', 'client_id', 'client', 'client_id')]
     [Dictionary('client_id','Mensagem de validação','1','','',taCenter)]
     property client_id: Integer read Fclient_id write Fclient_id;
 
-    [Restrictions([NoInsert, NoUpdate])]
+    [Restrictions([TRestriction.NoInsert, TRestriction.NoUpdate])]
     [Column('aliascollumn', ftString, 60)]
-    [JoinColumn('client_id', 'client', 'client_id', 'client_name', InnerJoin, 'aliascollumn', 'aliastable')]
+    [JoinColumn('client_id', 'client', 'client_id', 'client_name', TJoin.InnerJoin, 'aliascollumn', 'aliastable')]
     [Dictionary('Nome do Cliente', '')]
     property client_name: string read fclient_name write fclient_name;
 
@@ -93,14 +96,17 @@   Tmaster = class
 //    [Enumeration(TEnumType.etBoolean, '0, 1')]
 //    property Inativo: Boolean read FInativo write FInativo;
 
-    [Association(OneToOne, 'client_id', 'client', 'client_id')]
+    [Association(TMultiplicity.OneToOne, 'client_id', 'client', 'client_id')]
     property client: Tclient read Fclient write Fclient;
 
-    [Association(OneToMany, 'master_id', 'detail', 'master_id')]
-    [CascadeActions([CascadeAutoInc, CascadeInsert, CascadeUpdate, CascadeDelete])]
+    [Association(TMultiplicity.OneToMany, 'master_id', 'detail', 'master_id')]
+    [CascadeActions([TCascadeAction.CascadeAutoInc,
+                     TCascadeAction.CascadeInsert,
+                     TCascadeAction.CascadeUpdate,
+                     TCascadeAction.CascadeDelete])]
     property detail: TObjectList<Tdetail> read Fdetail write Fdetail;
 
-    [Restrictions([NoInsert, NoUpdate])]
+    [Restrictions([TRestriction.NoInsert, TRestriction.NoUpdate])]
     property total: Double read GetTotal;
   end;