diff --git a/CORE/Packages/Lazarus/Connectors/Indy/RESTDWIndySocketsTaurus.lpk b/CORE/Packages/Lazarus/Connectors/Indy/RESTDWIndySocketsTaurus.lpk new file mode 100644 index 00000000..7db3c364 --- /dev/null +++ b/CORE/Packages/Lazarus/Connectors/Indy/RESTDWIndySocketsTaurus.lpk @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CORE/Packages/Lazarus/Connectors/Indy/RESTDWIndySocketsTaurus.lrs b/CORE/Packages/Lazarus/Connectors/Indy/RESTDWIndySocketsTaurus.lrs new file mode 100644 index 00000000..f071cb33 --- /dev/null +++ b/CORE/Packages/Lazarus/Connectors/Indy/RESTDWIndySocketsTaurus.lrs @@ -0,0 +1,182 @@ +LazarusResources.Add('TRESTDWIdServicePooler','PNG',[ + #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#25#0#0#0#25#8#6#0#0#0#196#233#133 + +'c'#0#0#0#9'pHYs'#0#0#8'N'#0#0#8'N'#1#140'1'#0#236#0#0#0#1'sRGB'#0#174#206#28 + +#233#0#0#0#4'gAMA'#0#0#177#143#11#252'a'#5#0#0#2#204'IDATx'#1#189'VMHTQ'#20 + +#254#222'0'#153#154#250'n '#25'Y'#206#179#133#26#21'>'#138'j'#163'`Q'#225#170 + +#153'h'#27#164#237'Z'#244#179'h'#225'&'#180#132'('#8'l j'#151'B'#181#8'$'#199 + +'E'#139'&'#162#25'h'#209#191'3'#17#20#20#211#188')'#195'`'#176#231#20#218'l' + +#154#206'yw|:'#163#163'oR'#230#131'3'#247#205#229#220#251#189'{~'#190'w'#149 + +#167#183'{2Z}-"'#31#19'0'#127'M'#195')'#244#230#6#136#154#202'%}'#226#227'I' + +#236'?yEq3A'#240'N'#16#213'w'#131#216#10#231'x'#179#169#22#187#253'g'#160#183 + +'4'#20'v'#202#200#193#205''''#168''''#130'm('#14#155#191'''q'#255'V'#0':'#17 + +'-'#7#151#153#154'F5'#254#15'U'#14#195#235'B'#9'P'#18#18'7'#255#188'='#8#196 + +'*P4&'#203#156#249'Y$'#190'f@S'#229'D'#200#0'F'#127#235#240#252#141'#'#146#18 + +#16#170#192#148'i'#162#181#14'0'#21#129's["'#16'k'#165#239#208#132'3'#146#5 + +#225#138'O'#1#170#238'E '#213#10'C'#209' '#132#10#179'BCt]'#7'0c'#218#4#197 + +'`'#209#156#24#134#1'e"J'#4#130#8#26'!'#202#137'xr'#12#29'j|'#169#189#172#230 + +#235#163#178#206#135#21#174#225'W'#176#223#208'L'#3#245#137'!l'#167#240#153 + +'1Z'#16#3'v'#168'r'#254'5'#133#231#179'1'#183#248'kM'#238'f'#220#216#10'5 ' + +#19#245#157#242#229#146#236'}I'#205#133#226#241'p'#143#28#135#2#207#236'9'#15 + +')'#129#255'^'#208'z'#238':'#210'f'#141'+.'#225'Bz'#167#204'{vc'#133#16#213 + +#149#232#242#181#217#255#251'n'#6#224';'#176#11#189#20'.'#206#209#170#144#204 + +#7#235#224'zR'#230#179#199#15#231#204'[$'#143#201#242'r'#8'v'#155#213'4?'#217 + +#19'*'#140'5'#2'V'#165#165#169#0#142'R!'#148#231#173'aE^L'#149'-'#146'Cd)' + +#178#27'T'#178'i]'#199'L('#132'}Y'#146'~2'#173#29'x'#223#158#187#240':'#21 + +#203#3#234#169#211'X'#30'v'#226#175'j'#26':{{'#161#170'*zFFp'#153#8#25#31#200 + +'<'#234#194#133'z'#29#28#195#206#137'+'#187#233'X8'#140'0Y3I'#201',B'#9'*' + +#211'w2T'#220'O'#172#10#250'F8'#134'MR'#22#137#192'O'#27'_'#28#24'@'#132#158 + +#159#251#253#182'S'#244#7'pb'#167'$a'#152#127#128'07'#165'p'#196'!'#195#245 + +#141',I'#185'`'#25#185#208#221'-'#217'='#30#219'I'#223' G>'#1#27'C-'#135'c' + +#184#248'2'#192#141'S'#23#143#195#235#245#162#127'p'#16'&'#157#168#201#144 + +#250#193#201#247#208#27#143'~'#162#18#165#19#133#19#210#138#201#137#242#229 + +#209#181#12'_$'#170#232';'#255#130'&'#216#184#178#142'e'#29#198'!+'#172#169 + +'inc'#254#28'D'#127'Vbl'#248#18'4'#146#145'B'#224'fl'#236'<'#175'(9W'#162'T' + +#17'W'#162#22#231'W"'#148#2#255#0'V'#23#226'?'#241'j'#13'8'#0#0#0#0'IEND'#174 + +'B`'#130 +]); +LazarusResources.Add('TRESTDWIdClientPooler','PNG',[ + #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#25#0#0#0#25#8#6#0#0#0#196#233#133 + +'c'#0#0#0#9'pHYs'#0#0#8'N'#0#0#8'N'#1#140'1'#0#236#0#0#0#1'sRGB'#0#174#206#28 + +#233#0#0#0#4'gAMA'#0#0#177#143#11#252'a'#5#0#0#2#193'IDATx'#1#189'VMh'#19'A' + +#20#254'R'#11'J'#209't#-j+'#217#245'`'#9'"'#24'E'#241'RH'#170#24#4#193'D'#170 + +#183#138'I'#233'E/'#241'"'#136'?'#208'b'#145#208#147'E'#240#20#172#7#241'"' + +#162#5#11'R'#15'I'#164#168#20'+'#235'E#BY'#139'E*j&'#17#27'=h|ow'#147'tm'#218 + +#236'B'#232#7#143#204#206#188'y'#223#204#251#203#184'R'#183'/'#150#148#206'6' + +#172#6'QX'#132#250'~'#14'v!mj'#129#223#231#133'6'#255#21'='#253#9'W3'#19'(' + +#29'+'#147#176#226#195#254#4#14#255'X'#132']'#20'H&'#251'B'#8#145'0'#154#235 + +'m'#152#24#185#135'3'#14#8'*Dw'''#161#30#240#233#227#166'z'#202#127#11#206#9 + +#24#219'a'#184#217#22'I#'#176'&$uc'#242#205#11'<'#219#6#199#16#191'('#203#236 + +#146'('#164#25#221'Z'#253'>?%'#193#229'Q'#224'w'#11#164'>'#2#30#143#4#145#19 + +#8#200#180'X'#20#136'v'#9']O'#203#3'is'#143'cw'#9#207#30#18'?'#210#235#130 + +#208'\2'#196'g'#13'9'#154'K7'#5#16#220'"j'#238#177#144#12#222'z'#164#215#197 + +#170'$B@{'#167'Bn5''v'#4#160'|'#207'@'#202#169'PZk'#239#177#184'+'#26#233'F' + +#236'J'#18'c'#215#6'P'#238#2#179#11'@'#242'CUgw'#254#141#254#187#241#133#138 + +'n'#246'{'#145'd='#185'G'#19'H'#230#150#28#134#214#218#142#155'$jv'#14#233 + +#233'le1'#176#223#199#173#0#212'nt'#162'v"9'#244#10#142#241#137#15'h'#146'4' + +#137'Z'#213#236'2'#165'Ah'#14'R'#233#151'{'#23#199'#v5i'#220#162#163#13#141 + +#130'%'#240'w'#198#167'06<'#208'P'#2#134'%'#240#131#231'"'#203#20#230'I'#30 + +#252'7'#199'}'#233#160'9~K2LR'#164'z'#218'L'#217#245#135#2#206'q'#236']'#137 + +#164#22':I'#142#145'<%'#185')Ih'#247#251'QL'#167'1b'#174'_&'#195#227'}'#176 + +#164'/'#23#226#137#251'@'#220#252#182'U'#140#156')O"'#17#156#140#199'!'#203 + +'2'#18#169#20#174#19'!'#207#243#233'Q'#178#234'sJ/%'#173'{'#19#6#187'+'#28#14 + +#227'q,'#134'('#141'c'#153#12'Y'#146'P'#16'F'#133#199'&'#136#167'd'#24#22#191 + +#141#196#228'_G$|'#226#189'0\'#183#139'd'#159#166'U'#214#212'/@d'''#140#222 + +'U'#158'[0'#164#12'['#238'b'#195#26#25#158'Q'#20'\'#160#177';'#26#197','#197 + +#198#13#195'5'#178'dT8'#199'B'#239#190#27#172#251#235#222#228#167#187'E'#207 + +#148#211#163#163#232#165#152'H'#228'&&'#12#168#170'N'#194'.*'#27#207#155'.' + +#10'z'#29#198#228#232#217#8'f'#232#165'r'#137#10#245#229#208#16#158#211#220 + +#17'TSX'#161'G'#204'k"'#233#233'2n'#192'd7'#166#169#15#158#10'!h'#254#199#187 + +'l?'#137#178#14#158'Dn'#235#147#8'k'#129#127#31#30#236#221'K'#143'q'#211#0#0 + +#0#0'IEND'#174'B`'#130 +]); +LazarusResources.Add('TRESTDWIdClientREST','PNG',[ + #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#24#0#0#0#25#8#6#0#0#0'++'#238']'#0 + +#0#0#9'pHYs'#0#0#8'N'#0#0#8'N'#1#140'1'#0#236#0#0#0#1'sRGB'#0#174#206#28#233 + +#0#0#0#4'gAMA'#0#0#177#143#11#252'a'#5#0#0#3#11'IDATx'#1#189'V]HSa'#24'~fZ' + +#224#223#14'"'#253'h'#186'#&'#216#213#142#17'H'#16#236#16'T'#8'A'#147#238#186 + +#217'L'#232'2'#20#202#188#202#22#221#20#193'Z7'#209#141#155'%'#221#165#219'M' + +#208'"'#243'DPi'#196#25#244'c^'#232#230#15'E'#12'Z3'#205','#178#247#253#182 + +#169#251';'#132','#31'x'#207#247#247'~'#239#207's'#190#247'|'#199#244#180#191 + +'wU'#174#173'F!1:>'#1'}b'#6'rM5'#138#217'8w'#10#9#251#145#3#208#200'Ila'#9'E' + +'( 8j6'#218'}'#237'>'#220#23'O'#131#131'/F'#1#193#212#132#6'g'#132'q'#169#162 + +#20#234#193#230#132#3#246#234#127#248#28'X^'#194'f'#16#251'E'#180#180#29#22 + +'}ks='#194#243'Q('#212'2'#132#131#155'='#151'pY'#142#174'oXIl'#146'J'#214#13 + +'0Rci;'#16'^'#4#228#178'u'''#190#235'A'#216'{'#174' '#243#192#20#143#142'M' + +#192'n'#142#166'M'#250'gIv'#158#132#218#212#128#216#19#31#2#203'2l6'#27'b' + +#177#152'0.'#207'j'#8#253#148#224'-'#211#215#246'8k'#136#133#177'7'#144#219 + +#143#165#217'*JE'#148#9'I'#146#128'j'#11'"'#245'*'#204'f3'#148')?d'#211'7' + +#132'^h'#208'w'#217#208''''#233#217'T'#197#179')6>E'#17#29'J'#147#156#216#220 + +#168#18'-'#171'pT'#132#209'PnJ'#163#199#8'9O'#145#186#155#30#147#3'"3'#165#10 + +'0'#211';'#193'+'#13#206'r'#26#215#209'iy'#235#3#234#240#239#14#238#188#6#234 + +'s'#208#244#131#228#211#28#176'@m'#156#199'_'#128#15#201#181#219's'#217#250 + +';N'#228'q'#208'F/u/'#242#227'%''@r'#28#198#24'Y'#201#158'+h%'#231#130#200 + +#224'1I'#165#129#210'{'#146'y'#146#7'0'#198#182'|'#14#142#194#152#162'Z$(:'#5 + +'c'#140#228#152#219#26#138'z'#184'#'#203'b'#226#15'U'#235#30#146#143'Th'#162 + +#216#8'\'#193''#7'g'#169#157'R'#148#181'1'#203'"'#25'ju:'#209#238'p'#160#145 + +#214#14'uu'#161#132#156#241#218'U'#175'W'#180'&'#210#169#204#151'A*'#202#241 + +#129#1'L'#135'B'#176'Z'#173'bn'#152#198#188#137'k'#192'b'#177' '#16#8'@'#167 + +#232#185'o'#143'D'#16#164#190#170#170#168'#'#189'3'#164'3'#153'/'#3'6 SD'#23 + +'('#26#23'E'#174'i'#154'X'#236#238#235'C''I'#21#173#185'\.('#20#189#155#214 + +'[ZZ'#196#139'O'#129#247#207''''#219#188#25#132#137#195's'#29#29#184';<,'#178 + +'a'#184#201#232'~j'#127#147'p'#164'C>'#31#134#168#239#161'@'#158#249#253'kF8' + +'Kv'#184#152#203#129'TY*>'#5#236#128#143#161#215#227#17#198'"D'#1'g'#192'`j' + +#216')'#143#249#197'zH'#231#22#18#245#193#148#177'q>'#230#209#28'?'#15#166 + +#233'G7V='#247#130'x7'#24#20#245#16'OnD'#6#5'B9'#217#178'^+'#9'gC_'#25#240#13 + +#240#153#140';'#250'{'#211'~ '#248'f3'#165'~['#196#133#29#223#220#149#201',' + +#164#174#200#141'`'#7#255#29#127#1#167#17#27'o'#244'4'#24'n'#0#0#0#0'IEND' + +#174'B`'#130 +]); +LazarusResources.Add('TRESTDWIdDataBase','PNG',[ + #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#25#0#0#0#25#8#6#0#0#0#196#233#133 + +'c'#0#0#0#9'pHYs'#0#0#8'N'#0#0#8'N'#1#140'1'#0#236#0#0#0#1'sRGB'#0#174#206#28 + +#233#0#0#0#4'gAMA'#0#0#177#143#11#252'a'#5#0#0#2#251'IDATx'#1#205'V]H'#20'Q' + +#20#254'F'#23'S'#201#221'AV'#250#177#220'1I'#196#151']'#139#160'7'#215#133 + +#196#183#157#8#223#132'U'#31#131'Z'#5#11#31#194#159#183#130'"'#223'z'#8#138 + +'y'#174'H'#131#136'z'#168#17#162#31#31'dV'#162#31#162#156'-'#13'-a'#239#26 + +#154'Y'#177#157'{g'#199#157'Uq'#183','#241#131#179'w'#239#157'{'#206'w'#207 + +'wf'#206#140#244#232'ZoJ'#169#244#226#127#192#156#158'CS'#231'y'#201#197#9 + +#148#189'^'#177'`'#140#141#131#205'/b'#179#144'+'#188#8#248#235'D\'#14#151 + +#205#168'_'#232'C{'#229#230#9#4'f'#128#161#7'^'#168'gz3$'#195#247#30#163'k' + +#29#130#174'/'#1#196#23#128#200'n'#6#150'`'#208'fd'#132#213'0'#216#167'8'#140 + +''':'#2#181#10#148'9'#3#134';'#128#1#143#1#185'('#227#171#150#145'2o>dH'#156 + +#23#179#210#174#241'#'#185'('#193#240#249#144'|'#168'!'#229#245#1#11#12#202 + +'G'#29#172'%'#2#144#159#137'F'#168'S#'#144#11#215#250#219#210#23' '#15#196 + +#238'h'#240#132'"'#176#15#164'H'#12#210'b'#18#242'sM'#204#131#133#230#134#254 + +#174#141'.'#154#241'8'#152#203#3#181#196#4#155#137#129'1'#6#179'D'#129'Q'#31 + +'E`r'#4#248'A'#243#183'1'#145#209'_'#147#12#20#233#214#233#247#211#15#27#134 + +'z'#128#198#137#152'8'#189#236#166#165#18#178'e=?'#18#182#12'\y'#138#156#248 + +#154#30#203'ro'#21'1'#247#28'v'#144#236#164#133#208#187#220#142#207#200#246 + +#165'-'#23#166#200#222#167#255#231'U'#248#205'bKH'#132'\'#243'd'#183#242#216 + +#252#18#150'T'#238'<'#246#242#152'5N'#18#238#20#202#195#177#18#219#184'&'#127 + +'$'#23'?'#29#151#204#179'j'#157#251'~'#147#129'r'#186#240'k'#9#168#152#5#234 + +#177#142'\'#181'd''e'#25'2'#25#199'.'#211#196'Q'#26#181#244#26#223#243#147 + +#214#206'!#'#23'''=E'#129'G'#218#168#213'8'#152#205'$p'#252#6#16'u'#146#216 + +'8'#162#170#240'Q3'#228#237'#'#24#12#226'tG'#7':'#163'Q'#152#20#156#19'I'#146 + +#132#233#161#161','#18'~z'#164#178'3'#147'wd'#147#174'i+'#186#174#163'gt'#20 + +'Wc1'#132#194'a'#177'v['#211'P'#174'('#136'D"B'#218#213#232#184'K<)+0'#251#14 + +'H'#176#198'5$'#206#154#188#226#155'('#155'j'#191'_'#204#187#251#251'E&qj' + +#152'/'#128#21'"^'#31#227'3'#189';'#14#2#141#190#140#191'1k'#153#141#149#187 + +#235#132#131#132#183#143'C$'#23#207#138#227#242#224' .uw'#11')S'#233#189#220 + +#142#165#165#241'Q'#25#217#146'U'#11'>'#202#197#200#130#200#164#160#172'TL' + +#18#137#4'T'#170#11'#'#2'^'#135'b'#146','#222#208' 2'#17'''4'#12'q3'#216#224 + +'7'#3#151#200#14#158'LK'#20#172#202#174#137'4y'#255'bJ&'#146#179#173'}'#226 + +']owX'#30#140#23#248#230#170#160#205#176#30'J'#27#215#201#198')`S'#173#149#1 + +''''#211'&'#128#246#214'fD'#219#154'Q'#221#210'#I'#206'O"}'#236'5'#254#5'dw)' + +#2'uU+'#159'D'#216#10#252#6#183#165#6'R'#238'E'#243'='#0#0#0#0'IEND'#174'B`' + +#130 +]); +LazarusResources.Add('TRESTDWIdPoolerList','PNG',[ + #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#25#0#0#0#25#8#6#0#0#0#196#233#133 + +'c'#0#0#0#9'pHYs'#0#0#8'N'#0#0#8'N'#1#140'1'#0#236#0#0#0#1'sRGB'#0#174#206#28 + +#233#0#0#0#4'gAMA'#0#0#177#143#11#252'a'#5#0#0#2#163'IDATx'#1#237'V_hRQ'#24 + +#255'y'#185'K'#216#186'Wq'#163' '#193#253'a'#180#145#140#182'A{*X'#27#27'=' + +#244#208#234#181'|'#24#13#236#177#183#192#158'b'#15#190#5'-'#232'i'#213#6'=' + +#173#127#176'7'#17'+('#137#2'Q'#164'fJr1M'#148'!W'#197'Hq'#179's'#142'z'#253 + +#179#169#183#17'>'#245#131#239#28#191#239'|'#231#251#157#223#185#231'^'#143 + +#230#205#227';'#165'!'#227#0'('#188#129#8#228#236'/'#168#197#236#185#241#182 + +#227'Rl'#23#23#151#237#26#158#17#148#128#205'e;f'#127#238#194#0'u'#200#16'{x' + +'j'#0'w'#159#223#131'^'#232'=<'#169'T'#238'x'#218'x>'#7'p'#157#16#252'-'#206 + +#144'9/_'#191#199#242#141#197#182'y'#28'mRG '#168'b_'#197#246'r'#232#2#186'B' + +#194#158'IF'#20#177'e'#183#227'('#224'S_:'#230'0%'#130' `ii'#9#225'p'#24#30 + +#143#135'Y*'#149#2#207#243#240#249'|H$'#18#208#233't'#172'w'#185'\,/'#20#10 + +#177'9"Y'#160'*'#146'*'#146#201'$'#180'Z-zzz`6'#155#225#247#251#209#223#223 + +#15#147#201#132'\.'#135'B'#161#160#228#20#139'Ed'#179'Y'#168#1'_'#239'H'#146 + +#132#149#149#21#184#221'n8'#157'N'#182'b'#131#193#128't:'#205#198'#'#145#8 + +#235#189'^/'#244'z=2'#153#140'z'#18#186#162'Wkk'#184'0<'#140#236#206#14#6#249 + +'2'#183'yj'#10#177'X'#12#2#199'!K'#10#234#9'!'#12#229#215'U '#219#228#220#216 + +#128#225#228#190':'#18#145#20#152'{'#180#217'6'#241'+'#177#143'33'#16#141#198 + +'r'#160#162'"&'#12#224#193#246#183#134'\'#14'{'#184'<}'#162#145#164#19'h'#185 + +#31'6'#27','#22#139#18#179#17#191#175#175#15#218#130#6#31#188#223'Y'#204'j' + +#181#194'XY'#196#250#211'u\'#155'>^!U'#1#170'b|~'#190'!'#22#143#199#217'!'#8 + +#6#131'p8'#28#152#152#152'P'#8'('#230#22'.'#177#15#174'j%'#20#209'h'#20#165 + +'RI'#241'iAY'#150'1::'#138#145#145#17#228#243'y'#150'S'#5'}'#150'U'#148'_Fb/' + +#154#138#210#211#191'P'#231#239'mY'#192#233'j'#254#173'c'#164'!'#219'~{'#27 + +#184'O'#19'%bOV'#149'q'#225'7 '#159#189'Y#'#161#5#231#208#30'Cb'#217#154#161 + +#211#30#30#151#136'h'#185'^'#137#26'HT'#174#230'`<'#157#175#140'5A'#206#215 + +'~'#171'&'#249#175'D!'#225'Z'#253'GW@k'#188#163'G~'#240#224'X+%'#18#249#220 + +#233#197#222#26#201#213'+'#231#177#250#204#129'Yr'#187#16'['#144#228#130'd' + +#210'ibZtTB'#9'0'#182#136#201'1'#19#243'5'#245'W'#162#183#159#2#248#23#160#10 + +'&'#199'M'#202#149#8#221#192#31#139#132#254#167#187#13'|'#234#0#0#0#0'IEND' + +#174'B`'#130 +]); diff --git a/CORE/Packages/Lazarus/Connectors/Indy/RESTDWIndySocketsTaurus.pas b/CORE/Packages/Lazarus/Connectors/Indy/RESTDWIndySocketsTaurus.pas new file mode 100644 index 00000000..1a5a609c --- /dev/null +++ b/CORE/Packages/Lazarus/Connectors/Indy/RESTDWIndySocketsTaurus.pas @@ -0,0 +1,22 @@ +{ This file was automatically created by Lazarus. Do not edit! + This source is only used to compile and install the package. + } + +unit RESTDWIndySocketsTaurus; + +{$warn 5023 off : no warning about unused units} +interface + +uses + uRESTDWIdBase, uRESTDWIdReg, LazarusPackageIntf; + +implementation + +procedure Register; +begin + RegisterUnit('uRESTDWIdReg', @uRESTDWIdReg.Register); +end; + +initialization + RegisterPackage('RESTDWIndySocketsTaurus', @Register); +end. diff --git a/CORE/Source/Basic/uRESTDWBasic.pas b/CORE/Source/Basic/uRESTDWBasic.pas index acba5f08..b41b3e19 100644 --- a/CORE/Source/Basic/uRESTDWBasic.pas +++ b/CORE/Source/Basic/uRESTDWBasic.pas @@ -5574,7 +5574,7 @@ procedure TRESTDWBasicReceptor.SetAuthenticator( If Not TRESTDWPoolerDB(ServerMethodsClass.Components[i]).RESTDriver.ConnectionSet Then Raise Exception.Create(cInvalidDriverConnection); TRESTDWPoolerDB(ServerMethodsClass.Components[i]).RESTDriver.PrepareConnection(ConnectionDefs); - vTempJSON := TRESTDWPoolerDB(ServerMethodsClass.Components[i]).RESTDriver.ExecuteCommand(Params.ItemsString['SQL'].Value, + vTempJSON := TRESTDWPoolerDB(ServerMethodsClass.Components[i]).RESTDriver.ExecuteCommand(Params.ItemsString['SQL'].Value, vError, vMessageError, BinaryBlob, diff --git a/CORE/Source/Basic/uRESTDWBasicDbTypes.pas b/CORE/Source/Basic/uRESTDWBasicDbTypes.pas index 4854ae49..3c7fdb6b 100644 --- a/CORE/Source/Basic/uRESTDWBasicDbTypes.pas +++ b/CORE/Source/Basic/uRESTDWBasicDbTypes.pas @@ -178,9 +178,9 @@ TRESTDWStorageBase = class(TRESTDWComponent) Var stream : TStream); Virtual; Procedure LoadDatasetFromStream(Dataset : TDataset; stream : TStream); Virtual; - Procedure SaveDWMemToStream (Dataset : IRESTDWMemTable; + Procedure SaveDWMemToStream (Dataset : TDataset; Var stream : TStream); Virtual; - Procedure LoadDWMemFromStream (Dataset : IRESTDWMemTable; + Procedure LoadDWMemFromStream (Dataset : TDataset; stream : TStream); Virtual; Public Constructor Create (AOwner : TComponent); Override; @@ -217,7 +217,7 @@ constructor TRESTDWStorageBase.Create(AOwner: TComponent); End; -Procedure TRESTDWStorageBase.LoadDWMemFromStream(Dataset : IRESTDWMemTable; +Procedure TRESTDWStorageBase.LoadDWMemFromStream(Dataset : TDataset; stream : TStream); Begin @@ -240,21 +240,7 @@ constructor TRESTDWStorageBase.Create(AOwner: TComponent); Procedure TRESTDWStorageBase.LoadFromStream(Dataset: TDataset; stream: TStream); Begin - {$IFDEF RESTDWMEMTABLE} - LoadDatasetFromStream(Dataset, stream); - If Dataset.Active then - TRESTDWMemTable(Dataset).SortOnFields; - {$ELSE} //TODO LoadFromStream - {$IFDEF UNIDACMEM} - - {$ENDIF} - {$IFDEF ZEOSMEM} - - {$ENDIF} - {$IFDEF RESTFDMEMTABLE} - - {$ENDIF} - {$ENDIF} + LoadDWMemFromStream(TRESTDWMemtable(Dataset), stream); End; Procedure TRESTDWStorageBase.SaveDatasetToStream(Dataset: TDataset; Var stream: TStream); @@ -262,8 +248,8 @@ constructor TRESTDWStorageBase.Create(AOwner: TComponent); End; -Procedure TRESTDWStorageBase.SaveDWMemToStream(Dataset: IRESTDWMemTable; - Var stream: TStream); +Procedure TRESTDWStorageBase.SaveDWMemToStream(Dataset : TDataset; + Var Stream : TStream); Begin End; @@ -285,22 +271,7 @@ constructor TRESTDWStorageBase.Create(AOwner: TComponent); Procedure TRESTDWStorageBase.SaveToStream(Dataset: TDataset; Var stream: TStream); Begin - {$IFDEF RESTDWMEMTABLE} - If Dataset.InheritsFrom(TRESTDWMemTable) then - SaveDWMemToStream(TRESTDWMemTable(Dataset), stream) - Else - SaveDatasetToStream(Dataset, stream); - {$ELSE} //TODO SaveFromStream - {$IFDEF UNIDACMEM} - - {$ENDIF} - {$IFDEF ZEOSMEM} - - {$ENDIF} - {$IFDEF RESTFDMEMTABLE} - - {$ENDIF} - {$ENDIF} + SaveDatasetToStream(Dataset, stream); End; Constructor TConnectionDefs.Create; diff --git a/CORE/Source/Basic/uRESTDWStorageBin.pas b/CORE/Source/Basic/uRESTDWStorageBin.pas index 05f32c63..3f2b2369 100644 --- a/CORE/Source/Basic/uRESTDWStorageBin.pas +++ b/CORE/Source/Basic/uRESTDWStorageBin.pas @@ -33,17 +33,17 @@ interface uses {$IFNDEF RESTDWLAZARUS}{$IFNDEF RESTDWFPC}SqlTimSt, {$ENDIF}{$ENDIF} - FmtBcd, DB, Variants, Classes, SysUtils, uRESTDWBasicDbTypes + FmtBcd, DB, Variants, Classes, SysUtils, uRESTDWBasicDbTypes, {$IFDEF UNIDACMEM} - , DADump, UniDump, VirtualTable, MemDS, + DADump, UniDump, VirtualTable, MemDS, {$ENDIF} {$IFDEF ZEOSMEM} - , ZAbstractRODataset, ZAbstractDataset, ZMemTable, ZDataset, + ZAbstractRODataset, ZAbstractDataset, ZMemTable, ZDataset, {$ENDIF} {$IFNDEF FPC} {$IF CompilerVersion > 22} // Delphi 2010 pra cima {$IFDEF RESTFDMEMTABLE} - , FireDAC.Stan.Intf, FireDAC.Stan.Option, FireDAC.Stan.Param, + FireDAC.Stan.Intf, FireDAC.Stan.Option, FireDAC.Stan.Param, FireDAC.Stan.Error, FireDAC.DatS, FireDAC.Phys.Intf, FireDAC.DApt.Intf, FireDAC.Comp.DataSet, FireDAC.Comp.Client, {$IFNDEF FPC} @@ -54,9 +54,7 @@ interface {$ENDIF} {$IFEND} {$ENDIF} - {$IFDEF RESTDWMEMTABLE} - , uRESTDWMemoryDataset, - {$ENDIF} + uRESTDWMemoryDataset, uRESTDWConsts, uRESTDWTools, uRESTDWBasicTypes; Type @@ -73,14 +71,14 @@ interface Var AStream : TStream); Procedure LoadRecordFromStream (ADataset : TDataset; AStream : TStream); - Function SaveRecordDWMemToStream (Dataset : IRESTDWMemTable; + Function SaveRecordDWMemToStream (Dataset : TRESTDWMemTable; stream : TStream) : Longint; - Procedure LoadRecordDWMemFromStream(Dataset : IRESTDWMemTable; + Procedure LoadRecordDWMemFromStream(Dataset : TRESTDWMemTable; Stream : TStream); Public - Procedure SaveDWMemToStream (IDataset : IRESTDWMemTable; + Procedure SaveDWMemToStream (IDataset : TDataset; Var AStream : TStream); Override; - Procedure LoadDWMemFromStream (IDataset : IRESTDWMemTable; + Procedure LoadDWMemFromStream (IDataset : TDataset; AStream : TStream); Override; Procedure SaveDatasetToStream (ADataset : TDataset; Var AStream : TStream); Override; @@ -259,7 +257,7 @@ interface End; End; -Procedure TRESTDWStorageBin.LoadDWMemFromStream(IDataset : IRESTDWMemTable; +Procedure TRESTDWStorageBin.LoadDWMemFromStream(IDataset : TDataset; AStream : TStream); Procedure CreateFieldDefs(DataSet : TDataSet; Index : Integer); @@ -360,7 +358,7 @@ interface {$ENDIF} {$IFDEF RESTDWMEMTABLE} TRESTDWMemtable - {$ENDIF}(IDataset.GetDataset); + {$ENDIF}(IDataset); // field count AStream.Position := 0; AStream.Read(vFieldsCount, SizeOf(vFieldsCount)); @@ -459,7 +457,7 @@ interface End; ADataSet.DisableControls; Try - LoadRecordDWMemFromStream(IDataset, AStream); + LoadRecordDWMemFromStream(TRESTDWMemtable(IDataset), AStream); Finally ADataSet.EnableControls; AStream := Nil; @@ -467,7 +465,7 @@ interface End; End; -Procedure TRESTDWStorageBin.LoadRecordDWMemFromStream(Dataset : IRESTDWMemTable; +Procedure TRESTDWStorageBin.LoadRecordDWMemFromStream(Dataset : TRESTDWMemTable; stream : TStream); Var I, B, @@ -536,7 +534,7 @@ interface // dwftFmtMemo, // dwftMemo]) Then Begin - vLength := Dataset.GetCalcFieldLen(aField.DataType, aField.Size); + vLength := TRESTDWMemtable(Dataset).GetCalcFieldLen(aField.DataType, aField.Size); {$IFDEF FPC} FillChar(PData^, vLength, #0); {$ELSE} @@ -597,20 +595,20 @@ interface {$ENDIF} {$IFDEF RESTDWMEMTABLE} TRESTDWMemtable - {$ENDIF}(Dataset.GetDataset); + {$ENDIF}(Dataset); stream.Read(vRecCount, SizeOf(vRecCount)); vRecCount := vRecCount - 1; vFieldCount := Length(FFieldNames); vFieldCount := vFieldCount - 1; For i := 0 To vRecCount Do Begin - pActualRecord := PRESTDWMTMemBuffer(Dataset.AllocRecordBuffer); + pActualRecord := PRESTDWMTMemBuffer(TRESTDWMemtable(vDataset).AllocRecordBuffer); {$IFDEF RESTDWANDROID} - Dataset.InternalAddRecord(nativeint(pActualRecord), True); + TRESTDWMemtable(vDataset).InternalAddRecord(nativeint(pActualRecord), True); {$ELSE} - Dataset.InternalAddRecord(pActualRecord, True); + TRESTDWMemtable(vDataset).InternalAddRecord(pActualRecord, True); {$ENDIF} - vActualRecord := Dataset.GetMemoryRecord(i); + vActualRecord := TRESTDWMemtable(vDataset).GetMemoryRecord(i); For b := 0 To vFieldCount Do Begin vBoolean := False; @@ -1358,7 +1356,7 @@ interface AStream.Position := 0; End; -Procedure TRESTDWStorageBin.SaveDWMemToStream(IDataset : IRESTDWMemTable; +Procedure TRESTDWStorageBin.SaveDWMemToStream(IDataset : TDataset; Var AStream : TStream); Var ADataset : {$IFDEF UNIDACMEM} @@ -1392,7 +1390,7 @@ interface {$ENDIF} {$IFDEF RESTDWMEMTABLE} TRESTDWMemtable - {$ENDIF}(IDataset.GetDataset); + {$ENDIF}(IDataset); AStream.Size := 0; If not ADataset.Active Then ADataset.Open @@ -1457,14 +1455,14 @@ interface // marcando position recordcount = 0 vRecordCount := 0; AStream.WriteBuffer(vRecordCount, SizeOf(vRecordCount)); - vRecordCount := SaveRecordDWMemToStream(IDataSet,AStream); + vRecordCount := SaveRecordDWMemToStream(TRESTDWMemtable(IDataSet), AStream); // salvando novo valor de recordcount AStream.Position := i; AStream.WriteBuffer(vRecordCount, SizeOf(vRecordCount)); AStream.Position := 0; End; -Function TRESTDWStorageBin.SaveRecordDWMemToStream(Dataset : IRESTDWMemTable; +Function TRESTDWStorageBin.SaveRecordDWMemToStream(Dataset : TRESTDWMemTable; stream : TStream) : Longint; Var vDataSet : {$IFDEF UNIDACMEM} @@ -1518,9 +1516,9 @@ interface {$ENDIF} {$IFDEF RESTDWMEMTABLE} TRESTDWMemtable - {$ENDIF}(dataset.GetDataset); + {$ENDIF}(dataset); vFieldCount := vDataSet.Fields.Count - 1; - Result := dataset.GetRecordCount - 1; + Result := TRESTDWMemtable(DataSet).GetRecordCount - 1; For I := 0 To Result Do Begin vActualRecord := Dataset.GetMemoryRecord(I); @@ -1554,7 +1552,7 @@ interface Begin {$IFDEF RESTDWMEMTABLE} If Dataset.DataTypeIsBlobTypes(vDataType) Then - PData := Pointer(@PMemBlobArray(PActualRecord + Dataset.GetOffSetsBlobs)^[vDataSet.Fields[B].Offset]) + PData := Pointer(@PMemBlobArray(PActualRecord + TRESTDWMemtable(DataSet).GetOffSetsBlobs)^[vDataSet.Fields[B].Offset]) Else PData := Pointer(PActualRecord + dataset.GetOffSets(vDataSet.Fields[B])); {$ENDIF} diff --git a/CORE/Source/Includes/uRESTDW.inc b/CORE/Source/Includes/uRESTDW.inc index 5dc1e6b7..08580c3b 100644 --- a/CORE/Source/Includes/uRESTDW.inc +++ b/CORE/Source/Includes/uRESTDW.inc @@ -47,13 +47,14 @@ {$DEFINE RESTFDMEMTABLE} {.$DEFINE UNIDACMEM} {.$DEFINE ZEOSMEM} + {$DEFINE USE_TAURUS_TLS} {$IFEND} - {$DEFINE USE_TAURUS_TLS} {$ELSE} //For Lazarus {$DEFINE RESTDWMEMTABLE} {.$DEFINE UNIDACMEM} {.$DEFINE ZEOSMEM} + {$DEFINE USE_TAURUS_TLS} {$ENDIF} diff --git a/CORE/Source/Plugins/Memdataset/uRESTDWMemoryDataset.pas b/CORE/Source/Plugins/Memdataset/uRESTDWMemoryDataset.pas index ce4f13b3..f49a1eaf 100644 --- a/CORE/Source/Plugins/Memdataset/uRESTDWMemoryDataset.pas +++ b/CORE/Source/Plugins/Memdataset/uRESTDWMemoryDataset.pas @@ -391,13 +391,6 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) FDefaultIndex, FCurrentIndexDef : TRESTDWDatasetIndex; FFieldDefClass : TFieldClass; - {$IFDEF FPC} - vDatabaseCharSet : TDatabaseCharSet; - Procedure SetDatabaseCharSet(Value : TDatabaseCharSet); - Function GetDatabaseCharSet : TDatabaseCharSet; - {$ELSE} - FFilterExpression : TRDWABExprParser; - {$ENDIF} Procedure CalcOffSets; Function AddRecord : TRESTDWMTMemoryRecord; Function InsertRecord(Index : Integer) : TRESTDWMTMemoryRecord; @@ -408,7 +401,6 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) Compare : TCompareRecords); Procedure Sort; Function CalcRecordSize : Integer; - Function GetMemoryRecord(Index : Integer) : TRESTDWMTMemoryRecord; Function GetCapacity : Integer; Function RecordFilter : Boolean; Procedure SetCapacity(Value : Integer); @@ -473,8 +465,6 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) Procedure InitFieldDefsFromFieldsInternal; Procedure RecordToBuffer (Rec : TRESTDWMTMemoryRecord; Buffer : PRESTDWMTMemBuffer); - Procedure SetMemoryRecordData (Buffer : PRESTDWMTMemBuffer; - Pos : Integer); Virtual; Procedure SetAutoIncFields (Buffer : PRESTDWMTMemBuffer); Virtual; Function CompareRecords (Item1, Item2 : TRESTDWMTMemoryRecord): Integer;Virtual; @@ -487,8 +477,6 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) Function AllocRecBuf : TRecBuf; override; Procedure FreeRecBuf (Var Buffer : TRecBuf); Override; {$ENDIF NEXTGEN} - Function AllocRecordBuffer : TRecordBuffer;{$IFNDEF NEXTGEN}Override;{$ENDIF} - Procedure FreeRecordBuffer (Var Buffer : TRecordBuffer);{$IFNDEF NEXTGEN}Override;{$ENDIF} Procedure InternalInitRecord (Buffer :{$IFDEF NEXTGEN}TRecBuf{$ELSE}TRecordBuffer{$ENDIF}); Override; Function GetRecord (Buffer :{$IFDEF NEXTGEN}TRecBuf{$ELSE}TRecordBuffer{$ENDIF}; GetMode : TGetMode; @@ -502,10 +490,6 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) Procedure SetBookmarkData (Buffer :{$IFDEF NEXTGEN}TRecBuf{$ELSE}TRecordBuffer{$ENDIF}; Data : TRESTDWMTBookmark); Overload;Override; Procedure InitRecord (Buffer :{$IFDEF NEXTGEN}TRecBuf{$ELSE}TRecordBuffer{$ENDIF}); Overload;Override; - Procedure InternalAddRecord (Buffer : {$IFDEF FPC}Pointer{$ELSE} - {$IFDEF RESTDWANDROID}TRecBuf{$ELSE} - {$IF CompilerVersion >22}Pointer{$ELSE}TRecordBuffer{$IFEND}{$ENDIF}{$ENDIF}; - aAppend : Boolean); Overload; Function GetCurrentRecord (Buffer :{$IFDEF NEXTGEN}TRecBuf{$ELSE}TRecordBuffer{$ENDIF}): Boolean; Overload;Override; Procedure ClearCalcFields (Buffer :{$IFDEF NEXTGEN}NativeInt{$ELSE}TRecordBuffer{$ENDIF}); Override; Function GetRecordSize : Word; Override; @@ -539,7 +523,6 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) Procedure InternalOpen; Override; Procedure OpenCursor(InfoQuery : Boolean);Overload;Override; Function IsCursorOpen : Boolean; Override; - Function GetRecordCount : Integer; Override; Function GetRecNo : Integer; Override; Procedure SetRecNo (Value : Integer);Override; Procedure DoAfterOpen; Override; @@ -549,15 +532,8 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) Var Value : Variant) : Boolean;Virtual; Procedure Notification (AComponent : TComponent; Operation : TOperation);Override; - Function DataTypeSuported (datatype : TFieldType) : Boolean; - Function DataTypeIsBlobTypes (datatype : TFieldType) : Boolean; - Function GetOffSets (aField : TField) : Word;Overload; - Function GetOffSets (Index : Integer) : Word;Overload; - Function GetOffSetsBlobs : Word; Function GetBlobRec (Field : TField; Rec : TRESTDWMTMemoryRecord) : TMemBlobData; - Function GetCalcFieldLen (FieldType : TFieldType; - Size : Word) : Word; procedure ClearIndexes; Function GetDataset : TDataset; Procedure SetIndexName(AValue : String); @@ -565,12 +541,35 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) FLastID : Integer; FBlobs : TMemBlobArray; FRecords : TRecordList; - Property Records [Index : Integer] : TRESTDWMTMemoryRecord Read GetMemoryRecord; + {$IFDEF FPC} + vDatabaseCharSet : TDatabaseCharSet; + Procedure SetDatabaseCharSet(Value : TDatabaseCharSet); + Function GetDatabaseCharSet : TDatabaseCharSet; + {$ELSE} + FFilterExpression : TRDWABExprParser; + {$ENDIF} Constructor Create(AOwner : TComponent);Override; Destructor Destroy;Override; + Function AllocRecordBuffer : TRecordBuffer;{$IFNDEF NEXTGEN}Override;{$ENDIF} + Procedure FreeRecordBuffer (Var Buffer : TRecordBuffer);{$IFNDEF NEXTGEN}Override;{$ENDIF} + Function GetMemoryRecord (Index : Integer) : TRESTDWMTMemoryRecord; + Procedure InternalAddRecord (Buffer : {$IFDEF FPC}Pointer{$ELSE} + {$IFDEF RESTDWANDROID}TRecBuf{$ELSE} + {$IF CompilerVersion >22}Pointer{$ELSE}TRecordBuffer{$IFEND}{$ENDIF}{$ENDIF}; + aAppend : Boolean); Overload; + Function DataTypeSuported (datatype : TFieldType) : Boolean; + Function DataTypeIsBlobTypes (datatype : TFieldType) : Boolean; + Function GetCalcFieldLen (FieldType : TFieldType; + Size : Word) : Word; Function InternalGetFieldData(Field : TField; Var Buffer : TRESTDWMTValueBuffer; cSize : Integer = 0) : Boolean; + Function GetOffSets (aField : TField) : Word;Overload; + Function GetOffSets (Index : Integer) : Word;Overload; + Function GetOffSetsBlobs : Word; + Procedure SetMemoryRecordData (Buffer : PRESTDWMTMemBuffer; + Pos : Integer); Virtual; + Function GetRecordCount : Integer; Override; Function BookmarkValid (aBookmark : TBookmark) : Boolean;Override; Function CompareBookmarks(aBookmark1, aBookmark2 : TBookmark) : Integer;Override; @@ -682,6 +681,7 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) Property RESTDWIndexDefs[Aindex : Integer] : TRESTDWDatasetIndex Read GetBufIndexDef; Property FieldAttrs : TFieldAttrs Read FFieldAttrs Write FFieldAttrs; Property BlobFieldCount; + Property Records [Index : Integer] : TRESTDWMTMemoryRecord Read GetMemoryRecord; published Property Capacity : Integer Read GetCapacity Write SetCapacity Default 0; Property Active; @@ -1895,7 +1895,7 @@ procedure TRESTDWMemTable.SetCapacity(Value: Integer); function TRESTDWMemTable.AddRecord: TRESTDWMTMemoryRecord; Begin - Result := TRESTDWMTMemoryRecord.Create(Nil); + Result := TRESTDWMTMemoryRecord.Create(TRESTDWMemTableAE(Self)); End; function TRESTDWMemTable.FindRecordID(ID: Integer): TRESTDWMTMemoryRecord; diff --git a/CORE/Source/Sockets/Indy/uRESTDWIdBase.pas b/CORE/Source/Sockets/Indy/uRESTDWIdBase.pas index 2d9e1e7d..f6483558 100644 --- a/CORE/Source/Sockets/Indy/uRESTDWIdBase.pas +++ b/CORE/Source/Sockets/Indy/uRESTDWIdBase.pas @@ -3781,7 +3781,7 @@ TIdHTTPAccess = class(TIdHTTP) Function TRESTDWIdServicePooler.GetSSlMode : Pointer; {$IFDEF USE_TAURUS_TLS} Var - SSLMode : TIdSSLMode; + bSSLMode : TIdSSLMode; aTaurSSLMode : TTaurusTLSSSLMode; {$ENDIF} Begin @@ -3802,14 +3802,14 @@ TIdHTTPAccess = class(TIdHTTP) Else Begin If vSSLMode = sslUnassigned Then - SSLMode := sslmUnassigned + bSSLMode := sslmUnassigned Else If vSSLMode = sslClient Then - SSLMode := sslmClient + bSSLMode := sslmClient Else If vSSLMode = sslServer Then - SSLMode := sslmServer + bSSLMode := sslmServer Else If vSSLMode = sslBoth Then - SSLMode := sslmBoth; - Result := @SSLMode; + bSSLMode := sslmBoth; + Result := @bSSLMode; End; {$ELSE} If vSSLMode = sslUnassigned Then