From 6e4577365e162880e39af96fa7251bf919be6c34 Mon Sep 17 00:00:00 2001
From: Orefkov Aleksander <orefkov@gmail.com>
Date: Sat, 15 Oct 2022 11:59:27 +0300
Subject: [PATCH] =?UTF-8?q?-=20=D0=9F=D1=80=D0=B8=20=D0=B2=D1=8B=D0=B3?=
 =?UTF-8?q?=D1=80=D1=83=D0=B7=D0=BA=D0=B5=20=D0=B2=20=D0=A2=D0=97=20=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BB=D0=BE=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=BA=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=8E=D1=82=D1=81=D1=8F=20?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=BA=20=D0=B5=D1=81=D1=82=D1=8C,=20=D0=B1=D0=B5?=
 =?UTF-8?q?=D0=B7=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D1=8B=20=D1=81=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B2=D0=BE=D0=BB=D0=BE=D0=B2.=20-=20=D0=A3=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D1=8B=20=D0=B2=D0=BE=D1=80=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=B3=D0=B8=20=D0=B2=20MSVC=20x64.=20-=20=D0=9E?=
 =?UTF-8?q?=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D1=91=D0=BD=20=D0=BD=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=80=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8.=20-=20?=
 =?UTF-8?q?=D0=90=D0=BA=D1=82=D1=83=D0=B0=D0=BB=D0=B8=D0=B7=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D1=8B?=
 =?UTF-8?q?=20=D0=B2=201=D0=A1.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt         |   2 +-
 readme.md              |  13 ++++++-------
 src/sqlite.cpp         |   2 +-
 src/tests/v8sqlite.epf | Bin 8419 -> 8443 bytes
 src/v8sqlite_addin.cpp |  25 ++++++++++---------------
 src/v8sqlite_addin.h   |   2 +-
 src/version.h          |   4 ++--
 7 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c356280..382df5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ if (WIN32)
     # Одинаковые флаги для компиляторов MSVC и clang-cl в релизной конфигурации
     set (V8SQLITE_CXX_FLAGS_RELEASE "/O2 /GS- /DNDEBUG" CACHE STRING "")
     # Одинаковые флаги для компиляторов MSVC и clang-cl в отладочной конфигурации
-    set (V8SQLITE_CXX_FLAGS_DEBUG "/Zi /Ob0 /Od /RTC1" CACHE STRING "")
+    set (V8SQLITE_CXX_FLAGS_DEBUG "/Zi /Ob0 /Od /D_DEBUG /RTC1" CACHE STRING "")
     # Флаги только для компилятора MSVC в релизной конфигурации
     set (V8SQLITE_CXX_MSVC_RELEASE "/GL" CACHE STRING "")
     # Флаги только для компилятора MSVC в отладочной конфигурации
diff --git a/readme.md b/readme.md
index bfd1db5..7ff5660 100644
--- a/readme.md
+++ b/readme.md
@@ -47,23 +47,23 @@
 
 ```
     Функция ПодключитьВК()
-        
+
         ПутьКВК = КаталогПрограммы();
 
         СистемнаяИнформация = Новый СистемнаяИнформация;
-        
+
         Если СистемнаяИнформация.ТипПлатформы = ТипПлатформы.Windows_x86 или СистемнаяИнформация.ТипПлатформы = ТипПлатформы.Windows_x86_64 Тогда
             ПутьКВК = ПутьКВК + "v8sqlite.dll";
         ИначеЕсли СистемнаяИнформация.ТипПлатформы = ТипПлатформы.Linux_x86_64 Тогда
             ПутьКВК = ПутьКВК + "libv8sqlite.so";
         КонецЕсли;
-        
+
         Если не ПодключитьВнешнююКомпоненту(ПутьКВК, "v8sqlite", ТипВнешнейКомпоненты.Native) Тогда
             Предупреждение("Не удалось подключить внешнюю компоненту " + ПутьКВК);
             Возврат Ложь;
         КонецЕсли;
         Возврат Истина;
-        
+
     КонецФункции // ПодключитьВК()
 
 ```
