@effect/sql-mysql2 0.4.27 → 0.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/cjs/MysqlClient.js
CHANGED
|
@@ -53,10 +53,11 @@ const make = options => Effect.gen(function* (_) {
|
|
|
53
53
|
sql,
|
|
54
54
|
values,
|
|
55
55
|
rowsAsArray
|
|
56
|
-
}, (
|
|
57
|
-
if (
|
|
56
|
+
}, (cause, results, _fields) => {
|
|
57
|
+
if (cause) {
|
|
58
58
|
resume(Effect.fail(new _SqlError.SqlError({
|
|
59
|
-
|
|
59
|
+
cause,
|
|
60
|
+
message: "Failed to execute statement"
|
|
60
61
|
})));
|
|
61
62
|
} else if (transform && !rowsAsArray && options.transformResultNames) {
|
|
62
63
|
resume(Effect.succeed(transformRows(results)));
|
|
@@ -98,10 +99,11 @@ const make = options => Effect.gen(function* (_) {
|
|
|
98
99
|
})));
|
|
99
100
|
const poolConnection = new ConnectionImpl(pool);
|
|
100
101
|
const acquireConn = Effect.acquireRelease(Effect.async(resume => {
|
|
101
|
-
pool.getConnection((
|
|
102
|
-
if (
|
|
102
|
+
pool.getConnection((cause, conn) => {
|
|
103
|
+
if (cause) {
|
|
103
104
|
resume(new _SqlError.SqlError({
|
|
104
|
-
|
|
105
|
+
cause,
|
|
106
|
+
message: "Failed to acquire connection"
|
|
105
107
|
}));
|
|
106
108
|
} else {
|
|
107
109
|
resume(Effect.succeed(conn));
|
|
@@ -156,8 +158,9 @@ function queryStream(conn, sql, params) {
|
|
|
156
158
|
const query = conn.query(sql, params).stream();
|
|
157
159
|
let buffer = [];
|
|
158
160
|
let taskPending = false;
|
|
159
|
-
query.on("error",
|
|
160
|
-
|
|
161
|
+
query.on("error", cause => emit.fail(new _SqlError.SqlError({
|
|
162
|
+
cause,
|
|
163
|
+
message: "Failed to stream statement"
|
|
161
164
|
})));
|
|
162
165
|
query.on("data", row => {
|
|
163
166
|
buffer.push(row);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MysqlClient.js","names":["Client","_interopRequireWildcard","require","_SqlError","_SqlStream","Statement","Otel","Chunk","Config","Context","Duration","Effect","Layer","Redacted","Stream","Mysql","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","TypeId","exports","Symbol","for","MysqlClient","GenericTag","make","options","gen","_","compiler","makeCompiler","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","ConnectionImpl","conn","constructor","run","sql","values","transform","rowsAsArray","method","async","resume","
|
|
1
|
+
{"version":3,"file":"MysqlClient.js","names":["Client","_interopRequireWildcard","require","_SqlError","_SqlStream","Statement","Otel","Chunk","Config","Context","Duration","Effect","Layer","Redacted","Stream","Mysql","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","TypeId","exports","Symbol","for","MysqlClient","GenericTag","make","options","gen","_","compiler","makeCompiler","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","ConnectionImpl","conn","constructor","run","sql","values","transform","rowsAsArray","method","async","resume","cause","results","_fields","fail","SqlError","message","succeed","Array","isArray","execute","params","executeWithoutTransform","executeValues","executeRaw","executeStream","stream","queryStream","mapChunks","unsafeFromArray","toReadonlyArray","pool","url","createPool","value","poolConfig","host","port","database","user","username","password","undefined","connectionLimit","maxConnections","idleTimeout","connectionTTL","toMillis","addFinalizer","end","void","poolConnection","acquireConn","acquireRelease","getConnection","sync","release","transactionAcquirer","map","spanAttributes","entries","SEMATTRS_DB_SYSTEM","DBSYSTEMVALUES_MYSQL","push","SEMATTRS_DB_NAME","assign","acquirer","config","layer","scopedContext","unwrap","pipe","flatMap","client","add","SqlClient","dialect","placeholder","onIdentifier","withoutTransform","escape","onCustom","onRecordUpdate","defaultEscape","asyncPauseResume","emit","query","buffer","taskPending","on","row","queueMicrotask","items","onInterrupt","destroy","onPause","pause","onResume"],"sources":["../../src/MysqlClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/esm/MysqlClient.js
CHANGED
|
@@ -44,10 +44,11 @@ export const make = options => Effect.gen(function* (_) {
|
|
|
44
44
|
sql,
|
|
45
45
|
values,
|
|
46
46
|
rowsAsArray
|
|
47
|
-
}, (
|
|
48
|
-
if (
|
|
47
|
+
}, (cause, results, _fields) => {
|
|
48
|
+
if (cause) {
|
|
49
49
|
resume(Effect.fail(new SqlError({
|
|
50
|
-
|
|
50
|
+
cause,
|
|
51
|
+
message: "Failed to execute statement"
|
|
51
52
|
})));
|
|
52
53
|
} else if (transform && !rowsAsArray && options.transformResultNames) {
|
|
53
54
|
resume(Effect.succeed(transformRows(results)));
|
|
@@ -89,10 +90,11 @@ export const make = options => Effect.gen(function* (_) {
|
|
|
89
90
|
})));
|
|
90
91
|
const poolConnection = new ConnectionImpl(pool);
|
|
91
92
|
const acquireConn = Effect.acquireRelease(Effect.async(resume => {
|
|
92
|
-
pool.getConnection((
|
|
93
|
-
if (
|
|
93
|
+
pool.getConnection((cause, conn) => {
|
|
94
|
+
if (cause) {
|
|
94
95
|
resume(new SqlError({
|
|
95
|
-
|
|
96
|
+
cause,
|
|
97
|
+
message: "Failed to acquire connection"
|
|
96
98
|
}));
|
|
97
99
|
} else {
|
|
98
100
|
resume(Effect.succeed(conn));
|
|
@@ -144,8 +146,9 @@ function queryStream(conn, sql, params) {
|
|
|
144
146
|
const query = conn.query(sql, params).stream();
|
|
145
147
|
let buffer = [];
|
|
146
148
|
let taskPending = false;
|
|
147
|
-
query.on("error",
|
|
148
|
-
|
|
149
|
+
query.on("error", cause => emit.fail(new SqlError({
|
|
150
|
+
cause,
|
|
151
|
+
message: "Failed to stream statement"
|
|
149
152
|
})));
|
|
150
153
|
query.on("data", row => {
|
|
151
154
|
buffer.push(row);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MysqlClient.js","names":["Client","SqlError","asyncPauseResume","Statement","Otel","Chunk","Config","Context","Duration","Effect","Layer","Redacted","Stream","Mysql","TypeId","Symbol","for","MysqlClient","GenericTag","make","options","gen","_","compiler","makeCompiler","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","ConnectionImpl","conn","constructor","run","sql","values","transform","rowsAsArray","method","async","resume","
|
|
1
|
+
{"version":3,"file":"MysqlClient.js","names":["Client","SqlError","asyncPauseResume","Statement","Otel","Chunk","Config","Context","Duration","Effect","Layer","Redacted","Stream","Mysql","TypeId","Symbol","for","MysqlClient","GenericTag","make","options","gen","_","compiler","makeCompiler","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","ConnectionImpl","conn","constructor","run","sql","values","transform","rowsAsArray","method","async","resume","cause","results","_fields","fail","message","succeed","Array","isArray","execute","params","executeWithoutTransform","executeValues","executeRaw","executeStream","stream","queryStream","mapChunks","unsafeFromArray","toReadonlyArray","pool","url","createPool","value","poolConfig","host","port","database","user","username","password","undefined","connectionLimit","maxConnections","idleTimeout","connectionTTL","toMillis","addFinalizer","end","void","poolConnection","acquireConn","acquireRelease","getConnection","sync","release","transactionAcquirer","map","spanAttributes","Object","entries","SEMATTRS_DB_SYSTEM","DBSYSTEMVALUES_MYSQL","push","SEMATTRS_DB_NAME","assign","acquirer","config","layer","scopedContext","unwrap","pipe","flatMap","client","add","SqlClient","dialect","placeholder","onIdentifier","withoutTransform","escape","onCustom","onRecordUpdate","defaultEscape","emit","query","buffer","taskPending","on","row","queueMicrotask","items","onInterrupt","destroy","onPause","pause","onResume"],"sources":["../../src/MysqlClient.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,MAAM,MAAM,uBAAuB;AAE/C,SAASC,QAAQ,QAAQ,sBAAsB;AAC/C,SAASC,gBAAgB,QAAQ,uBAAuB;AACxD,OAAO,KAAKC,SAAS,MAAM,uBAAuB;AAClD,OAAO,KAAKC,IAAI,MAAM,qCAAqC;AAC3D,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,eAAe;AAEvC,OAAO,KAAKC,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAE3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,QAAQ;AAE/B;;;;AAIA,OAAO,MAAMC,MAAM,gBAAkBC,MAAM,CAACC,GAAG,CAAC,gCAAgC,CAAC;AAiBjF;;;;AAIA,OAAO,MAAMC,WAAW,gBAAGV,OAAO,CAACW,UAAU,CAAc,gCAAgC,CAAC;AA6B5F;;;;AAIA,OAAO,MAAMC,IAAI,GACfC,OAA0B,IAE1BX,MAAM,CAACY,GAAG,CAAC,WAAUC,CAAC;EACpB,MAAMC,QAAQ,GAAGC,YAAY,CAACJ,OAAO,CAACK,mBAAmB,CAAC;EAC1D,MAAMC,aAAa,GAAGvB,SAAS,CAACwB,iBAAiB,CAC/CP,OAAO,CAACQ,oBAAqB,CAC9B,CAACC,KAAK;EAEP,MAAMC,cAAc;IACWC,IAAA;IAA7BC,YAA6BD,IAAuC;MAAvC,KAAAA,IAAI,GAAJA,IAAI;IAAsC;IAE/DE,GAAGA,CACTC,GAAW,EACXC,MAA2B,EAC3BC,SAAS,GAAG,IAAI,EAChBC,WAAW,GAAG,KAAK,EACnBC,MAAA,GAA8B,SAAS;MAEvC,OAAO7B,MAAM,CAAC8B,KAAK,CAAgCC,MAAM,IAAI;QAC3D;QAAE,IAAI,CAACT,IAAY,CAACO,MAAM,CAAC,CAAC;UAC1BJ,GAAG;UACHC,MAAM;UACNE;SACD,EAAE,CAACI,KAAqB,EAAEC,OAA2B,EAAEC,OAAY,KAAI;UACtE,IAAIF,KAAK,EAAE;YACTD,MAAM,CAAC/B,MAAM,CAACmC,IAAI,CAAC,IAAI3C,QAAQ,CAAC;cAAEwC,KAAK;cAAEI,OAAO,EAAE;YAA6B,CAAE,CAAC,CAAC,CAAC;UACtF,CAAC,MAAM,IAAIT,SAAS,IAAI,CAACC,WAAW,IAAIjB,OAAO,CAACQ,oBAAoB,EAAE;YACpEY,MAAM,CAAC/B,MAAM,CAACqC,OAAO,CAACpB,aAAa,CAACgB,OAAO,CAAC,CAAC,CAAC;UAChD,CAAC,MAAM;YACLF,MAAM,CAAC/B,MAAM,CAACqC,OAAO,CAACC,KAAK,CAACC,OAAO,CAACN,OAAO,CAAC,GAAGA,OAAO,GAAG,EAAE,CAAC,CAAC;UAC/D;QACF,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ;IAEAO,OAAOA,CAACf,GAAW,EAAEgB,MAA0C;MAC7D,OAAO,IAAI,CAACjB,GAAG,CAACC,GAAG,EAAEgB,MAAM,CAAC;IAC9B;IACAC,uBAAuBA,CAACjB,GAAW,EAAEgB,MAA0C;MAC7E,OAAO,IAAI,CAACjB,GAAG,CAACC,GAAG,EAAEgB,MAAM,EAAE,KAAK,CAAC;IACrC;IACAE,aAAaA,CAAClB,GAAW,EAAEgB,MAA0C;MACnE,OAAO,IAAI,CAACjB,GAAG,CAACC,GAAG,EAAEgB,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC;IAC1C;IACAG,UAAUA,CAACnB,GAAW,EAAEgB,MAA2C;MACjE,OAAO,IAAI,CAACjB,GAAG,CAACC,GAAG,EAAEgB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC;IACpD;IACAI,aAAaA,CAACpB,GAAW,EAAEgB,MAA0C;MACnE,MAAMK,MAAM,GAAGC,WAAW,CAAC,IAAI,CAACzB,IAAW,EAAEG,GAAG,EAAEgB,MAAM,CAAC;MACzD,OAAO9B,OAAO,CAACQ,oBAAoB,GAC/BhB,MAAM,CAAC6C,SAAS,CAACF,MAAM,EAAGjC,CAAC,IAC3BjB,KAAK,CAACqD,eAAe,CACnBhC,aAAa,CAACrB,KAAK,CAACsD,eAAe,CAACrC,CAAC,CAAkB,CAAC,CACzD,CAAC,GACFiC,MAAM;IACZ;;EAGF,MAAMK,IAAI,GAAGxC,OAAO,CAACyC,GAAG,GACpBhD,KAAK,CAACiD,UAAU,CAACnD,QAAQ,CAACoD,KAAK,CAAC3C,OAAO,CAACyC,GAAG,CAAC,CAAC,GAC7ChD,KAAK,CAACiD,UAAU,CAAC;IACjB,IAAI1C,OAAO,CAAC4C,UAAU,IAAI,EAAE,CAAC;IAC7BC,IAAI,EAAE7C,OAAO,CAAC6C,IAAI;IAClBC,IAAI,EAAE9C,OAAO,CAAC8C,IAAI;IAClBC,QAAQ,EAAE/C,OAAO,CAAC+C,QAAQ;IAC1BC,IAAI,EAAEhD,OAAO,CAACiD,QAAQ;IACtBC,QAAQ,EAAElD,OAAO,CAACkD,QAAQ,GACtB3D,QAAQ,CAACoD,KAAK,CAAC3C,OAAO,CAACkD,QAAQ,CAAC,GAChCC,SAAS;IACbC,eAAe,EAAEpD,OAAO,CAACqD,cAAc;IACvCC,WAAW,EAAEtD,OAAO,CAACuD,aAAa,GAC9BnE,QAAQ,CAACoE,QAAQ,CAACxD,OAAO,CAACuD,aAAa,CAAC,GACxCJ;GACgB,CAAC;EAEzB,OAAOjD,CAAC,CAACb,MAAM,CAACoE,YAAY,CAAC,MAC3BpE,MAAM,CAAC8B,KAAK,CAAQC,MAAM,IAAI;IAC5BoB,IAAI,CAACkB,GAAG,CAAC,MAAMtC,MAAM,CAAC/B,MAAM,CAACsE,IAAI,CAAC,CAAC;EACrC,CAAC,CAAC,CACH,CAAC;EAEF,MAAMC,cAAc,GAAG,IAAIlD,cAAc,CAAC8B,IAAI,CAAC;EAE/C,MAAMqB,WAAW,GAAGxE,MAAM,CAACyE,cAAc,CACvCzE,MAAM,CAAC8B,KAAK,CAAkCC,MAAM,IAAI;IACtDoB,IAAI,CAACuB,aAAa,CAAC,CAAC1C,KAAK,EAAEV,IAAI,KAAI;MACjC,IAAIU,KAAK,EAAE;QACTD,MAAM,CAAC,IAAIvC,QAAQ,CAAC;UAAEwC,KAAK;UAAEI,OAAO,EAAE;QAA8B,CAAE,CAAC,CAAC;MAC1E,CAAC,MAAM;QACLL,MAAM,CAAC/B,MAAM,CAACqC,OAAO,CAACf,IAAI,CAAC,CAAC;MAC9B;IACF,CAAC,CAAC;EACJ,CAAC,CAAC,EACDA,IAAI,IAAKtB,MAAM,CAAC2E,IAAI,CAAC,MAAMrD,IAAI,CAACsD,OAAO,EAAE,CAAC,CAC5C;EAED,MAAMC,mBAAmB,GAAG7E,MAAM,CAAC8E,GAAG,CACpCN,WAAW,EACVlD,IAAI,IAAK,IAAID,cAAc,CAACC,IAAI,CAAC,CACnC;EAED,MAAMyD,cAAc,GAA6B,CAC/C,IAAIpE,OAAO,CAACoE,cAAc,GAAGC,MAAM,CAACC,OAAO,CAACtE,OAAO,CAACoE,cAAc,CAAC,GAAG,EAAE,CAAC,EACzE,CAACpF,IAAI,CAACuF,kBAAkB,EAAEvF,IAAI,CAACwF,oBAAoB,CAAC,EACpD,CAAC,gBAAgB,EAAExE,OAAO,CAAC6C,IAAI,IAAI,WAAW,CAAC,EAC/C,CAAC,aAAa,EAAE7C,OAAO,CAAC8C,IAAI,IAAI,IAAI,CAAC,CACtC;EAED,IAAI9C,OAAO,CAAC+C,QAAQ,EAAE;IACpBqB,cAAc,CAACK,IAAI,CAAC,CAACzF,IAAI,CAAC0F,gBAAgB,EAAE1E,OAAO,CAAC+C,QAAQ,CAAC,CAAC;EAChE;EAEA,OAAOsB,MAAM,CAACM,MAAM,CAClB/F,MAAM,CAACmB,IAAI,CAAC;IACV6E,QAAQ,EAAEvF,MAAM,CAACqC,OAAO,CAACkC,cAAc,CAAC;IACxCM,mBAAmB;IACnB/D,QAAQ;IACRiE;GACD,CAAC,EACF;IAAE,CAAC1E,MAAM,GAAGA,MAAgB;IAAEmF,MAAM,EAAE7E;EAAO,CAAE,CAChD;AACH,CAAC,CAAC;AAEJ;;;;AAIA,OAAO,MAAM8E,KAAK,GAChBD,MAA6C,IAE7CvF,KAAK,CAACyF,aAAa,CACjB7F,MAAM,CAAC8F,MAAM,CAACH,MAAM,CAAC,CAACI,IAAI,CACxB5F,MAAM,CAAC6F,OAAO,CAACnF,IAAI,CAAC,EACpBV,MAAM,CAAC8E,GAAG,CAAEgB,MAAM,IAChBhG,OAAO,CAACY,IAAI,CAACF,WAAW,EAAEsF,MAAM,CAAC,CAACF,IAAI,CACpC9F,OAAO,CAACiG,GAAG,CAACxG,MAAM,CAACyG,SAAS,EAAEF,MAAM,CAAC,CACtC,CACF,CACF,CACF;AAEH;;;;AAIA,OAAO,MAAM/E,YAAY,GAAIY,SAAiC,IAC5DjC,SAAS,CAACqB,YAAY,CAAC;EACrBkF,OAAO,EAAE,OAAO;EAChBC,WAAWA,CAACrF,CAAC;IACX,OAAO,GAAG;EACZ,CAAC;EACDsF,YAAY,EAAExE,SAAS,GACrB,UAAS2B,KAAK,EAAE8C,gBAAgB;IAC9B,OAAOA,gBAAgB,GAAGC,MAAM,CAAC/C,KAAK,CAAC,GAAG+C,MAAM,CAAC1E,SAAS,CAAC2B,KAAK,CAAC,CAAC;EACpE,CAAC,GACD+C,MAAM;EACRC,QAAQA,CAAA;IACN,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC;EACjB,CAAC;EACDC,cAAcA,CAAA;IACZ,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC;EACjB;CACD,CAAC;AAEJ,MAAMF,MAAM,gBAAG3G,SAAS,CAAC8G,aAAa,CAAC,GAAG,CAAC;AAE3C,SAASzD,WAAWA,CAClBzB,IAA0B,EAC1BG,GAAW,EACXgB,MAA2B;EAE3B,OAAOhD,gBAAgB,CAAiBgH,IAAI,IAAI;IAC9C,MAAMC,KAAK,GAAIpF,IAAY,CAACoF,KAAK,CAACjF,GAAG,EAAEgB,MAAM,CAAC,CAACK,MAAM,EAAE;IACvD,IAAI6D,MAAM,GAAe,EAAE;IAC3B,IAAIC,WAAW,GAAG,KAAK;IACvBF,KAAK,CAACG,EAAE,CAAC,OAAO,EAAG7E,KAAc,IAAKyE,IAAI,CAACtE,IAAI,CAAC,IAAI3C,QAAQ,CAAC;MAAEwC,KAAK;MAAEI,OAAO,EAAE;IAA4B,CAAE,CAAC,CAAC,CAAC;IAChHsE,KAAK,CAACG,EAAE,CAAC,MAAM,EAAGC,GAAQ,IAAI;MAC5BH,MAAM,CAACvB,IAAI,CAAC0B,GAAG,CAAC;MAChB,IAAI,CAACF,WAAW,EAAE;QAChBA,WAAW,GAAG,IAAI;QAClBG,cAAc,CAAC,MAAK;UAClB,MAAMC,KAAK,GAAGL,MAAM;UACpBA,MAAM,GAAG,EAAE;UACXF,IAAI,CAACrF,KAAK,CAAC4F,KAAK,CAAC;UACjBJ,WAAW,GAAG,KAAK;QACrB,CAAC,CAAC;MACJ;IACF,CAAC,CAAC;IACFF,KAAK,CAACG,EAAE,CAAC,KAAK,EAAE,MAAMJ,IAAI,CAACpC,GAAG,EAAE,CAAC;IACjC,OAAO;MACL4C,WAAW,EAAEjH,MAAM,CAAC2E,IAAI,CAAC,MAAM+B,KAAK,CAACQ,OAAO,EAAE,CAAC;MAC/CC,OAAO,EAAEnH,MAAM,CAAC2E,IAAI,CAAC,MAAM+B,KAAK,CAACU,KAAK,EAAE,CAAC;MACzCC,QAAQ,EAAErH,MAAM,CAAC2E,IAAI,CAAC,MAAM+B,KAAK,CAAC3E,MAAM,EAAE;KAC3C;EACH,CAAC,CAAC;AACJ","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect/sql-mysql2",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.5.1",
|
|
4
4
|
"description": "A MySQL toolkit for Effect",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -11,12 +11,12 @@
|
|
|
11
11
|
"sideEffects": [],
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@opentelemetry/semantic-conventions": "^1.25.1",
|
|
14
|
-
"mysql2": "^3.10.
|
|
14
|
+
"mysql2": "^3.10.2"
|
|
15
15
|
},
|
|
16
16
|
"peerDependencies": {
|
|
17
|
-
"@effect/platform": "^0.
|
|
18
|
-
"@effect/sql": "^0.
|
|
19
|
-
"effect": "^3.5.
|
|
17
|
+
"@effect/platform": "^0.59.1",
|
|
18
|
+
"@effect/sql": "^0.5.1",
|
|
19
|
+
"effect": "^3.5.5"
|
|
20
20
|
},
|
|
21
21
|
"publishConfig": {
|
|
22
22
|
"provenance": true
|
package/src/MysqlClient.ts
CHANGED
|
@@ -101,9 +101,9 @@ export const make = (
|
|
|
101
101
|
sql,
|
|
102
102
|
values,
|
|
103
103
|
rowsAsArray
|
|
104
|
-
}, (
|
|
105
|
-
if (
|
|
106
|
-
resume(Effect.fail(new SqlError({
|
|
104
|
+
}, (cause: unknown | null, results: ReadonlyArray<any>, _fields: any) => {
|
|
105
|
+
if (cause) {
|
|
106
|
+
resume(Effect.fail(new SqlError({ cause, message: "Failed to execute statement" })))
|
|
107
107
|
} else if (transform && !rowsAsArray && options.transformResultNames) {
|
|
108
108
|
resume(Effect.succeed(transformRows(results)))
|
|
109
109
|
} else {
|
|
@@ -163,9 +163,9 @@ export const make = (
|
|
|
163
163
|
|
|
164
164
|
const acquireConn = Effect.acquireRelease(
|
|
165
165
|
Effect.async<Mysql.PoolConnection, SqlError>((resume) => {
|
|
166
|
-
pool.getConnection((
|
|
167
|
-
if (
|
|
168
|
-
resume(new SqlError({
|
|
166
|
+
pool.getConnection((cause, conn) => {
|
|
167
|
+
if (cause) {
|
|
168
|
+
resume(new SqlError({ cause, message: "Failed to acquire connection" }))
|
|
169
169
|
} else {
|
|
170
170
|
resume(Effect.succeed(conn))
|
|
171
171
|
}
|
|
@@ -253,7 +253,7 @@ function queryStream(
|
|
|
253
253
|
const query = (conn as any).query(sql, params).stream()
|
|
254
254
|
let buffer: Array<any> = []
|
|
255
255
|
let taskPending = false
|
|
256
|
-
query.on("error", (
|
|
256
|
+
query.on("error", (cause: unknown) => emit.fail(new SqlError({ cause, message: "Failed to stream statement" })))
|
|
257
257
|
query.on("data", (row: any) => {
|
|
258
258
|
buffer.push(row)
|
|
259
259
|
if (!taskPending) {
|