Skip to content

Commit da3303a

Browse files
Ronierys2Ronierys2
committed
v2.1.0-3920 BETA
--- ### **Correções e Ajustes Gerais** - Correção de `Filter` com `LIKE` no `ClientSQL` e `DWMemTable`. - Correção de `buffersize`. - Correção de `ParamByName`. - Correção de `access violation` no `IndexFieldNames` e na destruição do `DataSet`. - Correção de parâmetros no `ClientSQL`. - Correções internas e ajustes em `IFDEF's`. - Correção de compilação para Delphi 7. - Correção do `SQL Editor` em Lazarus e Delphi. - Correção de `Freemem` para Lazarus/Delphi antigos no binário. ### **Ajustes de Tipos de Dados** - Correção no `StorageBin` para usar `NVARCHAR` no **MSSQL Server** (Unicode). - Correção na leitura e gravação de **campos Timestamp (Data/Hora)** no `ClientSQL` e `DWMemTable`. - Correção de `optInteger()`, garantindo o valor padrão quando a chave não existir. - Correção de `SET` para campos `Data`, `Hora` e `DataHora` na versão **2.1**. - Correção de leitura de `Single/Float` no Delphi e início da implementação no Lazarus. - Correção de `WideChar` e `WideString`. - Correção de `BCD`, `LongInt` e outros tipos numéricos para **FPC/Zeos**. - Correção de leitura de dados no `MemTable` e no `ClientSQL` para **Android 32 bits**. - Correção para gravação de dados com acentuação em campos `MEMO` e `WIDEMEMO`. - Correção de códigos de página para `RESTDWParams`. ### **Melhorias de Compatibilidade** - Adicionada mecânica de `BJSON` e suporte ao **OpenSSL 1.1.1**. - **JWT:** Início da compatibilidade com Web, com geração e validação de tokens. - Alteração no autenticador para adicionar suporte a **OAuth com certificado**. - Ajustes internos para a nova autenticação. - Atualização do sistema **OAuth**. - Atualização do `RESTDW Proxy Request`. - Correção para funcionamento dos parâmetros via URL em aplicações **ISAPI/CGI**. ### **Suporte ao Lazarus/FPC** - Correções e ajustes contínuos para compatibilidade com **Lazarus/FPC**. - Correção de campos numéricos no Lazarus. - Correção de `PhisicDrivers` para o novo sistema de dados. - Pacote com ajustes para permitir **servers e clients** em Pascal FPC (VSCode, Sublime, Bloco de Notas). - Adicionado **demo FPC puro** para uso no VSCode. ### **Correções de SSL e OpenSSL** - Adicionado **OpenSSL 1.1.1** para **Windows 32 e 64 bits**. - Correção de SSL para instalação em **Lazarus**. - Commit de pacotes para compilação do SSL em **Android**. - Correção de **compilação para Android**. - Correção de SSL para Lazarus e Delphi antigos/novos. ### **Ajustes e Melhorias Diversas** - Ajuste de certificado no Delphi. - Correção de conversão dos tipos `Variant` internos no Lazarus e outros. - Ajustes nos **drivers Zeos** (`RESTDWZEOSDriver.dproj`, inclusão da cláusula `ZEOS8UP`). - Correção dos drivers **Zeos e outros**. - Ajustes para **VSCode e FPC puro**. - Correção no demo de FPC puro. - Remoção temporária da **criptografia**. - Atualização dos **DEMO's**. --- correção de erros: Fixed #395
1 parent c1582dc commit da3303a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+3426
-3149
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ lib/
9696
# Delphi history and backups
9797
__history/
9898
__recovery/
99-
_CORE/
10099
*.~*
101100

102101
# Castalia statistics file (since XE7 Castalia is distributed with Delphi)

‎CORE/Packages/Delphi/RESTDWCore.dpk‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ package RESTDWCore;
2929
{$RUNONLY}
3030
{$IMPLICITBUILD OFF}
3131

32-
requires
33-
{$IF Defined(VER150)}
34-
bdertl,
35-
{$IFEND}
36-
soaprtl;
37-
3832
contains
3933
uRESTDWBasic in '..\..\Source\Basic\uRESTDWBasic.pas',
4034
uRESTDWBasicDB in '..\..\Source\Basic\uRESTDWBasicDB.pas',

‎CORE/Packages/Delphi/RESTDWCore.dproj‎

