Skip to content

Commit 73df1be

Browse files
viniciussanchezviniciussanchez
authored
Merge pull request #5 from viniciussanchez/master
Implement ToJSONObject, ToJSONArray and Improvements class helper
2 parents ef33d33 + 39b4881 commit 73df1be

5 files changed

Lines changed: 217 additions & 101 deletions

File tree

‎ragna.dproj‎

Lines changed: 146 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<ProjectGuid>{D9E8CA95-FBB1-42EA-A7B4-909AC5ACFADD}</ProjectGuid>
44
<MainSource>ragna.dpk</MainSource>
5-
<ProjectVersion>18.7</ProjectVersion>
5+
<ProjectVersion>18.8</ProjectVersion>
66
<FrameworkType>None</FrameworkType>
77
<Base>True</Base>
88
<Config Condition="'$(Config)'==''">Debug</Config>
@@ -18,6 +18,11 @@
1818
<CfgParent>Base</CfgParent>
1919
<Base>true</Base>
2020
</PropertyGroup>
21+
<PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
22+
<Base_Android64>true</Base_Android64>
23+
<CfgParent>Base</CfgParent>
24+
<Base>true</Base>
25+
</PropertyGroup>
2126
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
2227
<Base_Win32>true</Base_Win32>
2328
<CfgParent>Base</CfgParent>
@@ -53,12 +58,21 @@
5358
<DCC_CBuilderOutput>All</DCC_CBuilderOutput>
5459
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
5560
<SanitizedProjectName>ragna</SanitizedProjectName>
56-
<DCC_UnitSearchPath>modules\.dcp;modules\.dcu;modules;modules\dataset-serialize\samples\src;modules\dataset-serialize\src\core;modules\dataset-serialize\src\helpers;modules\dataset-serialize\src\providers;modules\dataset-serialize\src\singletons;modules\dataset-serialize\src\types;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
61+
<DCC_UnitSearchPath>$(DCC_UnitSearchPath);modules\.dcp;modules\.dcu;modules;modules\dataset-serialize\samples\src;modules\dataset-serialize\src\core;modules\dataset-serialize\src\helpers;modules\dataset-serialize\src\providers;modules\dataset-serialize\src\singletons;modules\dataset-serialize\src\types</DCC_UnitSearchPath>
5762
</PropertyGroup>
5863
<PropertyGroup Condition="'$(Base_Android)'!=''">
5964
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
6065
<EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services-ads-7.0.0.dex.jar;google-play-services-analytics-7.0.0.dex.jar;google-play-services-base-7.0.0.dex.jar;google-play-services-identity-7.0.0.dex.jar;google-play-services-maps-7.0.0.dex.jar;google-play-services-panorama-7.0.0.dex.jar;google-play-services-plus-7.0.0.dex.jar;google-play-services-wallet-7.0.0.dex.jar</EnabledSysJars>
6166
</PropertyGroup>
67+
<PropertyGroup Condition="'$(Base_Android64)'!=''">
68+
<VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=</VerInfo_Keys>
69+
<BT_BuildType>Debug</BT_BuildType>
70+
<Base_Android>true</Base_Android>
71+
<CfgParent>Base</CfgParent>
72+
<Base>true</Base>
73+
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
74+
<EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services-ads-7.0.0.dex.jar;google-play-services-analytics-7.0.0.dex.jar;google-play-services-base-7.0.0.dex.jar;google-play-services-identity-7.0.0.dex.jar;google-play-services-maps-7.0.0.dex.jar;google-play-services-panorama-7.0.0.dex.jar;google-play-services-plus-7.0.0.dex.jar;google-play-services-wallet-7.0.0.dex.jar</EnabledSysJars>
75+
</PropertyGroup>
6276
<PropertyGroup Condition="'$(Base_Win32)'!=''">
6377
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
6478
<BT_BuildType>Debug</BT_BuildType>
@@ -178,12 +192,20 @@
178192
<RemoteDir>classes</RemoteDir>
179193
<Operation>1</Operation>
180194
</Platform>
195+
<Platform Name="Android64">
196+
<RemoteDir>classes</RemoteDir>
197+
<Operation>1</Operation>
198+
</Platform>
181199
</DeployClass>
182200
<DeployClass Name="AndroidFileProvider">
183201
<Platform Name="Android">
184202
<RemoteDir>res\xml</RemoteDir>
185203
<Operation>1</Operation>
186204
</Platform>
205+
<Platform Name="Android64">
206+
<RemoteDir>res\xml</RemoteDir>
207+
<Operation>1</Operation>
208+
</Platform>
187209
</DeployClass>
188210
<DeployClass Name="AndroidGDBServer">
189211
<Platform Name="Android">
@@ -196,138 +218,242 @@
196218
<RemoteDir>library\lib\armeabi</RemoteDir>
197219
<Operation>1</Operation>
198220
</Platform>
221+
<Platform Name="Android64">
222+
<RemoteDir>library\lib\armeabi</RemoteDir>
223+
<Operation>1</Operation>
224+
</Platform>
225+
</DeployClass>
226+
<DeployClass Name="AndroidLibnativeArmeabiv7aFile">
227+
<Platform Name="Android64">
228+
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
229+
<Operation>1</Operation>
230+
</Platform>
199231
</DeployClass>
200232
<DeployClass Name="AndroidLibnativeMipsFile">
201233
<Platform Name="Android">
202234
<RemoteDir>library\lib\mips</RemoteDir>
203235
<Operation>1</Operation>
204236
</Platform>
237+
<Platform Name="Android64">
238+
<RemoteDir>library\lib\mips</RemoteDir>
239+
<Operation>1</Operation>
240+
</Platform>
205241
</DeployClass>
206242
<DeployClass Name="AndroidServiceOutput">
207243
<Platform Name="Android">
208244
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
209245
<Operation>1</Operation>
210246
</Platform>
247+
<Platform Name="Android64">
248+
<RemoteDir>library\lib\arm64-v8a</RemoteDir>
249+
<Operation>1</Operation>
250+
</Platform>
251+
</DeployClass>
252+
<DeployClass Name="AndroidServiceOutput_Android32">
253+
<Platform Name="Android64">
254+
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
255+
<Operation>1</Operation>
256+
</Platform>
211257
</DeployClass>
212258
<DeployClass Name="AndroidSplashImageDef">
213259
<Platform Name="Android">
214260
<RemoteDir>res\drawable</RemoteDir>
215261
<Operation>1</Operation>
216262
</Platform>
263+
<Platform Name="Android64">
264+
<RemoteDir>res\drawable</RemoteDir>
265+
<Operation>1</Operation>
266+
</Platform>
217267
</DeployClass>
218268
<DeployClass Name="AndroidSplashStyles">
219269
<Platform Name="Android">
220270
<RemoteDir>res\values</RemoteDir>
221271
<Operation>1</Operation>
222272
</Platform>
273+
<Platform Name="Android64">
274+
<RemoteDir>res\values</RemoteDir>
275+
<Operation>1</Operation>
276+
</Platform>
223277
</DeployClass>
224278
<DeployClass Name="AndroidSplashStylesV21">
225279
<Platform Name="Android">
226280
<RemoteDir>res\values-v21</RemoteDir>
227281
<Operation>1</Operation>
228282
</Platform>
283+
<Platform Name="Android64">
284+
<RemoteDir>res\values-v21</RemoteDir>
285+
<Operation>1</Operation>
286+
</Platform>
229287
</DeployClass>
230288
<DeployClass Name="Android_Colors">
231289
<Platform Name="Android">
232290
<RemoteDir>res\values</RemoteDir>
233291
<Operation>1</Operation>
234292
</Platform>
293+
<Platform Name="Android64">
294+
<RemoteDir>res\values</RemoteDir>
295+
<Operation>1</Operation>
296+
</Platform>
235297
</DeployClass>
236298
<DeployClass Name="Android_DefaultAppIcon">
237299
<Platform Name="Android">
238300
<RemoteDir>res\drawable</RemoteDir>
239301
<Operation>1</Operation>
240302
</Platform>
303+
<Platform Name="Android64">
304+
<RemoteDir>res\drawable</RemoteDir>
305+
<Operation>1</Operation>
306+
</Platform>
241307
</DeployClass>
242308
<DeployClass Name="Android_LauncherIcon144">
243309
<Platform Name="Android">
244310
<RemoteDir>res\drawable-xxhdpi</RemoteDir>
245311
<Operation>1</Operation>
246312
</Platform>
313+
<Platform Name="Android64">
314+
<RemoteDir>res\drawable-xxhdpi</RemoteDir>
315+
<Operation>1</Operation>
316+
</Platform>
247317
</DeployClass>
248318
<DeployClass Name="Android_LauncherIcon36">
249319
<Platform Name="Android">
250320
<RemoteDir>res\drawable-ldpi</RemoteDir>
251321
<Operation>1</Operation>
252322
</Platform>
323+
<Platform Name="Android64">
324+
<RemoteDir>res\drawable-ldpi</RemoteDir>
325+
<Operation>1</Operation>
326+
</Platform>
253327
</DeployClass>
254328
<DeployClass Name="Android_LauncherIcon48">
255329
<Platform Name="Android">
256330
<RemoteDir>res\drawable-mdpi</RemoteDir>
257331
<Operation>1</Operation>
258332
</Platform>
333+
<Platform Name="Android64">
334+
<RemoteDir>res\drawable-mdpi</RemoteDir>
335+
<Operation>1</Operation>
336+
</Platform>
259337
</DeployClass>
260338
<DeployClass Name="Android_LauncherIcon72">
261339
<Platform Name="Android">
262340
<RemoteDir>res\drawable-hdpi</RemoteDir>
263341
<Operation>1</Operation>
264342
</Platform>
343+
<Platform Name="Android64">
344+
<RemoteDir>res\drawable-hdpi</RemoteDir>
345+
<Operation>1</Operation>
346+
</Platform>
265347
</DeployClass>
266348
<DeployClass Name="Android_LauncherIcon96">
267349
<Platform Name="Android">
268350
<RemoteDir>res\drawable-xhdpi</RemoteDir>
269351
<Operation>1</Operation>
270352
</Platform>
353+
<Platform Name="Android64">
354+
<RemoteDir>res\drawable-xhdpi</RemoteDir>
355+
<Operation>1</Operation>
356+
</Platform>
271357
</DeployClass>
272358
<DeployClass Name="Android_NotificationIcon24">
273359
<Platform Name="Android">
274360
<RemoteDir>res\drawable-mdpi</RemoteDir>
275361
<Operation>1</Operation>
276362
</Platform>
363+
<Platform Name="Android64">
364+
<RemoteDir>res\drawable-mdpi</RemoteDir>
365+
<Operation>1</Operation>
366+
</Platform>
277367
</DeployClass>
278368
<DeployClass Name="Android_NotificationIcon36">
279369
<Platform Name="Android">
280370
<RemoteDir>res\drawable-hdpi</RemoteDir>
281371
<Operation>1</Operation>
282372
</Platform>
373+
<Platform Name="Android64">
374+
<RemoteDir>res\drawable-hdpi</RemoteDir>
375+
<Operation>1</Operation>
376+
</Platform>
283377
</DeployClass>
284378
<DeployClass Name="Android_NotificationIcon48">
285379
<Platform Name="Android">
286380
<RemoteDir>res\drawable-xhdpi</RemoteDir>
287381
<Operation>1</Operation>
288382
</Platform>
383+
<Platform Name="Android64">
384+
<RemoteDir>res\drawable-xhdpi</RemoteDir>
385+
<Operation>1</Operation>
386+
</Platform>
289387
</DeployClass>
290388
<DeployClass Name="Android_NotificationIcon72">
291389
<Platform Name="Android">
292390
<RemoteDir>res\drawable-xxhdpi</RemoteDir>
293391
<Operation>1</Operation>
294392
</Platform>
393+
<Platform Name="Android64">
394+
<RemoteDir>res\drawable-xxhdpi</RemoteDir>
395+
<Operation>1</Operation>
396+
</Platform>
295397
</DeployClass>
296398
<DeployClass Name="Android_NotificationIcon96">
297399
<Platform Name="Android">
298400
<RemoteDir>res\drawable-xxxhdpi</RemoteDir>
299401
<Operation>1</Operation>
300402
</Platform>
403+
<Platform Name="Android64">
404+
<RemoteDir>res\drawable-xxxhdpi</RemoteDir>
405+
<Operation>1</Operation>
406+
</Platform>
301407
</DeployClass>
302408
<DeployClass Name="Android_SplashImage426">
303409
<Platform Name="Android">
304410
<RemoteDir>res\drawable-small</RemoteDir>
305411
<Operation>1</Operation>
306412
</Platform>
413+
<Platform Name="Android64">
414+
<RemoteDir>res\drawable-small</RemoteDir>
415+
<Operation>1</Operation>
416+
</Platform>
307417
</DeployClass>
308418
<DeployClass Name="Android_SplashImage470">
309419
<Platform Name="Android">
310420
<RemoteDir>res\drawable-normal</RemoteDir>
311421
<Operation>1</Operation>
312422
</Platform>
423+
<Platform Name="Android64">
424+
<RemoteDir>res\drawable-normal</RemoteDir>
425+
<Operation>1</Operation>
426+
</Platform>
313427
</DeployClass>
314428
<DeployClass Name="Android_SplashImage640">
315429
<Platform Name="Android">
316430
<RemoteDir>res\drawable-large</RemoteDir>
317431
<Operation>1</Operation>
318432
</Platform>
433+
<Platform Name="Android64">
434+
<RemoteDir>res\drawable-large</RemoteDir>
435+
<Operation>1</Operation>
436+
</Platform>
319437
</DeployClass>
320438
<DeployClass Name="Android_SplashImage960">
321439
<Platform Name="Android">
322440
<RemoteDir>res\drawable-xlarge</RemoteDir>
323441
<Operation>1</Operation>
324442
</Platform>
443+
<Platform Name="Android64">
444+
<RemoteDir>res\drawable-xlarge</RemoteDir>
445+
<Operation>1</Operation>
446+
</Platform>
325447
</DeployClass>
326448
<DeployClass Name="Android_Strings">
327449
<Platform Name="Android">
328450
<RemoteDir>res\values</RemoteDir>
329451
<Operation>1</Operation>
330452
</Platform>
453+
<Platform Name="Android64">
454+
<RemoteDir>res\values</RemoteDir>
455+
<Operation>1</Operation>
456+
</Platform>
331457
</DeployClass>
332458
<DeployClass Name="DebugSymbols">
333459
<Platform Name="iOSSimulator">
@@ -397,6 +523,9 @@
397523
<Platform Name="Android">
398524
<Operation>0</Operation>
399525
</Platform>
526+
<Platform Name="Android64">
527+
<Operation>0</Operation>
528+
</Platform>
400529
<Platform Name="iOSDevice32">
401530
<Operation>0</Operation>
402531
</Platform>
@@ -728,6 +857,9 @@
728857
<Platform Name="Android">
729858
<Operation>1</Operation>
730859
</Platform>
860+
<Platform Name="Android64">
861+
<Operation>1</Operation>
862+
</Platform>
731863
</DeployClass>
732864
<DeployClass Name="ProjectiOSDeviceDebug">
733865
<Platform Name="iOSDevice32">
@@ -771,6 +903,10 @@
771903
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
772904
<Operation>1</Operation>
773905
</Platform>
906+
<Platform Name="Android64">
907+
<RemoteDir>library\lib\arm64-v8a</RemoteDir>
908+
<Operation>1</Operation>
909+
</Platform>
774910
<Platform Name="iOSDevice32">
775911
<Operation>1</Operation>
776912
</Platform>
@@ -793,6 +929,12 @@
793929
<Operation>0</Operation>
794930
</Platform>
795931
</DeployClass>
932+
<DeployClass Name="ProjectOutput_Android32">
933+
<Platform Name="Android64">
934+
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
935+
<Operation>1</Operation>
936+
</Platform>
937+
</DeployClass>
796938
<DeployClass Name="ProjectUWPManifest">
797939
<Platform Name="Win32">
798940
<Operation>1</Operation>
@@ -830,10 +972,11 @@
830972
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
831973
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME)"/>
832974
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
975+
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
833976
</Deployment>
834977
<Platforms>
835978
<Platform value="Android">False</Platform>
836-
<Platform value="Linux64">False</Platform>
979+
<Platform value="Android64">False</Platform>
837980
<Platform value="Win32">True</Platform>
838981
<Platform value="Win64">False</Platform>
839982
</Platforms>

‎src/core/Ragna.Criteria.Impl.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ interface
88
TDefaultCriteria = class(TInterfacedObject, ICriteria)
99
private
1010
FQuery: TFDQuery;
11-
public
1211
procedure Where(const AField: string); overload;
1312
procedure Where(const AField: TField); overload;
1413
procedure Where(const AValue: Boolean); overload;
@@ -22,6 +21,7 @@ TDefaultCriteria = class(TInterfacedObject, ICriteria)
2221
procedure &Equals(const AValue: string); overload;
2322
procedure Order(const AField: string); overload;
2423
procedure Order(const AField: TField); overload;
24+
public
2525
constructor Create(const AQuery: TFDQuery);
2626
end;
2727

0 commit comments

Comments
 (0)