Skip to content

Commit 2bacff4

Browse files
Ronierys2Ronierys2
authored
ajustes no Massive e compatibilidade com bancos case sensitive, correções para Delphi 13 e tratamento de dados (#412)
2 parents 0e52692 + 6348d8a commit 2bacff4

7 files changed

Lines changed: 175 additions & 14 deletions

File tree

‎CORE/Source/Basic/uRESTDWParams.pas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -637,8 +637,8 @@ implementation
637637
If (Pos('.', vTempValue) > 0) Or
638638
(Pos(':', vTempValue) > 0) Or
639639
(Pos('/', vTempValue) > 0) Or
640-
(Pos('\', vTempValue) > 0)
641-
//(Pos('-', vTempValue) > 0)
640+
(Pos('\', vTempValue) > 0) Or
641+
(Pos('-', vTempValue) > 0)
642642
// Or (vTempValue.CountChar('-')>1) //Testar XyberX
643643
Then
644644
Field.AsDateTime := StrToDateTime(vTempValue)

‎CORE/Source/Basic/uRESTDWStorageBin.pas‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1819,12 +1819,15 @@ interface
18191819
vInt64 := vMemoryStream.Size;
18201820
AStream.Write(vInt64, SizeOf(vInt64));
18211821
SetLength(vBytes, vInt64);
1822-
Try
1823-
vMemoryStream.Position := 0;
1824-
vMemoryStream.Read(vBytes[0], vInt64);
1825-
Except
1826-
End;
1827-
AStream.Write(vBytes[0], vInt64);
1822+
if vInt64 > 0 then
1823+
begin
1824+
Try
1825+
vMemoryStream.Position := 0;
1826+
vMemoryStream.Read(vBytes[0], vInt64);
1827+
Except
1828+
End;
1829+
AStream.Write(vBytes[0], vInt64);
1830+
end;
18281831
Finally
18291832
SetLength(vBytes, 0);
18301833
FreeAndNil(vMemoryStream);

‎CORE/Source/Consts/uRESTDWConsts.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060

6161
// controle de versão
6262
RESTDWVersionINFO = 'v2.1.0-';
63-
RESTDWRelease = '3974';
63+
RESTDWRelease = '3975';
6464
RESTDWCodeProject = 'Final Fantasy X - SourceForge';
6565
RESTDWVersao = RESTDWVersionINFO + RESTDWRelease + '(' + RESTDWCodeProject + ')';
6666
RESTDWDialogoTitulo = 'REST DataWare Components ' + RESTDWVersao;

‎CORE/Source/Includes/RDWWIZ.inc‎

Lines changed: 155 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,64 @@
354354
{$DEFINE ISDELPHI}
355355
{$ENDIF}
356356
{$ENDIF}
357+
{$IFDEF VER300} //Delphi 10 Seatle
358+
{$DEFINE DELPHI2_LVL}
359+
{$DEFINE DELPHI3_LVL}
360+
{$DEFINE DELPHI4_LVL}
361+
{$DEFINE DELPHI5_LVL}
362+
{$DEFINE DELPHI6_LVL}
363+
{$DEFINE DELPHI7_LVL}
364+
{$DEFINE DELPHI9_LVL}
365+
{$DEFINE DELPHI2006_LVL}
366+
{$DEFINE DELPHI2007_LVL}
367+
{$DEFINE DELPHI2010_LVL}
368+
{$DEFINE DELPHIXE_LVL}
369+
{$DEFINE DELPHIXE2_LVL}
370+
{$DEFINE DELPHIXE3_LVL}
371+
{$DEFINE DELPHIXE4_LVL}
372+
{$DEFINE DELPHIXE5_LVL}
373+
{$DEFINE DELPHIXE6_LVL}
374+
{$DEFINE DELPHIXE7_LVL}
375+
{$DEFINE DELPHIXE8_LVL}
376+
{$DEFINE DELPHI_TOUCH}
377+
{$DEFINE DELPHI_UNICODE}
378+
{$IFNDEF BCB}
379+
{$DEFINE ISDELPHI}
380+
{$ENDIF}
381+
{$ENDIF}
357382

383+
{$IFDEF VER310} //Delphi 10.1 Berlin
384+
{$DEFINE DELPHI2_LVL}
385+
{$DEFINE DELPHI3_LVL}
386+
{$DEFINE DELPHI4_LVL}
387+
{$DEFINE DELPHI5_LVL}
388+
{$DEFINE DELPHI6_LVL}
389+
{$DEFINE DELPHI7_LVL}
390+
{$DEFINE DELPHI9_LVL}
391+
{$DEFINE DELPHI2006_LVL}
392+
{$DEFINE DELPHI2007_LVL}
393+
{$DEFINE DELPHI2010_LVL}
394+
{$DEFINE DELPHIXE_LVL}
395+
{$DEFINE DELPHIXE2_LVL}
396+
{$DEFINE DELPHIXE3_LVL}
397+
{$DEFINE DELPHIXE4_LVL}
398+
{$DEFINE DELPHIXE5_LVL}
399+
{$DEFINE DELPHIXE6_LVL}
400+
{$DEFINE DELPHIXE7_LVL}
401+
{$DEFINE DELPHIXE8_LVL}
402+
{$DEFINE DELPHIXE9_LVL}
403+
{$DEFINE DELPHIXE10_LVL}
404+
{$DEFINE DELPHIXE10_1_LVL}
405+
{$DEFINE DELPHIXE10_2_LVL}
406+
{$DEFINE DELPHI_TOUCH}
407+
{$DEFINE DELPHI_UNICODE}
408+
{$DEFINE DELPHI10_LVL}
409+
{$IFNDEF BCB}
410+
{$DEFINE ISDELPHI}
411+
{$ENDIF}
412+
{$ENDIF}
358413

359-
{$IFDEF VER300}
414+
{$IFDEF VER320} //Delphi 10.2 Tokyo
360415
{$DEFINE DELPHI2_LVL}
361416
{$DEFINE DELPHI3_LVL}
362417
{$DEFINE DELPHI4_LVL}
@@ -376,6 +431,9 @@
376431
{$DEFINE DELPHIXE7_LVL}
377432
{$DEFINE DELPHIXE8_LVL}
378433
{$DEFINE DELPHIXE9_LVL}
434+
{$DEFINE DELPHIXE10_LVL}
435+
{$DEFINE DELPHIXE10_1_LVL}
436+
{$DEFINE DELPHIXE10_2_LVL}
379437
{$DEFINE DELPHI_TOUCH}
380438
{$DEFINE DELPHI_UNICODE}
381439
{$DEFINE DELPHI10_LVL}
@@ -384,7 +442,7 @@
384442
{$ENDIF}
385443
{$ENDIF}
386444

387-
{$IFDEF VER310}
445+
{$IFDEF VER330} //Delphi 10.3 Rio
388446
{$DEFINE DELPHI2_LVL}
389447
{$DEFINE DELPHI3_LVL}
390448
{$DEFINE DELPHI4_LVL}
@@ -406,6 +464,100 @@
406464
{$DEFINE DELPHIXE9_LVL}
407465
{$DEFINE DELPHIXE10_LVL}
408466
{$DEFINE DELPHIXE10_1_LVL}
467+
{$DEFINE DELPHIXE10_2_LVL}
468+
{$DEFINE DELPHI_TOUCH}
469+
{$DEFINE DELPHI_UNICODE}
470+
{$DEFINE DELPHI10_LVL}
471+
{$IFNDEF BCB}
472+
{$DEFINE ISDELPHI}
473+
{$ENDIF}
474+
{$ENDIF}
475+
476+
{$IFDEF VER340} //Delphi 10.4 Sydney
477+
{$DEFINE DELPHI2_LVL}
478+
{$DEFINE DELPHI3_LVL}
479+
{$DEFINE DELPHI4_LVL}
480+
{$DEFINE DELPHI5_LVL}
481+
{$DEFINE DELPHI6_LVL}
482+
{$DEFINE DELPHI7_LVL}
483+
{$DEFINE DELPHI9_LVL}
484+
{$DEFINE DELPHI2006_LVL}
485+
{$DEFINE DELPHI2007_LVL}
486+
{$DEFINE DELPHI2010_LVL}
487+
{$DEFINE DELPHIXE_LVL}
488+
{$DEFINE DELPHIXE2_LVL}
489+
{$DEFINE DELPHIXE3_LVL}
490+
{$DEFINE DELPHIXE4_LVL}
491+
{$DEFINE DELPHIXE5_LVL}
492+
{$DEFINE DELPHIXE6_LVL}
493+
{$DEFINE DELPHIXE7_LVL}
494+
{$DEFINE DELPHIXE8_LVL}
495+
{$DEFINE DELPHIXE9_LVL}
496+
{$DEFINE DELPHIXE10_LVL}
497+
{$DEFINE DELPHIXE10_1_LVL}
498+
{$DEFINE DELPHIXE10_2_LVL}
499+
{$DEFINE DELPHI_TOUCH}
500+
{$DEFINE DELPHI_UNICODE}
501+
{$DEFINE DELPHI10_LVL}
502+
{$IFNDEF BCB}
503+
{$DEFINE ISDELPHI}
504+
{$ENDIF}
505+
{$ENDIF}
506+
507+
{$IFDEF VER350} //Delphi 11 Alexandria
508+
{$DEFINE DELPHI2_LVL}
509+
{$DEFINE DELPHI3_LVL}
510+
{$DEFINE DELPHI4_LVL}
511+
{$DEFINE DELPHI5_LVL}
512+
{$DEFINE DELPHI6_LVL}
513+
{$DEFINE DELPHI7_LVL}
514+
{$DEFINE DELPHI9_LVL}
515+
{$DEFINE DELPHI2006_LVL}
516+
{$DEFINE DELPHI2007_LVL}
517+
{$DEFINE DELPHI2010_LVL}
518+
{$DEFINE DELPHIXE_LVL}
519+
{$DEFINE DELPHIXE2_LVL}
520+
{$DEFINE DELPHIXE3_LVL}
521+
{$DEFINE DELPHIXE4_LVL}
522+
{$DEFINE DELPHIXE5_LVL}
523+
{$DEFINE DELPHIXE6_LVL}
524+
{$DEFINE DELPHIXE7_LVL}
525+
{$DEFINE DELPHIXE8_LVL}
526+
{$DEFINE DELPHIXE9_LVL}
527+
{$DEFINE DELPHIXE10_LVL}
528+
{$DEFINE DELPHIXE10_1_LVL}
529+
{$DEFINE DELPHIXE10_2_LVL}
530+
{$DEFINE DELPHI_TOUCH}
531+
{$DEFINE DELPHI_UNICODE}
532+
{$DEFINE DELPHI10_LVL}
533+
{$IFNDEF BCB}
534+
{$DEFINE ISDELPHI}
535+
{$ENDIF}
536+
{$ENDIF}
537+
538+
{$IFDEF VER360} //Delphi 12 Athens
539+
{$DEFINE DELPHI2_LVL}
540+
{$DEFINE DELPHI3_LVL}
541+
{$DEFINE DELPHI4_LVL}
542+
{$DEFINE DELPHI5_LVL}
543+
{$DEFINE DELPHI6_LVL}
544+
{$DEFINE DELPHI7_LVL}
545+
{$DEFINE DELPHI9_LVL}
546+
{$DEFINE DELPHI2006_LVL}
547+
{$DEFINE DELPHI2007_LVL}
548+
{$DEFINE DELPHI2010_LVL}
549+
{$DEFINE DELPHIXE_LVL}
550+
{$DEFINE DELPHIXE2_LVL}
551+
{$DEFINE DELPHIXE3_LVL}
552+
{$DEFINE DELPHIXE4_LVL}
553+
{$DEFINE DELPHIXE5_LVL}
554+
{$DEFINE DELPHIXE6_LVL}
555+
{$DEFINE DELPHIXE7_LVL}
556+
{$DEFINE DELPHIXE8_LVL}
557+
{$DEFINE DELPHIXE9_LVL}
558+
{$DEFINE DELPHIXE10_LVL}
559+
{$DEFINE DELPHIXE10_1_LVL}
560+
{$DEFINE DELPHIXE10_2_LVL}
409561
{$DEFINE DELPHI_TOUCH}
410562
{$DEFINE DELPHI_UNICODE}
411563
{$DEFINE DELPHI10_LVL}
@@ -414,7 +566,7 @@
414566
{$ENDIF}
415567
{$ENDIF}
416568

417-
{$IFDEF VER320}
569+
{$IFDEF VER370} //Delphi 13 Florence
418570
{$DEFINE DELPHI2_LVL}
419571
{$DEFINE DELPHI3_LVL}
420572
{$DEFINE DELPHI4_LVL}

‎CORE/Source/Includes/uRESTDW.inc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
{$IFNDEF FPC}
4343
{$IFDEF VER370 or CompilerVersion >= 37}
44+
{$DEFINE DELPHI13UP}
4445
{$DEFINE DELPHI12UP}
4546
{$DEFINE DELPHI11UP}
4647
{$DEFINE DELPHI10_4UP}

‎CORE/Source/Wizards/RDWCGIWizard.pas‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,9 @@
343343
Function GetDelphiGlobalKey : String;
344344
Begin
345345
Result := '';
346-
{$IF DEFINED(DELPHI12UP)} // delphi 11 Alexandria
346+
{$IF DEFINED(DELPHI13UP)} // delphi 12 Athens
347+
Result := '\Software\Embarcadero\BDS\37.0\Globals';
348+
{$ELSEIF DEFINED(DELPHI12UP)} // delphi 12 Athens
347349
Result := '\Software\Embarcadero\BDS\23.0\Globals';
348350
{$ELSEIF DEFINED(DELPHI11UP)} // delphi 11 Alexandria
349351
Result := '\Software\Embarcadero\BDS\22.0\Globals';

‎CORE/Source/Wizards/STLWizard.pas‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,9 +458,12 @@
458458
{$IFDEF ver350} // delphi 11
459459
Result := '\Software\Embarcadero\BDS\22.0\Globals';
460460
{$ENDIF}
461-
{$IFDEF ver360} // delphi 11
461+
{$IFDEF ver360} // delphi 12
462462
Result := '\Software\Embarcadero\BDS\23.0\Globals';
463463
{$ENDIF}
464+
{$IFDEF ver370} // delphi 13
465+
Result := '\Software\Embarcadero\BDS\37.0\Globals';
466+
{$ENDIF}
464467
End;
465468

466469
Function Getideprojectpath: String;

0 commit comments

Comments
 (0)