Lines changed: 158 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
<TargetedPlatforms>33811</TargetedPlatforms>
88
<AppType>Package</AppType>
99
<FrameworkType>None</FrameworkType>
10-
<ProjectVersion>19.5</ProjectVersion>
10+
<ProjectVersion>20.1</ProjectVersion>
1111
<Platform Condition="'$(Platform)'==''">Win32</Platform>
12+
<ProjectName Condition="'$(ProjectName)'==''">RESTDWCore</ProjectName>
1213
</PropertyGroup>
1314
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1415
<Base>true</Base>
@@ -53,6 +54,11 @@
5354
<CfgParent>Base</CfgParent>
5455
<Base>true</Base>
5556
</PropertyGroup>
57+
<PropertyGroup Condition="('$(Platform)'=='Win64x' and '$(Base)'=='true') or '$(Base_Win64x)'!=''">
58+
<Base_Win64x>true</Base_Win64x>
59+
<CfgParent>Base</CfgParent>
60+
<Base>true</Base>
61+
</PropertyGroup>
5662
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
5763
<Cfg_1>true</Cfg_1>
5864
<CfgParent>Base</CfgParent>
@@ -175,6 +181,13 @@
175181
<DCC_UsePackage>rtl;vcl;dbrtl;fmx;soaprtl;FireDAC;FireDACCommonDriver;FireDACCommon;vcldb;dsnap;IndySystem;IndyProtocols;IndyCore;$(DCC_UsePackage)</DCC_UsePackage>
176182
<DCC_UnitSearchPath>..\..\Source\Basic\Dialogs;..\..\Source\Includes;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
177183
</PropertyGroup>
184+
<PropertyGroup Condition="'$(Base_Win64x)'!=''">
185+
<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
186+
<BT_BuildType>Debug</BT_BuildType>
187+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
188+
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
189+
<VerInfo_Locale>1033</VerInfo_Locale>
190+
</PropertyGroup>
178191
<PropertyGroup Condition="'$(Cfg_1)'!=''">
179192
<DCC_DebugInformation>0</DCC_DebugInformation>
180193
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
@@ -205,12 +218,12 @@
205218
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
206219
<DCC_DcuOutput>..\..\compiled</DCC_DcuOutput>
207220
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
208-
<VerInfo_Keys>CompanyName=XyberPower Desenvolvimento;FileDescription=$(MSBuildProjectName);FileVersion=2.1.0.101;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
221+
<VerInfo_Keys>CompanyName=XyberPower Desenvolvimento;FileDescription=$(MSBuildProjectName);FileVersion=2.1.0.116;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
209222
<VerInfo_Locale>1033</VerInfo_Locale>
210223
<VerInfo_MajorVer>2</VerInfo_MajorVer>
211224
<VerInfo_MinorVer>1</VerInfo_MinorVer>
212225
<DCC_Description>REST Dataware - Core</DCC_Description>
213-
<VerInfo_Build>101</VerInfo_Build>
226+
<VerInfo_Build>116</VerInfo_Build>
214227
<VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
215228
<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
216229
</PropertyGroup>
@@ -223,7 +236,6 @@
223236
<DelphiCompile Include="$(MainSource)">
224237
<MainSource>MainSource</MainSource>
225238
</DelphiCompile>
226-
<DCCReference Include="soaprtl.dcp"/>
227239
<DCCReference Include="..\..\Source\Basic\uRESTDWBasic.pas"/>
228240
<DCCReference Include="..\..\Source\Basic\uRESTDWBasicDB.pas"/>
229241
<DCCReference Include="..\..\Source\Basic\uRESTDWBasicTypes.pas"/>
@@ -324,10 +336,12 @@
324336
<Platform value="Android64">True</Platform>
325337
<Platform value="iOSDevice64">True</Platform>
326338
<Platform value="iOSSimARM64">False</Platform>
339+
<Platform value="Linux64">False</Platform>
327340
<Platform value="OSX64">False</Platform>
328341
<Platform value="OSXARM64">False</Platform>
329342
<Platform value="Win32">True</Platform>
330343
<Platform value="Win64">True</Platform>
344+
<Platform value="Win64x">False</Platform>
331345
</Platforms>
332346
<Deployment Version="4">
333347
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule"/>
@@ -349,6 +363,12 @@
349363
</DeployFile>
350364
<DeployFile LocalName="..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\19.0\Bpl\RESTDWCore.bpl" Configuration="Debug" Class="ProjectOutput"/>
351365
<DeployFile LocalName="..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\22.0\Bpl\RESTDWCore.bpl" Configuration="Debug" Class="ProjectOutput"/>
366+
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\RESTDWCore.bpl" Configuration="Debug" Class="ProjectOutput">
367+
<Platform Name="Win32">
368+
<RemoteName>RESTDWCore.bpl</RemoteName>
369+
<Overwrite>true</Overwrite>
370+
</Platform>
371+
</DeployFile>
352372
<DeployClass Name="AdditionalDebugSymbols">
353373
<Platform Name="OSX32">
354374
<Operation>1</Operation>
@@ -435,6 +455,16 @@
435455
<Operation>1</Operation>
436456
</Platform>
437457
</DeployClass>
458+
<DeployClass Name="AndroidSplashImageDefV21">
459+
<Platform Name="Android">
460+
<RemoteDir>res\drawable-anydpi-v21</RemoteDir>
461+
<Operation>1</Operation>
462+
</Platform>
463+
<Platform Name="Android64">
464+
<RemoteDir>res\drawable-anydpi-v21</RemoteDir>
465+
<Operation>1</Operation>
466+
</Platform>
467+
</DeployClass>
438468
<DeployClass Name="AndroidSplashStyles">
439469
<Platform Name="Android">
440470
<RemoteDir>res\values</RemoteDir>
@@ -455,6 +485,66 @@
455485
<Operation>1</Operation>
456486
</Platform>
457487
</DeployClass>
488+
<DeployClass Name="AndroidSplashStylesV31">
489+
<Platform Name="Android">
490+
<RemoteDir>res\values-v31</RemoteDir>
491+
<Operation>1</Operation>
492+
</Platform>
493+
<Platform Name="Android64">
494+
<RemoteDir>res\values-v31</RemoteDir>
495+
<Operation>1</Operation>
496+
</Platform>
497+
</DeployClass>
498+
<DeployClass Name="Android_AdaptiveIcon">
499+
<Platform Name="Android">
500+
<RemoteDir>res\drawable-anydpi-v26</RemoteDir>
501+
<Operation>1</Operation>
502+
</Platform>
503+
<Platform Name="Android64">
504+
<RemoteDir>res\drawable-anydpi-v26</RemoteDir>
505+
<Operation>1</Operation>
506+
</Platform>
507+
</DeployClass>
508+
<DeployClass Name="Android_AdaptiveIconBackground">
509+
<Platform Name="Android">
510+
<RemoteDir>res\drawable</RemoteDir>
511+
<Operation>1</Operation>
512+
</Platform>
513+
<Platform Name="Android64">
514+
<RemoteDir>res\drawable</RemoteDir>
515+
<Operation>1</Operation>
516+
</Platform>
517+
</DeployClass>
518+
<DeployClass Name="Android_AdaptiveIconForeground">
519+
<Platform Name="Android">
520+
<RemoteDir>res\drawable</RemoteDir>
521+
<Operation>1</Operation>
522+
</Platform>
523+
<Platform Name="Android64">
524+
<RemoteDir>res\drawable</RemoteDir>
525+
<Operation>1</Operation>
526+
</Platform>
527+
</DeployClass>
528+
<DeployClass Name="Android_AdaptiveIconMonochrome">
529+
<Platform Name="Android">
530+
<RemoteDir>res\drawable</RemoteDir>
531+
<Operation>1</Operation>
532+
</Platform>
533+
<Platform Name="Android64">
534+
<RemoteDir>res\drawable</RemoteDir>
535+
<Operation>1</Operation>
536+
</Platform>
537+
</DeployClass>
538+
<DeployClass Name="Android_AdaptiveIconV33">
539+
<Platform Name="Android">
540+
<RemoteDir>res\drawable-anydpi-v33</RemoteDir>
541+
<Operation>1</Operation>
542+
</Platform>
543+
<Platform Name="Android64">
544+
<RemoteDir>res\drawable-anydpi-v33</RemoteDir>
545+
<Operation>1</Operation>
546+
</Platform>
547+
</DeployClass>
458548
<DeployClass Name="Android_Colors">
459549
<Platform Name="Android">
460550
<RemoteDir>res\values</RemoteDir>
@@ -465,6 +555,16 @@
465555
<Operation>1</Operation>
466556
</Platform>
467557
</DeployClass>
558+
<DeployClass Name="Android_ColorsDark">
559+
<Platform Name="Android">
560+
<RemoteDir>res\values-night-v21</RemoteDir>
561+
<Operation>1</Operation>
562+
</Platform>
563+
<Platform Name="Android64">
564+
<RemoteDir>res\values-night-v21</RemoteDir>
565+
<Operation>1</Operation>
566+
</Platform>
567+
</DeployClass>
468568
<DeployClass Name="Android_DefaultAppIcon">
469569
<Platform Name="Android">
470570
<RemoteDir>res\drawable</RemoteDir>
@@ -635,6 +735,56 @@
635735
<Operation>1</Operation>
636736
</Platform>
637737
</DeployClass>
738+
<DeployClass Name="Android_VectorizedNotificationIcon">
739+
<Platform Name="Android">
740+
<RemoteDir>res\drawable-anydpi-v24</RemoteDir>
741+
<Operation>1</Operation>
742+
</Platform>
743+
<Platform Name="Android64">
744+
<RemoteDir>res\drawable-anydpi-v24</RemoteDir>
745+
<Operation>1</Operation>
746+
</Platform>
747+
</DeployClass>
748+
<DeployClass Name="Android_VectorizedSplash">
749+
<Platform Name="Android">
750+
<RemoteDir>res\drawable</RemoteDir>
751+
<Operation>1</Operation>
752+
</Platform>
753+
<Platform Name="Android64">
754+
<RemoteDir>res\drawable</RemoteDir>
755+
<Operation>1</Operation>
756+
</Platform>
757+
</DeployClass>
758+
<DeployClass Name="Android_VectorizedSplashDark">
759+
<Platform Name="Android">
760+
<RemoteDir>res\drawable-night-anydpi-v21</RemoteDir>
761+
<Operation>1</Operation>
762+
</Platform>
763+
<Platform Name="Android64">
764+
<RemoteDir>res\drawable-night-anydpi-v21</RemoteDir>
765+
<Operation>1</Operation>
766+
</Platform>
767+
</DeployClass>
768+
<DeployClass Name="Android_VectorizedSplashV31">
769+
<Platform Name="Android">
770+
<RemoteDir>res\drawable-anydpi-v31</RemoteDir>
771+
<Operation>1</Operation>
772+
</Platform>
773+
<Platform Name="Android64">
774+
<RemoteDir>res\drawable-anydpi-v31</RemoteDir>
775+
<Operation>1</Operation>
776+
</Platform>
777+
</DeployClass>
778+
<DeployClass Name="Android_VectorizedSplashV31Dark">
779+
<Platform Name="Android">
780+
<RemoteDir>res\drawable-night-anydpi-v31</RemoteDir>
781+
<Operation>1</Operation>
782+
</Platform>
783+
<Platform Name="Android64">
784+
<RemoteDir>res\drawable-night-anydpi-v31</RemoteDir>
785+
<Operation>1</Operation>
786+
</Platform>
787+
</DeployClass>
638788
<DeployClass Name="DebugSymbols">
639789
<Platform Name="iOSSimulator">
640790
<Operation>1</Operation>
@@ -812,6 +962,9 @@
812962
<Platform Name="Win64">
813963
<Operation>1</Operation>
814964
</Platform>
965+
<Platform Name="Win64x">
966+
<Operation>1</Operation>
967+
</Platform>
815968
</DeployClass>
816969
<DeployClass Name="ProjectiOSDeviceDebug">
817970
<Platform Name="iOSDevice32">
@@ -1073,6 +1226,7 @@
10731226
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME)"/>
10741227
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
10751228
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
1229+
<ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
10761230
</Deployment>
10771231
</BorlandProject>
10781232
<ProjectFileVersion>12</ProjectFileVersion>