@@ -220,7 +220,7 @@
     база.ПодготовитьЗапрос("Запрос1", "
     |select * from test where a = @p1
     |");
-    
+
     ...
 
     база.УстановитьПараметр("Запрос1", "@p1", 1);
@@ -248,8 +248,7 @@
 
 Возвращаемая строка зависит от указанного при вызове метода формате.
 Для формата "ТаблицаЗначений" - выдаётся строка, которая методом `ЗначениеИзСтрокиВнутр` преобразуется
-в Таблицу значений. Названия колонок запроса становятся идентификатороми и заголовками колонок
-таблицы значений. Невалидные для идентификатора символы заменяются на `_`, заголовки остаются как есть.
+в Таблицу значений. Названия колонок запроса становятся именем и заголовком колонок таблицы значений.
 
 Для формата "JSON" возвращается строка, которая через XDTO преобразуется в массив.
 Элементы массива - тоже массивы, строки результата запроса.
diff --git a/src/sqlite.cpp b/src/sqlite.cpp
index 7374bb6..ed1e0fb 100644
--- a/src/sqlite.cpp
+++ b/src/sqlite.cpp
@@ -29,7 +29,7 @@ int SqliteBase::exec(stru query) {
 SqliteQuery SqliteBase::prepare(stru query) {
     sqlite3_stmt* stmt = nullptr;
     if (db_) {
-        sqlite3_prepare16_v3(db_, (void*)query.str, query.len * 2, 0, &stmt, nullptr);
+        sqlite3_prepare16_v3(db_, (void*)query.str, (int)query.length() * 2, 0, &stmt, nullptr);
     }
     return SqliteQuery(stmt);
 }
diff --git a/src/tests/v8sqlite.epf b/src/tests/v8sqlite.epf
index a72df4c8fd8ff219c71ce27f3bf6ed7d54fe47d8..a038ba2cec695307ef853e0c5952945e0bc772cd 100644
GIT binary patch
delta 5065
zcmZWtWmFW5+FU?Nb{AM0R=P_%b?FZ25J9?2qy%A!l~|e;r52Wc35BJ*B}7_EQbJIc
zZbZ26d+(p`-fzyCGjrzOoafgw8%n>GQjPh%=m3EFzj=3e2cKpD03eM2@uE-wAn<Sg
zlV>mk087}{Q+OZ)*e`W8ReZp|6=jA049^)g#!L%0l1EyL0{4iW$@@MCrQW2KBo#M#
zGT^%%d&Q8|#k_T^eM6y%QmlQGli^5q6y_5n!KW@ICZ(Z~zoDQIzHHpw(Ng9pg=CZ1
zBwbi8a1-iYvPT(8p0~u3)$?d=TH6lsrj~K1(sJlFEI>Vw0XDo(-uJcsptiJ?liO4k
z7~FvqDeJ4%G^KH^#U+(Gu}%_Z8!76^*T)q<wMQN)$Cl}s2LgpgGDS_-^5iz3a?G3D
zbNW(}sBIrczDWG)_w~$3P^a}qqx3;jO-FFZvxtq8gV>GjqqED#v4g?)Z5ta$Klh*0
z=j~3eDeMp9?>9+@+E%zWUcZ%al|-3aW|4%z_iPdxaSgFvp|o4f$Cd&0`&4vH6%-U8
zB4ZSxkgLaz-iXD*!)b<5CI~_0Ov&aDriBw@k-<A7gJvlxTeEqsDENq#BVZzrp1Z7M
z1Ue-nJeof}{$^Z0hvuPe1L-FAHszK18atu^>z+TyV14l%@ZU(oM4=wyvw#d}do=!i
zo_`c|b<YYeYtJh355z=7Sf!o+16I)ej3+&yUJ>Ap`7g*1CY`|a^}t+CJz~Z6H|(N7
zf<xjAnqJN-#q23!2#e>gza09>`R=(4);)*jFR?m|rJ7MF?QtGysJPg-VfWK_4ABVQ
z<u%W@snnY~dHLI~$IUIIzxyH{wq#;9#WQZHZzDcXm;4ek48fa^<c~d_-hmRaus>ZU
z-$|n9e1WFgb%0vDxE}dvyeMegwJK90jZJgH`@0P(%Ac6_|22Ao`aw(qmlF9;E9bw>
z|7o=cwene<UD&b0-wYUs%6Ctx%W<kLr%PBgfmISd2-V;*Q7}cSPGyl<eioF~nq*Aa
zlX7$6P^zW<ImP9jj^D>T`z?89=!K_4+=+hY-g6v}<LU+aWpEm=W$l*EG%wu)^hi(_
zx^D!2vORt$cK8`^TQZI<VhlUYRb7oK)mkt-PfLFA7<_X3doeO{yQT`bS7L4vy0*1V
zd_?)f&NY3NBx|ru;d;Cpel{RLu+F4VM34~~A9=LnXMD`GD994Kb>6+H=+;ddDU!e_
zZs3kkyz%jxw)Wj!acbI!r7h{XdNx<?-@k!B3zDXutiuVndQ=^3Vv7coTgm44tRp|t
z_|Se!==stry*Jtnx`26bVXpey@*V}A#)Xn|dp7H=lzI2%9Q~lG&Ey=O8t0Uv^j(QQ
zOAxV}%>fH3;Xnu1siAb?W3SB9=$rB$#YfO#T1e62`wl^ra>>oo9kM}GA#<)Y><;iX
zyp&wc&-H>atXlR}qzprgsFOEs`(gKbn{lv6H}e{licfm!>C=RWNJcdMCBCgf;9R>$
zH=R=8?jnUIziiLFAUX>#079*Cs$(|{e^m#7P16iyGl=<`6Xb&*cc2{gc&g$qBEh$8
zZA0p`I$FP4)nuw$v?hDP^=o*$Y%RQ^y2Fwl{sqC?an=^JLWI1<D}F-o9TX&sH}OjZ
zOdEZ^X{~0z&&r3{GadfJlY|2L9%*HZZ^Bp;o^f`*%VIU;?C*E*kpgC9Hk1BI0sL^H
zX4Fi%DN<UJvIWQ)F2i4MTpR#jsDETPfgC+z*AF(QG>TiLaPj7dF^9|{ec<?s13CM9
zs_C4>v|#(*&c*oz&sA=@)Kbs|TT^_jrdZ~8Dj#8`DyYIrtwEzcuuI<X)i~CD<~v!-
zuY4T`Nta8{7k*Wa<mSi&)7XbwVikMTJmVm9o+`U6D6<e&$sQqt=l?KdZUfk*#bW(I
zc3AcX>JP-<_nV<WB*!H5z&(;S$6`BVISWQ7CRheO2X5J)3HruOI^WfxM>A!}B^!DP
zOcIof9#E7b{9<rMTF!=1ys9qC#CCt2s~){_8|;5SfQ0>-K`v24Wv+xOVkZMXMvy7s
z&3=3}M>0Wm|6rH8nYEUykdrs^QUoE+9L8GXDoHf7G_m;R+dLu90{rv76Ky%~@eG^l
z$2b`RSsa)Gq$2QzL5b-E66v+B6g5v}uN*Z=D{LW?;@i97Ypi<>2@l^MZKCryiFz1p
zM#SVsI*_);`9NVsl<^bKT^lQkC>{ewl}!Q(5TrrIX@v!CT3b1zkipYGB;vq=<l$tt
zV6Qh5e5=r(c~ru?@Z@JuccRXybFnP?3de<IfSG^QULqLybE<q=rX&lSiBwJ3&v$-D
zR@r?~VqB(dO>_W}oV(TJwvj6I??r$!*iB#td25Ukrm0^+JE4eSsw3g=<Q6nzZlqTM
zi{W*THV35?KG#eYM4$QkssKrEekW?D2PodYK%}aX*x0ATRckH<N#{xR90Dv<@Cz`N
z)rZIAZ)2~o1coU}8%hKR1Ya}Co4i#-CsKzekBC%xscy4p+-`Ohzrc$YGQ|ko^QSRd
zMY6kTLI)fzBy{>lEc}dhlgHk#)L*2-y87?6GAk8V*U6+TRs=Kd3i3p}DH11%gV3Ps
zm)gGP;FIRVF&F*HLmy*%)rs?lJmFHF??|uuo5gLig6~wV@Kk$WE9kyvplOJ+l0=N0
zMEhKrlqkk*onDgoC>4nd5U=O=u5;qkBPEoX7QN$JN$fvZEkB5@RwP0MW)uGePXc;k
z6Vj~d=OD&DB-i%hr?X+5Db=R;YbC!^yC<6nQ0pARyNo|@-Pbn6%CrVr?MpdI&={bD
zS{FmL1t83jRI5%ubmMHXY`!>aFylqSF17glJAXn#Bqcb>6XoVjUI>$Zl&DVseQttQ
zT3OlN*VdTwJf3RGVxb~2|Dh}<9(#N>oGnPdT)g~C>_}qVlEetknM5H?d4e>QPK3{^
zZ*jsC$p=51x)c(beC3zmw&s1yjphe)VVK2YjF2XIf*I-e13<I6It@x{trD)kO6^K9
zZUl$l=9^LUg66_t?#Xc&&ShT=;h7oqvVpm<e@55#u8#JByC7w=z{<0x7soS)$@F|2
z*Ef3M!Q19#5L%~&wbzD|y)O3HHg(6bNoM$qBq*Mg%Ra%X?VMtG^Qt;8nZHE6y3OL_
zsv%0}M~MbA%U%$R!VdXnvcu5Tj+t1AnrPO}E-?SdavLu?w!qdWaz^Xv5dBfE??4zr
ztaXb8TSF1YOmRt|9f%IxeoytlqQnnDypDJlpq*@rx{ow5;nd+b;cDYf(l;4kNP*Mc
zZR*Mx;ic|otM?p*ui;G~jp~u&xa?fq3fAdcES7@;@Wc8O!MMgSt!}2mQv<v{LC7d_
zD&f5&>i}~UnLU)9#~Vo%4Eqq!TNht8>)#v_CaozN5^?)&D%HKzjsp|<b(O*{S*1{W
zrc8sLHU~~I%Z0}BbCn;W(t^cR;MVEVY1<tU>W=k2Cx2@4(NizgnR)~a{Fil|iC70q
zT?3B<w3S&5iuhog9nEjTmfj^|l#{-!KG0I^V~8XNK2LFa?4BAxeZxQ^`)vrE`jg`k
zC?G{+m6Vy_upN~3kxo^8JnodTn~>LnIY~NK#xW#isz_*xQKnEv2W%Zy1gF1bU?7mA
zS@ez-04kNkq9%WwJ-?~tk(1X{sAX$=LUU4e!Dp@VN>Pyn<`wH2t;~^+9r2DYF4m3`
zb5NC=DHZcpp)ohzt~j5WMUC4e-&3AhvzpPqa+0LC0>MZ>3O9`}ikcT*R9&k)3)35C
ztH^nYg}-H0b3WtaNN^Rrg7Yb2`t?}4xVxbG0M^qLhpnD>{(nS3Hmw1FEv*m`hl?f_
zTJiyNc&B!9Z-<ky`vsDxZ#($P)AcuA&d4zg)ylXmI)VD@E}7{Ru3<C^*Wok@0~e*2
zqF}Eh2VCLh&*_;ILdBl_kP2~WqI%HXt%RKN;Df=D<Fb;Q_+0g9_=`uyBj!CqereBW
zIvX)Xl!4ZBH#hCfoL|Sb%oGimghKVQlM6@<`7AUkJ7JDHw7`dzbt>s8IZ5Su8I3v#
zz4X^p??Paqp)V3z-xDr})A@%Qb9K)vncVyHxiwsW&mnGCyC@74QD3RY&2i4m|1SEs
zO1b|4K}}Nli%}gy5%_IikNib%*t(6&d#_70?PHl!8zif)VW{O7)$)B57ZgkyN5L>6
z3qCizyD{SkRFGd89n0Umiqwi4#JhJzumSbLTsgA)LGT2BXH}gU1w?^4LjJM}3INsy
zLC9Gu`#-m%3|?CUQUq|8*@sF<_%pv+pBQ8uc*@|r6`7>~JbhZr?{vaWVYk`mFU{Aw
z8Pn@ZroN#<AvT+Oc?t)*oJ7mjt}K#z?~l!*Ib|~w^$MT2kS~QEZcE9`tlFJ#Pqc2Y
z(EX-8cQvvwM>yw;v2ItHw9L!9U`i%%25b}W#Fgv1avQd_YWYhbdFL4dW(B|6rAP!=
z4zn=j5&1oV@DkC-E>e1S_VH4n)Ap>L!q}0ewHWmnXLw7#Af4a{-y9^`YTByKipA&8
z-cRW#UCY;V({P{Vh1LsPQJK#8{^Pb2+(?<ncxTx8P#b0Sj&i|TV$b$ci(kvr5BmC@
z<Y|p4K!07(?TN})r3_FTq1$hdy=Aq0CP&+o6&{=}oB?4`791HS&OYDu$i-XEWxsEM
zp?5>-e0qZIC1}S1q#|KdXopmPDj`;wMw0}c<V#*pe@u9(@(TQZYykc1*jV(wq+|Ex
zDENb!1>k#z1<R8kz?Z~t`=L??Ltf>oTqDQxs7joXSzlWq#lBV~FNFL0<tl*V07vLj
zC>L`9zd+cRi)_x)dEcvTPHy_N3R7~1+Ja*k7SU`Xka;WKrwf}j=fY7w9M=f$&N2LW
z_b_Zspx91IXO%Klt?NZNq-C*8xrNQ2yi6_W-uE}*CI#k45|3-U38`PME(!y>)L@fE
z`>pL&?H<ic;im`8>U2(;<02eP0xc?l_;zMEaor#=7Cdpe>zciUN`pMITv;zJ)7Sad
zn35IyJhbk?uZiO2_CMUgt1(|=N^=0U`_qvrood0c;NI5Z#~~YoZ6WyvgYC1Y2KJjE
zCV8F0fN&{#P!EM3q>7A>5(n_-Zz&k{rs=7nr2Zu${o@0<*Q(g0ClJ<}Ni3SP;y(#D
z11=6ntW-PYs15t5K1ZEJroF+xBzPQq=b$o)<$9v~8Ho!QqUL_`KwhrIk$QS4=Sp{W
zsI1I4`(2aZ;%8^mG7OzbT`G1)*|6#B+bnH)!Zv`DKeC%_hk*!Il3AaN8Mqna=TnO=
zZ!OhRDoUXF&_#;P_SzRY#b`L_tTDmwGF#qyTRgRS6Y|nTGC|!&h*4Hg(y!EO`*`fH
z5_#i9rcR=vz5~8bLli9}poyJ{o^LVsy74v~UvrK_je(Gx&!T|RCmDhQ70GZsmYd9P
zGrT+*h93nYOQ#E@=H%piixWC8aS6g?@musak2xo8IgP5BHM9@T39RQw4kskwD#Lto
z2Ww&lE7Vqw5&=1~(cEQ!NpD~5GSuRIa{RNzk56tmr9F^{waEp^Ge&mvWLNbKZzdGQ
zcvoI|P8y6(nwX6`;R>^dOUd-v4lH6!9RnSq5l=q-w#e1V(rvvd8o1$sc|GH=roY!K
zZA=EOb^U2MGpnZ~dG=acD06-a?x`|2B}?LMX;j5+MqSrp*oQ|RSf#5!6R>D<(kOX<
ze)=hPjb2S4XZst6&)3)c&7=OLtUexueWH>Lnd8T9vUQn}ZnC3a76^qLQv4F`%R(}>
znSn5&b)s@=puz?d{aw%8A%iPgy>%LRTsTH$gy!*lqSnUH8t2;@SFuhGZ(*8lAWa^%
zG5!P*)cHVmTA94X-27^uFl^IWR^!*9yhbC-SWi@mNWkbsQkA928P3&Aa?jsTXcGv+
zP1L+}6VHF>sNr@FMyt$REXV^VpjWZw8qj;Sm4)6ech`aE@HMcqTGZ-nDSNW=Pj26g
zHUk_s!F^rZdf9p_)~Feta`&`-QFy?kxdLCS7C|^En{ys|lEt?#Tmj?yB4ht$IkRG1
zsFf-}CWPC^;$4BWM2&_xTD#Ih+fK>JU7i2Eq&V$MV2iP}usF+(vwk!3$VFrId0#2n
zz`2XocKT3L*hfKOg%0VfPY(nL(|1J}zYi3Jl1XQCH`;ZiphDAWDNZ=1t5=oJ`FjT&
zS$`X9CKyq6oZX?qnEz*jsEeet#Q*OfzHXbr@P8vUsQLdysB&gbJjZ`eOKI}S2BJW<
zi*z~l!1ewkzZ<P$w;u%z2n2;dk*$_zq^`K+pQDC@qt#V-xRG_k+g~2JohG(YFKw+s
z^$&@ZsS6#dgc}Tk#=n!qoB$3wdQ6DExQ&`28)Zt|Q>N#+G5mNM6gzpONv2F892(V5
z=@@yos=W7dOWj!{%Jw4$@C_kD{$xpXT{I%l_A6e+v>hqmUSlin9B%o%<}2H)N&{tt
zKn*%4@Knl9qN)Cwb3^~h+2F|TD`B4stK_~NzgLB%-o_ZUA40>g*S+DPc|Ii{CtEI>
zi3XcJ`#cOx4oX~3A9&!}aTkBiZ;#vG$vqZz$gNy}alRthwNGu)V!nbYr79d<7&)!G
bC*nm7MsQIrnfJDAG<{Lmx;rCJOWXJt^Z0^4

delta 5053
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
TXDsN<FIgd8xICpqp*H^o(E5?Z

diff --git a/src/v8sqlite_addin.cpp b/src/v8sqlite_addin.cpp
index af7a21c..7d6a255 100644
--- a/src/v8sqlite_addin.cpp
+++ b/src/v8sqlite_addin.cpp
@@ -133,9 +133,8 @@ bool V8SqliteAddin::BindParam(tVariant* params, unsigned count) {
 
     SqliteQuery& query = find->second;
 
-    int paramNum = params[1].vt == VTYPE_PWSTR ?
-        sqlite3_bind_parameter_index(query, lstringa<100>{varToTextU(params[1])})
-        : getInteger(params[1]);
+    int paramNum =
+        params[1].vt == VTYPE_PWSTR ? sqlite3_bind_parameter_index(query, lstringa<100>{varToTextU(params[1])}) : getInteger(params[1]);
 
     if (!paramNum || paramNum > sqlite3_bind_parameter_count(query)) {
         return error(u"Неверный параметр запроса", u"Bad query param");
@@ -189,16 +188,12 @@ struct ValueTableReceiver : ToTextReceiver {
 
     void addColumnName(ssu name) {
         checkColumnForDates(name);
-        lstringu<200> idName{name};
-
-        bool first = true;
-        for (u16symbol *ptr = idName.str(), *end = ptr + idName.length(); ptr < end; ptr++) {
-            if (!(iswalpha(*ptr) || (!first && *ptr >= '0' && *ptr <= '9'))) {
-                *ptr = '_';
-            }
-            first = false;
+        if (name.find('\"') != str_pos::badIdx) {
+            lstringu<200> idName{e_repl<u16symbol>(name, u"\"", u"\"\"")};
+            vtText << (eeu & u"{" & currentCol & u",\"" & idName & u"\",{\"Pattern\"},\"" & idName & u"\",0},");
+        } else {
+            vtText << (eeu & u"{" & currentCol & u",\"" & name & u"\",{\"Pattern\"},\"" & name & u"\",0},");
         }
-        vtText << (eeu & u"{" & currentCol & u",\"" & idName & u"\",{\"Pattern\"},\"" & e_repl<u16symbol>(name, u"\"", u"\"\"") & u"\",0},");
         currentCol++;
     }
     void addRow() {
@@ -332,8 +327,8 @@ static bool execQuery(SqliteQuery& query, tVariant& retVal, hashStrMapUIU<int>&
         return false;
     }
     if (receiver.colCount) {
-        retVal.vt       = VTYPE_PWSTR;
-        retVal.wstrLen  = (int)text.length();
+        retVal.vt      = VTYPE_PWSTR;
+        retVal.wstrLen = (int)text.length();
         mm->AllocMemory((void**)&retVal.pwstrVal, (int)(text.length() + 1) * 2);
 
         *text.place(retVal.pwstrVal) = 0;
@@ -361,7 +356,7 @@ bool V8SqliteAddin::ExecQuery(tVariant& retVal, tVariant* params, unsigned count
     if (params[2].vt != VTYPE_NULL) {
         if (params[2].vt == VTYPE_PWSTR) {
             auto vals = varToTextU(params[2]).splitf<std::vector<ssu>>(u",", [](ssu& t) { t = t.trimmed(); });
-            for (const auto& v : vals) {
+            for (const auto& v: vals) {
                 dates.emplace(v, 0);
             }
         } else {
diff --git a/src/v8sqlite_addin.h b/src/v8sqlite_addin.h
index e37764b..62ea84f 100644
--- a/src/v8sqlite_addin.h
+++ b/src/v8sqlite_addin.h
@@ -22,7 +22,7 @@ class V8SqliteAddin : public V8Addin<V8SqliteAddin> {
         lstringu<40> v{ssa{P_VERSION}};
         value.vt = VTYPE_PWSTR;
         value.pwstrVal = copyText(v);
-        value.wstrLen  = v.length();
+        value.wstrLen  = (int)v.length();
         return true;
     }
 
diff --git a/src/version.h b/src/version.h
index 3a85692..31165fd 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
-#define F_VERSION 1,0,0,3
-#define P_VERSION "1.0.0.3"
+#define F_VERSION 1,0,0,4
+#define P_VERSION "1.0.0.4"