‎CORE/Packages/Lazarus/Drivers/zeos/RESTDWZeosDriver.lpk‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@
6969
<CompatibilityMode Value="True"/>
7070
<RequiredPkgs Count="3">
7171
<Item1>
72-
<PackageName Value="zcomponent"/>
73-
<MaxVersion Major="7" Minor="9" Valid="True"/>
74-
<MinVersion Major="7" Minor="2" Valid="True"/>
72+
<PackageName Value="lr_zeosdb"/>
7573
</Item1>
7674
<Item2>
7775
<PackageName Value="restdatawarecomponents"/>

‎CORE/Packages/Lazarus/RESTDataWareComponents.lpk‎

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<Description Value="The proposal was fulfilled. REST DW was created to facilitate the creation of CRUDs in the same model that we created applications for Client / Server Database. Today, being able to write data to a bank via WebService is too complex for simple operations, making scheduling of simple screens time-consuming. With REST Dataware, you no longer have to worry about creating SQL Insertion, Deletion, Read, and Execution methods via Webservice; Simply add a RESTDataBase connection component and add a RESTClientSQL component that will already have your SQL solution fully functional as you did back in the day and with all the power of modern REST / JSON technology with data compression and everything the language can offer. Have fun."/>
3333
<License Value="GPL- 3.0"/>
3434
<Version Major="2" Minor="1"/>
35-
<Files Count="91">
35+
<Files Count="82">
3636
<Item1>
3737
<Filename Value="RESTDataWareComponents.lrs"/>
3838
<Type Value="LRS"/>
@@ -362,42 +362,6 @@
362362
<Filename Value="..\..\Source\Basic\uRESTDWStorageBin.pas"/>
363363
<UnitName Value="uRESTDWStorageBin"/>
364364
</Item82>
365-
<Item83>
366-
<Filename Value="..\..\Source\utils\SSL\OpenSSL.Api_11.pas"/>
367-
<UnitName Value="OpenSSL.Api_11"/>
368-
</Item83>
369-
<Item84>
370-
<Filename Value="..\..\Source\utils\SSL\uRESTDW.BinaryCoding.pas"/>
371-
<UnitName Value="uRESTDW.BinaryCoding"/>
372-
</Item84>
373-
<Item85>
374-
<Filename Value="..\..\Source\utils\SSL\uRESTDW.Bson.IO.pas"/>
375-
<UnitName Value="uRESTDW.Bson.IO"/>
376-
</Item85>
377-
<Item86>
378-
<Filename Value="..\..\Source\utils\SSL\uRESTDW.Bson.pas"/>
379-
<UnitName Value="uRESTDW.Bson"/>
380-
</Item86>
381-
<Item87>
382-
<Filename Value="..\..\Source\utils\SSL\uRESTDW.DateUtils.pas"/>
383-
<UnitName Value="uRESTDW.DateUtils"/>
384-
</Item87>
385-
<Item88>
386-
<Filename Value="..\..\Source\utils\SSL\uRESTDW.OAuth2.pas"/>
387-
<UnitName Value="uRESTDW.OAuth2"/>
388-
</Item88>
389-
<Item89>
390-
<Filename Value="..\..\Source\utils\SSL\uRESTDW.OpenSsl_11.pas"/>
391-
<UnitName Value="uRESTDW.OpenSsl_11"/>
392-
</Item89>
393-
<Item90>
394-
<Filename Value="..\..\Source\utils\SSL\uRESTDW.System.pas"/>
395-
<UnitName Value="uRESTDW.System"/>
396-
</Item90>
397-
<Item91>
398-
<Filename Value="..\..\Source\utils\SSL\uRESTDW.SysUtils.pas"/>
399-
<UnitName Value="uRESTDW.SysUtils"/>
400-
</Item91>
401365
</Files>
402366
<CompatibilityMode Value="True"/>
403367
<RequiredPkgs Count="3">

‎CORE/Packages/Lazarus/RESTDataWareComponents.pas‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ interface
2828
uRESTDWJSONInterface, uRESTDWSerialize, uRESTDWMimeTypes, uRESTDWAbout,
2929
uRESTDWZlib, uRESTDWMemoryDataset, uRESTDWDesignReg, uRESTDWProtoTypes,
3030
uRESTDWSelfSigned, uRESTDWExprParser, uRESTDWAuthenticators,
31-
uRESTDWStorageBin, OpenSSL.Api_11, uRESTDW.BinaryCoding, uRESTDW.Bson.IO,
32-
uRESTDW.Bson, uRESTDW.DateUtils, uRESTDW.OAuth2, uRESTDW.OpenSsl_11,
33-
uRESTDW.System, uRESTDW.SysUtils, LazarusPackageIntf;
31+
uRESTDWStorageBin, LazarusPackageIntf;
3432

3533
implementation
3634

0 commit comments

Comments
 (0)