@effect/sql-drizzle 0.39.13 → 0.40.0
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/Mysql.js +0 -9
- package/dist/cjs/Mysql.js.map +1 -1
- package/dist/cjs/Pg.js +0 -9
- package/dist/cjs/Pg.js.map +1 -1
- package/dist/cjs/Sqlite.js +0 -9
- package/dist/cjs/Sqlite.js.map +1 -1
- package/dist/cjs/internal/patch.js +17 -41
- package/dist/cjs/internal/patch.js.map +1 -1
- package/dist/dts/Mysql.d.ts +1 -1
- package/dist/dts/Mysql.d.ts.map +1 -1
- package/dist/dts/Pg.d.ts +1 -1
- package/dist/dts/Pg.d.ts.map +1 -1
- package/dist/dts/Sqlite.d.ts +1 -1
- package/dist/dts/Sqlite.d.ts.map +1 -1
- package/dist/esm/Mysql.js +1 -9
- package/dist/esm/Mysql.js.map +1 -1
- package/dist/esm/Pg.js +1 -9
- package/dist/esm/Pg.js.map +1 -1
- package/dist/esm/Sqlite.js +1 -9
- package/dist/esm/Sqlite.js.map +1 -1
- package/dist/esm/internal/patch.js +16 -39
- package/dist/esm/internal/patch.js.map +1 -1
- package/package.json +3 -3
- package/src/Mysql.ts +2 -6
- package/src/Pg.ts +3 -7
- package/src/Sqlite.ts +2 -6
- package/src/internal/patch.ts +16 -41
package/dist/cjs/Mysql.js
CHANGED
|
@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.makeWithConfig = exports.make = exports.layerWithConfig = exports.layer = exports.MysqlDrizzle = void 0;
|
|
7
|
-
var Client = _interopRequireWildcard(require("@effect/sql/SqlClient"));
|
|
8
7
|
var _mysqlCore = require("drizzle-orm/mysql-core");
|
|
9
8
|
var _mysqlProxy = require("drizzle-orm/mysql-proxy");
|
|
10
9
|
var _queryPromise = require("drizzle-orm/query-promise");
|
|
@@ -13,18 +12,12 @@ var Effect = _interopRequireWildcard(require("effect/Effect"));
|
|
|
13
12
|
var Layer = _interopRequireWildcard(require("effect/Layer"));
|
|
14
13
|
var _patch = require("./internal/patch.js");
|
|
15
14
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
|
|
16
|
-
/**
|
|
17
|
-
* @since 1.0.0
|
|
18
|
-
*/
|
|
19
|
-
|
|
20
15
|
/**
|
|
21
16
|
* @since 1.0.0
|
|
22
17
|
* @category constructors
|
|
23
18
|
*/
|
|
24
19
|
const make = config => Effect.gen(function* () {
|
|
25
|
-
const client = yield* Client.SqlClient;
|
|
26
20
|
const db = (0, _mysqlProxy.drizzle)(yield* _patch.makeRemoteCallback, config);
|
|
27
|
-
(0, _patch.registerDialect)(db.dialect, client);
|
|
28
21
|
return db;
|
|
29
22
|
});
|
|
30
23
|
/**
|
|
@@ -33,9 +26,7 @@ const make = config => Effect.gen(function* () {
|
|
|
33
26
|
*/
|
|
34
27
|
exports.make = make;
|
|
35
28
|
const makeWithConfig = config => Effect.gen(function* () {
|
|
36
|
-
const client = yield* Client.SqlClient;
|
|
37
29
|
const db = (0, _mysqlProxy.drizzle)(yield* _patch.makeRemoteCallback, config);
|
|
38
|
-
(0, _patch.registerDialect)(db.dialect, client);
|
|
39
30
|
return db;
|
|
40
31
|
});
|
|
41
32
|
/**
|
package/dist/cjs/Mysql.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mysql.js","names":["
|
|
1
|
+
{"version":3,"file":"Mysql.js","names":["_mysqlCore","require","_mysqlProxy","_queryPromise","Context","_interopRequireWildcard","Effect","Layer","_patch","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","make","config","gen","db","drizzle","makeRemoteCallback","exports","makeWithConfig","MysqlDrizzle","Tag","layer","effect","layerWithConfig","patch","QueryPromise","prototype","MySqlSelectBase"],"sources":["../../src/Mysql.ts"],"sourcesContent":[null],"mappings":";;;;;;AAMA,IAAAA,UAAA,GAAAC,OAAA;AAEA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,aAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAC,uBAAA,CAAAJ,OAAA;AACA,IAAAK,MAAA,GAAAD,uBAAA,CAAAJ,OAAA;AACA,IAAAM,KAAA,GAAAF,uBAAA,CAAAJ,OAAA;AACA,IAAAO,MAAA,GAAAP,OAAA;AAA+D,SAAAI,wBAAAI,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAN,uBAAA,YAAAA,CAAAI,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAE/D;;;;AAIO,MAAMkB,IAAI,GACfC,MAA+C,IAE/CvB,MAAM,CAACwB,GAAG,CAAC,aAAS;EAClB,MAAMC,EAAE,GAAG,IAAAC,mBAAO,EAAC,OAAOC,yBAAkB,EAAEJ,MAAM,CAAC;EACrD,OAAOE,EAAE;AACX,CAAC,CAAC;AAEJ;;;;AAAAG,OAAA,CAAAN,IAAA,GAAAA,IAAA;AAIO,MAAMO,cAAc,GACzBN,MAAM,IAENvB,MAAM,CAACwB,GAAG,CAAC,aAAS;EAClB,MAAMC,EAAE,GAAG,IAAAC,mBAAO,EAAC,OAAOC,yBAAkB,EAAEJ,MAAM,CAAC;EACrD,OAAOE,EAAE;AACX,CAAC,CAAC;AAEJ;;;;AAAAG,OAAA,CAAAC,cAAA,GAAAA,cAAA;AAIM,MAAOC,YAAa,sBAAQhC,OAAO,CAACiC,GAAG,CAAC,2BAA2B,CAAC,EAGvE;AAEH;;;;AAAAH,OAAA,CAAAE,YAAA,GAAAA,YAAA;AAIO,MAAME,KAAK,GAAAJ,OAAA,CAAAI,KAAA,gBAAuD/B,KAAK,CAACgC,MAAM,CAACH,YAAY,eAAER,IAAI,EAAE,CAAC;AAE3G;;;;AAIO,MAAMY,eAAe,GAC1BX,MAAM,IACHtB,KAAK,CAACgC,MAAM,CAACH,YAAY,EAAED,cAAc,CAACN,MAAM,CAAC,CAAC;AAAAK,OAAA,CAAAM,eAAA,GAAAA,eAAA;AAOvD,IAAAC,YAAK,EAACC,0BAAY,CAACC,SAAS,CAAC;AAC7B,IAAAF,YAAK,EAACG,0BAAe,CAACD,SAAS,CAAC","ignoreList":[]}
|
package/dist/cjs/Pg.js
CHANGED
|
@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.makeWithConfig = exports.make = exports.layerWithConfig = exports.layer = exports.PgDrizzle = void 0;
|
|
7
|
-
var Client = _interopRequireWildcard(require("@effect/sql/SqlClient"));
|
|
8
7
|
var _pgCore = require("drizzle-orm/pg-core");
|
|
9
8
|
var _pgProxy = require("drizzle-orm/pg-proxy");
|
|
10
9
|
var _queryPromise = require("drizzle-orm/query-promise");
|
|
@@ -13,18 +12,12 @@ var Effect = _interopRequireWildcard(require("effect/Effect"));
|
|
|
13
12
|
var Layer = _interopRequireWildcard(require("effect/Layer"));
|
|
14
13
|
var _patch = require("./internal/patch.js");
|
|
15
14
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
|
|
16
|
-
/**
|
|
17
|
-
* @since 1.0.0
|
|
18
|
-
*/
|
|
19
|
-
|
|
20
15
|
/**
|
|
21
16
|
* @since 1.0.0
|
|
22
17
|
* @category constructors
|
|
23
18
|
*/
|
|
24
19
|
const make = config => Effect.gen(function* () {
|
|
25
|
-
const client = yield* Client.SqlClient;
|
|
26
20
|
const db = (0, _pgProxy.drizzle)(yield* _patch.makeRemoteCallback, config);
|
|
27
|
-
(0, _patch.registerDialect)(db.dialect, client);
|
|
28
21
|
return db;
|
|
29
22
|
});
|
|
30
23
|
/**
|
|
@@ -33,9 +26,7 @@ const make = config => Effect.gen(function* () {
|
|
|
33
26
|
*/
|
|
34
27
|
exports.make = make;
|
|
35
28
|
const makeWithConfig = config => Effect.gen(function* () {
|
|
36
|
-
const client = yield* Client.SqlClient;
|
|
37
29
|
const db = (0, _pgProxy.drizzle)(yield* _patch.makeRemoteCallback, config);
|
|
38
|
-
(0, _patch.registerDialect)(db.dialect, client);
|
|
39
30
|
return db;
|
|
40
31
|
});
|
|
41
32
|
/**
|
package/dist/cjs/Pg.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Pg.js","names":["
|
|
1
|
+
{"version":3,"file":"Pg.js","names":["_pgCore","require","_pgProxy","_queryPromise","Context","_interopRequireWildcard","Effect","Layer","_patch","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","make","config","gen","db","drizzle","makeRemoteCallback","exports","makeWithConfig","PgDrizzle","Tag","layer","effect","layerWithConfig","patch","QueryPromise","prototype","PgSelectBase"],"sources":["../../src/Pg.ts"],"sourcesContent":[null],"mappings":";;;;;;AAMA,IAAAA,OAAA,GAAAC,OAAA;AAEA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,aAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAC,uBAAA,CAAAJ,OAAA;AACA,IAAAK,MAAA,GAAAD,uBAAA,CAAAJ,OAAA;AACA,IAAAM,KAAA,GAAAF,uBAAA,CAAAJ,OAAA;AACA,IAAAO,MAAA,GAAAP,OAAA;AAA+D,SAAAI,wBAAAI,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAN,uBAAA,YAAAA,CAAAI,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAE/D;;;;AAIO,MAAMkB,IAAI,GACfC,MAA+C,IAE/CvB,MAAM,CAACwB,GAAG,CAAC,aAAS;EAClB,MAAMC,EAAE,GAAG,IAAAC,gBAAO,EAAC,OAAOC,yBAAkB,EAAEJ,MAAM,CAAC;EACrD,OAAOE,EAAE;AACX,CAAC,CAAC;AAEJ;;;;AAAAG,OAAA,CAAAN,IAAA,GAAAA,IAAA;AAIO,MAAMO,cAAc,GACzBN,MAAM,IAENvB,MAAM,CAACwB,GAAG,CAAC,aAAS;EAClB,MAAMC,EAAE,GAAG,IAAAC,gBAAO,EAAC,OAAOC,yBAAkB,EAAEJ,MAAM,CAAC;EACrD,OAAOE,EAAE;AACX,CAAC,CAAC;AAEJ;;;;AAAAG,OAAA,CAAAC,cAAA,GAAAA,cAAA;AAIM,MAAOC,SAAU,sBAAQhC,OAAO,CAACiC,GAAG,CAAC,wBAAwB,CAAC,EAGjE;AAEH;;;;AAAAH,OAAA,CAAAE,SAAA,GAAAA,SAAA;AAIO,MAAME,KAAK,GAAAJ,OAAA,CAAAI,KAAA,gBAAoD/B,KAAK,CAACgC,MAAM,CAACH,SAAS,eAAER,IAAI,EAAE,CAAC;AAErG;;;;AAIO,MAAMY,eAAe,GAAgFX,MAAM,IAChHtB,KAAK,CAACgC,MAAM,CAACH,SAAS,EAAED,cAAc,CAACN,MAAM,CAAC,CAAC;AAAAK,OAAA,CAAAM,eAAA,GAAAA,eAAA;AAOjD,IAAAC,YAAK,EAACC,0BAAY,CAACC,SAAS,CAAC;AAC7B,IAAAF,YAAK,EAACG,oBAAY,CAACD,SAAS,CAAC","ignoreList":[]}
|
package/dist/cjs/Sqlite.js
CHANGED
|
@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.makeWithConfig = exports.make = exports.layerWithConfig = exports.layer = exports.SqliteDrizzle = void 0;
|
|
7
|
-
var Client = _interopRequireWildcard(require("@effect/sql/SqlClient"));
|
|
8
7
|
var _queryPromise = require("drizzle-orm/query-promise");
|
|
9
8
|
var _sqliteCore = require("drizzle-orm/sqlite-core");
|
|
10
9
|
var _sqliteProxy = require("drizzle-orm/sqlite-proxy");
|
|
@@ -13,18 +12,12 @@ var Effect = _interopRequireWildcard(require("effect/Effect"));
|
|
|
13
12
|
var Layer = _interopRequireWildcard(require("effect/Layer"));
|
|
14
13
|
var _patch = require("./internal/patch.js");
|
|
15
14
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
|
|
16
|
-
/**
|
|
17
|
-
* @since 1.0.0
|
|
18
|
-
*/
|
|
19
|
-
|
|
20
15
|
/**
|
|
21
16
|
* @since 1.0.0
|
|
22
17
|
* @category constructors
|
|
23
18
|
*/
|
|
24
19
|
const make = config => Effect.gen(function* () {
|
|
25
|
-
const client = yield* Client.SqlClient;
|
|
26
20
|
const db = (0, _sqliteProxy.drizzle)(yield* _patch.makeRemoteCallback, config);
|
|
27
|
-
(0, _patch.registerDialect)(db.dialect, client);
|
|
28
21
|
return db;
|
|
29
22
|
});
|
|
30
23
|
/**
|
|
@@ -33,9 +26,7 @@ const make = config => Effect.gen(function* () {
|
|
|
33
26
|
*/
|
|
34
27
|
exports.make = make;
|
|
35
28
|
const makeWithConfig = config => Effect.gen(function* () {
|
|
36
|
-
const client = yield* Client.SqlClient;
|
|
37
29
|
const db = (0, _sqliteProxy.drizzle)(yield* _patch.makeRemoteCallback, config);
|
|
38
|
-
(0, _patch.registerDialect)(db.dialect, client);
|
|
39
30
|
return db;
|
|
40
31
|
});
|
|
41
32
|
/**
|
package/dist/cjs/Sqlite.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Sqlite.js","names":["
|
|
1
|
+
{"version":3,"file":"Sqlite.js","names":["_queryPromise","require","_sqliteCore","_sqliteProxy","Context","_interopRequireWildcard","Effect","Layer","_patch","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","make","config","gen","db","drizzle","makeRemoteCallback","exports","makeWithConfig","SqliteDrizzle","Tag","layer","scoped","layerWithConfig","effect","patch","QueryPromise","prototype","SQLiteSelectBase"],"sources":["../../src/Sqlite.ts"],"sourcesContent":[null],"mappings":";;;;;;AAMA,IAAAA,aAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAEA,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAC,uBAAA,CAAAJ,OAAA;AACA,IAAAK,MAAA,GAAAD,uBAAA,CAAAJ,OAAA;AACA,IAAAM,KAAA,GAAAF,uBAAA,CAAAJ,OAAA;AACA,IAAAO,MAAA,GAAAP,OAAA;AAA+D,SAAAI,wBAAAI,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAN,uBAAA,YAAAA,CAAAI,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAE/D;;;;AAIO,MAAMkB,IAAI,GACfC,MAA+C,IAE/CvB,MAAM,CAACwB,GAAG,CAAC,aAAS;EAClB,MAAMC,EAAE,GAAG,IAAAC,oBAAO,EAAC,OAAOC,yBAAkB,EAAEJ,MAAM,CAAC;EACrD,OAAOE,EAAE;AACX,CAAC,CAAC;AAEJ;;;;AAAAG,OAAA,CAAAN,IAAA,GAAAA,IAAA;AAIO,MAAMO,cAAc,GACzBN,MAAM,IAENvB,MAAM,CAACwB,GAAG,CAAC,aAAS;EAClB,MAAMC,EAAE,GAAG,IAAAC,oBAAO,EAAC,OAAOC,yBAAkB,EAAEJ,MAAM,CAAC;EACrD,OAAOE,EAAE;AACX,CAAC,CAAC;AAEJ;;;;AAAAG,OAAA,CAAAC,cAAA,GAAAA,cAAA;AAIM,MAAOC,aAAc,sBAAQhC,OAAO,CAACiC,GAAG,CAAC,4BAA4B,CAAC,EAGzE;AAEH;;;;AAAAH,OAAA,CAAAE,aAAA,GAAAA,aAAA;AAIO,MAAME,KAAK,GAAAJ,OAAA,CAAAI,KAAA,gBAAwD/B,KAAK,CAACgC,MAAM,CAACH,aAAa,eAAER,IAAI,EAAE,CAAC;AAE7G;;;;AAIO,MAAMY,eAAe,GAC1BX,MAAM,IACHtB,KAAK,CAACkC,MAAM,CAACL,aAAa,EAAED,cAAc,CAACN,MAAM,CAAC,CAAC;AAAAK,OAAA,CAAAM,eAAA,GAAAA,eAAA;AAOxD,IAAAE,YAAK,EAACC,0BAAY,CAACC,SAAS,CAAC;AAC7B,IAAAF,YAAK,EAACG,4BAAgB,CAACD,SAAS,CAAC","ignoreList":[]}
|
|
@@ -3,54 +3,30 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.
|
|
6
|
+
exports.patch = exports.makeRemoteCallback = void 0;
|
|
7
7
|
var Client = _interopRequireWildcard(require("@effect/sql/SqlClient"));
|
|
8
8
|
var _SqlError = require("@effect/sql/SqlError");
|
|
9
|
-
var DUtils = _interopRequireWildcard(require("drizzle-orm/utils"));
|
|
10
9
|
var Effect = _interopRequireWildcard(require("effect/Effect"));
|
|
11
10
|
var Effectable = _interopRequireWildcard(require("effect/Effectable"));
|
|
12
|
-
var _GlobalValue = require("effect/GlobalValue");
|
|
13
11
|
var Runtime = _interopRequireWildcard(require("effect/Runtime"));
|
|
14
12
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
|
|
15
|
-
|
|
16
|
-
/** @internal */
|
|
17
|
-
const registerDialect = (dialect, client) => {
|
|
18
|
-
clientRegistry.set(dialect, client);
|
|
19
|
-
};
|
|
20
|
-
exports.registerDialect = registerDialect;
|
|
21
|
-
const mapResultRow = DUtils.mapResultRow;
|
|
13
|
+
let currentRuntime = undefined;
|
|
22
14
|
const PatchProto = {
|
|
23
15
|
...Effectable.CommitPrototype,
|
|
24
16
|
commit() {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
statement = client.unsafe(prepared.query.sql, prepared.query.params);
|
|
39
|
-
} else if ("queryString" in prepared) {
|
|
40
|
-
statement = client.unsafe(prepared.queryString, prepared.params);
|
|
41
|
-
} else {
|
|
42
|
-
const {
|
|
43
|
-
params,
|
|
44
|
-
sql
|
|
45
|
-
} = this.toSQL();
|
|
46
|
-
statement = client.unsafe(sql, params);
|
|
47
|
-
}
|
|
48
|
-
return Effect.map(statement.values, rows => {
|
|
49
|
-
if (prepared.customResultMapper) {
|
|
50
|
-
return prepared.customResultMapper(rows);
|
|
51
|
-
}
|
|
52
|
-
return rows.map(row => mapResultRow(prepared.fields, row, prepared.joinsNotNullableMap));
|
|
53
|
-
});
|
|
17
|
+
return Effect.runtime().pipe(Effect.flatMap(context => Effect.tryPromise({
|
|
18
|
+
try: () => {
|
|
19
|
+
const pre = currentRuntime;
|
|
20
|
+
currentRuntime = context;
|
|
21
|
+
const out = this.execute();
|
|
22
|
+
currentRuntime = pre;
|
|
23
|
+
return out;
|
|
24
|
+
},
|
|
25
|
+
catch: cause => new _SqlError.SqlError({
|
|
26
|
+
cause,
|
|
27
|
+
message: "Failed to execute QueryPromise"
|
|
28
|
+
})
|
|
29
|
+
})));
|
|
54
30
|
}
|
|
55
31
|
};
|
|
56
32
|
/** @internal */
|
|
@@ -64,9 +40,9 @@ const patch = prototype => {
|
|
|
64
40
|
exports.patch = patch;
|
|
65
41
|
const makeRemoteCallback = exports.makeRemoteCallback = /*#__PURE__*/Effect.gen(function* () {
|
|
66
42
|
const client = yield* Client.SqlClient;
|
|
67
|
-
const
|
|
68
|
-
const runPromise = Runtime.runPromise(runtime);
|
|
43
|
+
const constructionRuntime = yield* Effect.runtime();
|
|
69
44
|
return (sql, params, method) => {
|
|
45
|
+
const runPromise = Runtime.runPromise(currentRuntime ? currentRuntime : constructionRuntime);
|
|
70
46
|
const statement = client.unsafe(sql, params);
|
|
71
47
|
if (method === "execute") {
|
|
72
48
|
return runPromise(Effect.map(statement.raw, header => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patch.js","names":["Client","_interopRequireWildcard","require","_SqlError","
|
|
1
|
+
{"version":3,"file":"patch.js","names":["Client","_interopRequireWildcard","require","_SqlError","Effect","Effectable","Runtime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","currentRuntime","undefined","PatchProto","CommitPrototype","commit","runtime","pipe","flatMap","context","tryPromise","try","pre","out","execute","catch","cause","SqlError","message","patch","prototype","EffectTypeId","assign","exports","makeRemoteCallback","gen","client","SqlClient","constructionRuntime","sql","params","method","runPromise","statement","unsafe","map","raw","header","rows","effect","values","withoutTransform"],"sources":["../../../src/internal/patch.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/dts/Mysql.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
-
import * as Client from "@effect/sql/SqlClient";
|
|
4
|
+
import type * as Client from "@effect/sql/SqlClient";
|
|
5
5
|
import type { SqlError } from "@effect/sql/SqlError";
|
|
6
6
|
import type { DrizzleConfig } from "drizzle-orm";
|
|
7
7
|
import type { MySqlRemoteDatabase } from "drizzle-orm/mysql-proxy";
|
package/dist/dts/Mysql.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mysql.d.ts","sourceRoot":"","sources":["../../src/Mysql.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"Mysql.d.ts","sourceRoot":"","sources":["../../src/Mysql.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAEhD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAGlE,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC;;;GAGG;AACH,eAAO,MAAM,IAAI,GAAI,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAClF,SAAS,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,KAC9C,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAIlE,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAM9G,CAAA;;AAEJ;;;GAGG;AACH,qBAAa,YAAa,SAAQ,iBAG/B;CAAG;AAEN;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAAsC,CAAA;AAE3G;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAEnD,CAAA;AAIvD,OAAO,QAAQ,aAAa,CAAC;IAC3B,UAAiB,YAAY,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC;KAAG;CACvE"}
|
package/dist/dts/Pg.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
-
import * as Client from "@effect/sql/SqlClient";
|
|
4
|
+
import type * as Client from "@effect/sql/SqlClient";
|
|
5
5
|
import type { SqlError } from "@effect/sql/SqlError";
|
|
6
6
|
import type { DrizzleConfig } from "drizzle-orm";
|
|
7
7
|
import type { PgRemoteDatabase } from "drizzle-orm/pg-proxy";
|
package/dist/dts/Pg.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Pg.d.ts","sourceRoot":"","sources":["../../src/Pg.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"Pg.d.ts","sourceRoot":"","sources":["../../src/Pg.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAEhD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAG5D,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC;;;GAGG;AACH,eAAO,MAAM,IAAI,GAAI,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAClF,SAAS,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,KAC9C,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAI/D,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAM3G,CAAA;;AAEJ;;;GAGG;AACH,qBAAa,SAAU,SAAQ,cAG5B;CAAG;AAEN;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAAmC,CAAA;AAErG;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CACtD,CAAA;AAIjD,OAAO,QAAQ,aAAa,CAAC;IAC3B,UAAiB,YAAY,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC;KAAG;CACvE"}
|
package/dist/dts/Sqlite.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
-
import * as Client from "@effect/sql/SqlClient";
|
|
4
|
+
import type * as Client from "@effect/sql/SqlClient";
|
|
5
5
|
import type { SqlError } from "@effect/sql/SqlError";
|
|
6
6
|
import type { DrizzleConfig } from "drizzle-orm";
|
|
7
7
|
import type { SqliteRemoteDatabase } from "drizzle-orm/sqlite-proxy";
|
package/dist/dts/Sqlite.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Sqlite.d.ts","sourceRoot":"","sources":["../../src/Sqlite.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"Sqlite.d.ts","sourceRoot":"","sources":["../../src/Sqlite.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAGhD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAEpE,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC;;;GAGG;AACH,eAAO,MAAM,IAAI,GAAI,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAClF,SAAS,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,KAC9C,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAInE,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,MAAM,CAAC,MAAM,CAAC,oBAAoB,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAM/G,CAAA;;AAEJ;;;GAGG;AACH,qBAAa,aAAc,SAAQ,kBAGhC;CAAG;AAEN;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAAuC,CAAA;AAE7G;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,KAAK,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAEnD,CAAA;AAIxD,OAAO,QAAQ,aAAa,CAAC;IAC3B,UAAiB,YAAY,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC;KAAG;CACvE"}
|
package/dist/esm/Mysql.js
CHANGED
|
@@ -1,22 +1,16 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @since 1.0.0
|
|
3
|
-
*/
|
|
4
|
-
import * as Client from "@effect/sql/SqlClient";
|
|
5
1
|
import { MySqlSelectBase } from "drizzle-orm/mysql-core";
|
|
6
2
|
import { drizzle } from "drizzle-orm/mysql-proxy";
|
|
7
3
|
import { QueryPromise } from "drizzle-orm/query-promise";
|
|
8
4
|
import * as Context from "effect/Context";
|
|
9
5
|
import * as Effect from "effect/Effect";
|
|
10
6
|
import * as Layer from "effect/Layer";
|
|
11
|
-
import { makeRemoteCallback, patch
|
|
7
|
+
import { makeRemoteCallback, patch } from "./internal/patch.js";
|
|
12
8
|
/**
|
|
13
9
|
* @since 1.0.0
|
|
14
10
|
* @category constructors
|
|
15
11
|
*/
|
|
16
12
|
export const make = config => Effect.gen(function* () {
|
|
17
|
-
const client = yield* Client.SqlClient;
|
|
18
13
|
const db = drizzle(yield* makeRemoteCallback, config);
|
|
19
|
-
registerDialect(db.dialect, client);
|
|
20
14
|
return db;
|
|
21
15
|
});
|
|
22
16
|
/**
|
|
@@ -24,9 +18,7 @@ export const make = config => Effect.gen(function* () {
|
|
|
24
18
|
* @category constructors
|
|
25
19
|
*/
|
|
26
20
|
export const makeWithConfig = config => Effect.gen(function* () {
|
|
27
|
-
const client = yield* Client.SqlClient;
|
|
28
21
|
const db = drizzle(yield* makeRemoteCallback, config);
|
|
29
|
-
registerDialect(db.dialect, client);
|
|
30
22
|
return db;
|
|
31
23
|
});
|
|
32
24
|
/**
|
package/dist/esm/Mysql.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mysql.js","names":["
|
|
1
|
+
{"version":3,"file":"Mysql.js","names":["MySqlSelectBase","drizzle","QueryPromise","Context","Effect","Layer","makeRemoteCallback","patch","make","config","gen","db","makeWithConfig","MysqlDrizzle","Tag","layer","effect","layerWithConfig","prototype"],"sources":["../../src/Mysql.ts"],"sourcesContent":[null],"mappings":"AAMA,SAASA,eAAe,QAAQ,wBAAwB;AAExD,SAASC,OAAO,QAAQ,yBAAyB;AACjD,SAASC,YAAY,QAAQ,2BAA2B;AACxD,OAAO,KAAKC,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,SAASC,kBAAkB,EAAEC,KAAK,QAAQ,qBAAqB;AAE/D;;;;AAIA,OAAO,MAAMC,IAAI,GACfC,MAA+C,IAE/CL,MAAM,CAACM,GAAG,CAAC,aAAS;EAClB,MAAMC,EAAE,GAAGV,OAAO,CAAC,OAAOK,kBAAkB,EAAEG,MAAM,CAAC;EACrD,OAAOE,EAAE;AACX,CAAC,CAAC;AAEJ;;;;AAIA,OAAO,MAAMC,cAAc,GACzBH,MAAM,IAENL,MAAM,CAACM,GAAG,CAAC,aAAS;EAClB,MAAMC,EAAE,GAAGV,OAAO,CAAC,OAAOK,kBAAkB,EAAEG,MAAM,CAAC;EACrD,OAAOE,EAAE;AACX,CAAC,CAAC;AAEJ;;;;AAIA,OAAM,MAAOE,YAAa,sBAAQV,OAAO,CAACW,GAAG,CAAC,2BAA2B,CAAC,EAGvE;AAEH;;;;AAIA,OAAO,MAAMC,KAAK,gBAAuDV,KAAK,CAACW,MAAM,CAACH,YAAY,eAAEL,IAAI,EAAE,CAAC;AAE3G;;;;AAIA,OAAO,MAAMS,eAAe,GAC1BR,MAAM,IACHJ,KAAK,CAACW,MAAM,CAACH,YAAY,EAAED,cAAc,CAACH,MAAM,CAAC,CAAC;AAOvDF,KAAK,CAACL,YAAY,CAACgB,SAAS,CAAC;AAC7BX,KAAK,CAACP,eAAe,CAACkB,SAAS,CAAC","ignoreList":[]}
|
package/dist/esm/Pg.js
CHANGED
|
@@ -1,22 +1,16 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @since 1.0.0
|
|
3
|
-
*/
|
|
4
|
-
import * as Client from "@effect/sql/SqlClient";
|
|
5
1
|
import { PgSelectBase } from "drizzle-orm/pg-core";
|
|
6
2
|
import { drizzle } from "drizzle-orm/pg-proxy";
|
|
7
3
|
import { QueryPromise } from "drizzle-orm/query-promise";
|
|
8
4
|
import * as Context from "effect/Context";
|
|
9
5
|
import * as Effect from "effect/Effect";
|
|
10
6
|
import * as Layer from "effect/Layer";
|
|
11
|
-
import { makeRemoteCallback, patch
|
|
7
|
+
import { makeRemoteCallback, patch } from "./internal/patch.js";
|
|
12
8
|
/**
|
|
13
9
|
* @since 1.0.0
|
|
14
10
|
* @category constructors
|
|
15
11
|
*/
|
|
16
12
|
export const make = config => Effect.gen(function* () {
|
|
17
|
-
const client = yield* Client.SqlClient;
|
|
18
13
|
const db = drizzle(yield* makeRemoteCallback, config);
|
|
19
|
-
registerDialect(db.dialect, client);
|
|
20
14
|
return db;
|
|
21
15
|
});
|
|
22
16
|
/**
|
|
@@ -24,9 +18,7 @@ export const make = config => Effect.gen(function* () {
|
|
|
24
18
|
* @category constructors
|
|
25
19
|
*/
|
|
26
20
|
export const makeWithConfig = config => Effect.gen(function* () {
|
|
27
|
-
const client = yield* Client.SqlClient;
|
|
28
21
|
const db = drizzle(yield* makeRemoteCallback, config);
|
|
29
|
-
registerDialect(db.dialect, client);
|
|
30
22
|
return db;
|
|
31
23
|
});
|
|
32
24
|
/**
|
package/dist/esm/Pg.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Pg.js","names":["
|
|
1
|
+
{"version":3,"file":"Pg.js","names":["PgSelectBase","drizzle","QueryPromise","Context","Effect","Layer","makeRemoteCallback","patch","make","config","gen","db","makeWithConfig","PgDrizzle","Tag","layer","effect","layerWithConfig","prototype"],"sources":["../../src/Pg.ts"],"sourcesContent":[null],"mappings":"AAMA,SAASA,YAAY,QAAQ,qBAAqB;AAElD,SAASC,OAAO,QAAQ,sBAAsB;AAC9C,SAASC,YAAY,QAAQ,2BAA2B;AACxD,OAAO,KAAKC,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,SAASC,kBAAkB,EAAEC,KAAK,QAAQ,qBAAqB;AAE/D;;;;AAIA,OAAO,MAAMC,IAAI,GACfC,MAA+C,IAE/CL,MAAM,CAACM,GAAG,CAAC,aAAS;EAClB,MAAMC,EAAE,GAAGV,OAAO,CAAC,OAAOK,kBAAkB,EAAEG,MAAM,CAAC;EACrD,OAAOE,EAAE;AACX,CAAC,CAAC;AAEJ;;;;AAIA,OAAO,MAAMC,cAAc,GACzBH,MAAM,IAENL,MAAM,CAACM,GAAG,CAAC,aAAS;EAClB,MAAMC,EAAE,GAAGV,OAAO,CAAC,OAAOK,kBAAkB,EAAEG,MAAM,CAAC;EACrD,OAAOE,EAAE;AACX,CAAC,CAAC;AAEJ;;;;AAIA,OAAM,MAAOE,SAAU,sBAAQV,OAAO,CAACW,GAAG,CAAC,wBAAwB,CAAC,EAGjE;AAEH;;;;AAIA,OAAO,MAAMC,KAAK,gBAAoDV,KAAK,CAACW,MAAM,CAACH,SAAS,eAAEL,IAAI,EAAE,CAAC;AAErG;;;;AAIA,OAAO,MAAMS,eAAe,GAAgFR,MAAM,IAChHJ,KAAK,CAACW,MAAM,CAACH,SAAS,EAAED,cAAc,CAACH,MAAM,CAAC,CAAC;AAOjDF,KAAK,CAACL,YAAY,CAACgB,SAAS,CAAC;AAC7BX,KAAK,CAACP,YAAY,CAACkB,SAAS,CAAC","ignoreList":[]}
|
package/dist/esm/Sqlite.js
CHANGED
|
@@ -1,22 +1,16 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @since 1.0.0
|
|
3
|
-
*/
|
|
4
|
-
import * as Client from "@effect/sql/SqlClient";
|
|
5
1
|
import { QueryPromise } from "drizzle-orm/query-promise";
|
|
6
2
|
import { SQLiteSelectBase } from "drizzle-orm/sqlite-core";
|
|
7
3
|
import { drizzle } from "drizzle-orm/sqlite-proxy";
|
|
8
4
|
import * as Context from "effect/Context";
|
|
9
5
|
import * as Effect from "effect/Effect";
|
|
10
6
|
import * as Layer from "effect/Layer";
|
|
11
|
-
import { makeRemoteCallback, patch
|
|
7
|
+
import { makeRemoteCallback, patch } from "./internal/patch.js";
|
|
12
8
|
/**
|
|
13
9
|
* @since 1.0.0
|
|
14
10
|
* @category constructors
|
|
15
11
|
*/
|
|
16
12
|
export const make = config => Effect.gen(function* () {
|
|
17
|
-
const client = yield* Client.SqlClient;
|
|
18
13
|
const db = drizzle(yield* makeRemoteCallback, config);
|
|
19
|
-
registerDialect(db.dialect, client);
|
|
20
14
|
return db;
|
|
21
15
|
});
|
|
22
16
|
/**
|
|
@@ -24,9 +18,7 @@ export const make = config => Effect.gen(function* () {
|
|
|
24
18
|
* @category constructors
|
|
25
19
|
*/
|
|
26
20
|
export const makeWithConfig = config => Effect.gen(function* () {
|
|
27
|
-
const client = yield* Client.SqlClient;
|
|
28
21
|
const db = drizzle(yield* makeRemoteCallback, config);
|
|
29
|
-
registerDialect(db.dialect, client);
|
|
30
22
|
return db;
|
|
31
23
|
});
|
|
32
24
|
/**
|
package/dist/esm/Sqlite.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Sqlite.js","names":["
|
|
1
|
+
{"version":3,"file":"Sqlite.js","names":["QueryPromise","SQLiteSelectBase","drizzle","Context","Effect","Layer","makeRemoteCallback","patch","make","config","gen","db","makeWithConfig","SqliteDrizzle","Tag","layer","scoped","layerWithConfig","effect","prototype"],"sources":["../../src/Sqlite.ts"],"sourcesContent":[null],"mappings":"AAMA,SAASA,YAAY,QAAQ,2BAA2B;AACxD,SAASC,gBAAgB,QAAQ,yBAAyB;AAE1D,SAASC,OAAO,QAAQ,0BAA0B;AAClD,OAAO,KAAKC,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,SAASC,kBAAkB,EAAEC,KAAK,QAAQ,qBAAqB;AAE/D;;;;AAIA,OAAO,MAAMC,IAAI,GACfC,MAA+C,IAE/CL,MAAM,CAACM,GAAG,CAAC,aAAS;EAClB,MAAMC,EAAE,GAAGT,OAAO,CAAC,OAAOI,kBAAkB,EAAEG,MAAM,CAAC;EACrD,OAAOE,EAAE;AACX,CAAC,CAAC;AAEJ;;;;AAIA,OAAO,MAAMC,cAAc,GACzBH,MAAM,IAENL,MAAM,CAACM,GAAG,CAAC,aAAS;EAClB,MAAMC,EAAE,GAAGT,OAAO,CAAC,OAAOI,kBAAkB,EAAEG,MAAM,CAAC;EACrD,OAAOE,EAAE;AACX,CAAC,CAAC;AAEJ;;;;AAIA,OAAM,MAAOE,aAAc,sBAAQV,OAAO,CAACW,GAAG,CAAC,4BAA4B,CAAC,EAGzE;AAEH;;;;AAIA,OAAO,MAAMC,KAAK,gBAAwDV,KAAK,CAACW,MAAM,CAACH,aAAa,eAAEL,IAAI,EAAE,CAAC;AAE7G;;;;AAIA,OAAO,MAAMS,eAAe,GAC1BR,MAAM,IACHJ,KAAK,CAACa,MAAM,CAACL,aAAa,EAAED,cAAc,CAACH,MAAM,CAAC,CAAC;AAOxDF,KAAK,CAACP,YAAY,CAACmB,SAAS,CAAC;AAC7BZ,KAAK,CAACN,gBAAgB,CAACkB,SAAS,CAAC","ignoreList":[]}
|
|
@@ -1,48 +1,25 @@
|
|
|
1
1
|
import * as Client from "@effect/sql/SqlClient";
|
|
2
2
|
import { SqlError } from "@effect/sql/SqlError";
|
|
3
|
-
import * as DUtils from "drizzle-orm/utils";
|
|
4
3
|
import * as Effect from "effect/Effect";
|
|
5
4
|
import * as Effectable from "effect/Effectable";
|
|
6
|
-
import { globalValue } from "effect/GlobalValue";
|
|
7
5
|
import * as Runtime from "effect/Runtime";
|
|
8
|
-
|
|
9
|
-
/** @internal */
|
|
10
|
-
export const registerDialect = (dialect, client) => {
|
|
11
|
-
clientRegistry.set(dialect, client);
|
|
12
|
-
};
|
|
13
|
-
const mapResultRow = DUtils.mapResultRow;
|
|
6
|
+
let currentRuntime = undefined;
|
|
14
7
|
const PatchProto = {
|
|
15
8
|
...Effectable.CommitPrototype,
|
|
16
9
|
commit() {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
statement = client.unsafe(prepared.query.sql, prepared.query.params);
|
|
31
|
-
} else if ("queryString" in prepared) {
|
|
32
|
-
statement = client.unsafe(prepared.queryString, prepared.params);
|
|
33
|
-
} else {
|
|
34
|
-
const {
|
|
35
|
-
params,
|
|
36
|
-
sql
|
|
37
|
-
} = this.toSQL();
|
|
38
|
-
statement = client.unsafe(sql, params);
|
|
39
|
-
}
|
|
40
|
-
return Effect.map(statement.values, rows => {
|
|
41
|
-
if (prepared.customResultMapper) {
|
|
42
|
-
return prepared.customResultMapper(rows);
|
|
43
|
-
}
|
|
44
|
-
return rows.map(row => mapResultRow(prepared.fields, row, prepared.joinsNotNullableMap));
|
|
45
|
-
});
|
|
10
|
+
return Effect.runtime().pipe(Effect.flatMap(context => Effect.tryPromise({
|
|
11
|
+
try: () => {
|
|
12
|
+
const pre = currentRuntime;
|
|
13
|
+
currentRuntime = context;
|
|
14
|
+
const out = this.execute();
|
|
15
|
+
currentRuntime = pre;
|
|
16
|
+
return out;
|
|
17
|
+
},
|
|
18
|
+
catch: cause => new SqlError({
|
|
19
|
+
cause,
|
|
20
|
+
message: "Failed to execute QueryPromise"
|
|
21
|
+
})
|
|
22
|
+
})));
|
|
46
23
|
}
|
|
47
24
|
};
|
|
48
25
|
/** @internal */
|
|
@@ -55,9 +32,9 @@ export const patch = prototype => {
|
|
|
55
32
|
/** @internal */
|
|
56
33
|
export const makeRemoteCallback = /*#__PURE__*/Effect.gen(function* () {
|
|
57
34
|
const client = yield* Client.SqlClient;
|
|
58
|
-
const
|
|
59
|
-
const runPromise = Runtime.runPromise(runtime);
|
|
35
|
+
const constructionRuntime = yield* Effect.runtime();
|
|
60
36
|
return (sql, params, method) => {
|
|
37
|
+
const runPromise = Runtime.runPromise(currentRuntime ? currentRuntime : constructionRuntime);
|
|
61
38
|
const statement = client.unsafe(sql, params);
|
|
62
39
|
if (method === "execute") {
|
|
63
40
|
return runPromise(Effect.map(statement.raw, header => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patch.js","names":["Client","SqlError","
|
|
1
|
+
{"version":3,"file":"patch.js","names":["Client","SqlError","Effect","Effectable","Runtime","currentRuntime","undefined","PatchProto","CommitPrototype","commit","runtime","pipe","flatMap","context","tryPromise","try","pre","out","execute","catch","cause","message","patch","prototype","EffectTypeId","Object","assign","makeRemoteCallback","gen","client","SqlClient","constructionRuntime","sql","params","method","runPromise","statement","unsafe","map","raw","header","rows","effect","values","withoutTransform"],"sources":["../../../src/internal/patch.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,MAAM,MAAM,uBAAuB;AAC/C,SAASC,QAAQ,QAAQ,sBAAsB;AAE/C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,UAAU,MAAM,mBAAmB;AAC/C,OAAO,KAAKC,OAAO,MAAM,gBAAgB;AAEzC,IAAIC,cAAc,GAAQC,SAAS;AAEnC,MAAMC,UAAU,GAAG;EACjB,GAAGJ,UAAU,CAACK,eAAe;EAC7BC,MAAMA,CAAA;IAOJ,OAAOP,MAAM,CAACQ,OAAO,EAAE,CAACC,IAAI,CAC1BT,MAAM,CAACU,OAAO,CAAEC,OAAO,IACrBX,MAAM,CAACY,UAAU,CAAC;MAChBC,GAAG,EAAEA,CAAA,KAAK;QACR,MAAMC,GAAG,GAAGX,cAAc;QAC1BA,cAAc,GAAGQ,OAAO;QACxB,MAAMI,GAAG,GAAG,IAAI,CAACC,OAAO,EAAE;QAC1Bb,cAAc,GAAGW,GAAG;QACpB,OAAOC,GAAG;MACZ,CAAC;MACDE,KAAK,EAAGC,KAAK,IAAK,IAAInB,QAAQ,CAAC;QAAEmB,KAAK;QAAEC,OAAO,EAAE;MAAgC,CAAE;KACpF,CAAC,CACH,CACF;EACH;CACD;AAED;AACA,OAAO,MAAMC,KAAK,GAAIC,SAAc,IAAI;EACtC,IAAIrB,MAAM,CAACsB,YAAY,IAAID,SAAS,EAAE;IACpC;EACF;EACAE,MAAM,CAACC,MAAM,CAACH,SAAS,EAAEhB,UAAU,CAAC;AACtC,CAAC;AAED;AACA,OAAO,MAAMoB,kBAAkB,gBAAGzB,MAAM,CAAC0B,GAAG,CAAC,aAAS;EACpD,MAAMC,MAAM,GAAG,OAAO7B,MAAM,CAAC8B,SAAS;EACtC,MAAMC,mBAAmB,GAAG,OAAO7B,MAAM,CAACQ,OAAO,EAAS;EAC1D,OAAO,CAACsB,GAAW,EAAEC,MAAkB,EAAEC,MAAoD,KAAI;IAC/F,MAAMC,UAAU,GAAG/B,OAAO,CAAC+B,UAAU,CAAC9B,cAAc,GAAGA,cAAc,GAAG0B,mBAAmB,CAAC;IAC5F,MAAMK,SAAS,GAAGP,MAAM,CAACQ,MAAM,CAACL,GAAG,EAAEC,MAAM,CAAC;IAC5C,IAAIC,MAAM,KAAK,SAAS,EAAE;MACxB,OAAOC,UAAU,CAACjC,MAAM,CAACoC,GAAG,CAACF,SAAS,CAACG,GAAG,EAAGC,MAAM,KAAM;QAAEC,IAAI,EAAE,CAACD,MAAM;MAAC,CAAE,CAAC,CAAC,CAAC;IAChF;IACA,IAAIE,MAAM,GAAiCR,MAAM,KAAK,KAAK,IAAIA,MAAM,KAAK,QAAQ,GAC9EE,SAAS,CAACO,MAAM,GAChBP,SAAS,CAACQ,gBAAgB;IAC9B,IAAIV,MAAM,KAAK,KAAK,EAAE;MACpBQ,MAAM,GAAGxC,MAAM,CAACoC,GAAG,CAACI,MAAM,EAAGD,IAAI,IAAKA,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACtD;IACA,OAAON,UAAU,CAACjC,MAAM,CAACoC,GAAG,CAACI,MAAM,EAAGD,IAAI,KAAM;MAAEA;IAAI,CAAE,CAAC,CAAC,CAAC;EAC7D,CAAC;AACH,CAAC,CAAC","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect/sql-drizzle",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.40.0",
|
|
4
4
|
"description": "Drizzle integration for @effect/sql",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -19,8 +19,8 @@
|
|
|
19
19
|
"homepage": "https://effect.website",
|
|
20
20
|
"peerDependencies": {
|
|
21
21
|
"drizzle-orm": ">=0.43.1 <0.50",
|
|
22
|
-
"@effect/sql": "^0.
|
|
23
|
-
"effect": "^3.16.
|
|
22
|
+
"@effect/sql": "^0.41.0",
|
|
23
|
+
"effect": "^3.16.13"
|
|
24
24
|
},
|
|
25
25
|
"publishConfig": {
|
|
26
26
|
"provenance": true
|
package/src/Mysql.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
-
import * as Client from "@effect/sql/SqlClient"
|
|
4
|
+
import type * as Client from "@effect/sql/SqlClient"
|
|
5
5
|
import type { SqlError } from "@effect/sql/SqlError"
|
|
6
6
|
import type { DrizzleConfig } from "drizzle-orm"
|
|
7
7
|
import { MySqlSelectBase } from "drizzle-orm/mysql-core"
|
|
@@ -11,7 +11,7 @@ import { QueryPromise } from "drizzle-orm/query-promise"
|
|
|
11
11
|
import * as Context from "effect/Context"
|
|
12
12
|
import * as Effect from "effect/Effect"
|
|
13
13
|
import * as Layer from "effect/Layer"
|
|
14
|
-
import { makeRemoteCallback, patch
|
|
14
|
+
import { makeRemoteCallback, patch } from "./internal/patch.js"
|
|
15
15
|
|
|
16
16
|
/**
|
|
17
17
|
* @since 1.0.0
|
|
@@ -21,9 +21,7 @@ export const make = <TSchema extends Record<string, unknown> = Record<string, ne
|
|
|
21
21
|
config?: Omit<DrizzleConfig<TSchema>, "logger">
|
|
22
22
|
): Effect.Effect<MySqlRemoteDatabase<TSchema>, never, Client.SqlClient> =>
|
|
23
23
|
Effect.gen(function*() {
|
|
24
|
-
const client = yield* Client.SqlClient
|
|
25
24
|
const db = drizzle(yield* makeRemoteCallback, config)
|
|
26
|
-
registerDialect((db as any).dialect, client)
|
|
27
25
|
return db
|
|
28
26
|
})
|
|
29
27
|
|
|
@@ -35,9 +33,7 @@ export const makeWithConfig: (config: DrizzleConfig) => Effect.Effect<MySqlRemot
|
|
|
35
33
|
config
|
|
36
34
|
) =>
|
|
37
35
|
Effect.gen(function*() {
|
|
38
|
-
const client = yield* Client.SqlClient
|
|
39
36
|
const db = drizzle(yield* makeRemoteCallback, config)
|
|
40
|
-
registerDialect((db as any).dialect, client)
|
|
41
37
|
return db
|
|
42
38
|
})
|
|
43
39
|
|
package/src/Pg.ts
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
-
import * as Client from "@effect/sql/SqlClient"
|
|
4
|
+
import type * as Client from "@effect/sql/SqlClient"
|
|
5
5
|
import type { SqlError } from "@effect/sql/SqlError"
|
|
6
6
|
import type { DrizzleConfig } from "drizzle-orm"
|
|
7
7
|
import { PgSelectBase } from "drizzle-orm/pg-core"
|
|
8
|
-
import { drizzle } from "drizzle-orm/pg-proxy"
|
|
9
8
|
import type { PgRemoteDatabase } from "drizzle-orm/pg-proxy"
|
|
9
|
+
import { drizzle } from "drizzle-orm/pg-proxy"
|
|
10
10
|
import { QueryPromise } from "drizzle-orm/query-promise"
|
|
11
11
|
import * as Context from "effect/Context"
|
|
12
12
|
import * as Effect from "effect/Effect"
|
|
13
13
|
import * as Layer from "effect/Layer"
|
|
14
|
-
import { makeRemoteCallback, patch
|
|
14
|
+
import { makeRemoteCallback, patch } from "./internal/patch.js"
|
|
15
15
|
|
|
16
16
|
/**
|
|
17
17
|
* @since 1.0.0
|
|
@@ -21,9 +21,7 @@ export const make = <TSchema extends Record<string, unknown> = Record<string, ne
|
|
|
21
21
|
config?: Omit<DrizzleConfig<TSchema>, "logger">
|
|
22
22
|
): Effect.Effect<PgRemoteDatabase<TSchema>, never, Client.SqlClient> =>
|
|
23
23
|
Effect.gen(function*() {
|
|
24
|
-
const client = yield* Client.SqlClient
|
|
25
24
|
const db = drizzle(yield* makeRemoteCallback, config)
|
|
26
|
-
registerDialect((db as any).dialect, client)
|
|
27
25
|
return db
|
|
28
26
|
})
|
|
29
27
|
|
|
@@ -35,9 +33,7 @@ export const makeWithConfig: (config: DrizzleConfig) => Effect.Effect<PgRemoteDa
|
|
|
35
33
|
config
|
|
36
34
|
) =>
|
|
37
35
|
Effect.gen(function*() {
|
|
38
|
-
const client = yield* Client.SqlClient
|
|
39
36
|
const db = drizzle(yield* makeRemoteCallback, config)
|
|
40
|
-
registerDialect((db as any).dialect, client)
|
|
41
37
|
return db
|
|
42
38
|
})
|
|
43
39
|
|
package/src/Sqlite.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
-
import * as Client from "@effect/sql/SqlClient"
|
|
4
|
+
import type * as Client from "@effect/sql/SqlClient"
|
|
5
5
|
import type { SqlError } from "@effect/sql/SqlError"
|
|
6
6
|
import type { DrizzleConfig } from "drizzle-orm"
|
|
7
7
|
import { QueryPromise } from "drizzle-orm/query-promise"
|
|
@@ -11,7 +11,7 @@ import { drizzle } from "drizzle-orm/sqlite-proxy"
|
|
|
11
11
|
import * as Context from "effect/Context"
|
|
12
12
|
import * as Effect from "effect/Effect"
|
|
13
13
|
import * as Layer from "effect/Layer"
|
|
14
|
-
import { makeRemoteCallback, patch
|
|
14
|
+
import { makeRemoteCallback, patch } from "./internal/patch.js"
|
|
15
15
|
|
|
16
16
|
/**
|
|
17
17
|
* @since 1.0.0
|
|
@@ -21,9 +21,7 @@ export const make = <TSchema extends Record<string, unknown> = Record<string, ne
|
|
|
21
21
|
config?: Omit<DrizzleConfig<TSchema>, "logger">
|
|
22
22
|
): Effect.Effect<SqliteRemoteDatabase<TSchema>, never, Client.SqlClient> =>
|
|
23
23
|
Effect.gen(function*() {
|
|
24
|
-
const client = yield* Client.SqlClient
|
|
25
24
|
const db = drizzle(yield* makeRemoteCallback, config)
|
|
26
|
-
registerDialect((db as any).dialect, client)
|
|
27
25
|
return db
|
|
28
26
|
})
|
|
29
27
|
|
|
@@ -35,9 +33,7 @@ export const makeWithConfig: (config: DrizzleConfig) => Effect.Effect<SqliteRemo
|
|
|
35
33
|
config
|
|
36
34
|
) =>
|
|
37
35
|
Effect.gen(function*() {
|
|
38
|
-
const client = yield* Client.SqlClient
|
|
39
36
|
const db = drizzle(yield* makeRemoteCallback, config)
|
|
40
|
-
registerDialect((db as any).dialect, client)
|
|
41
37
|
return db
|
|
42
38
|
})
|
|
43
39
|
|
package/src/internal/patch.ts
CHANGED
|
@@ -1,24 +1,11 @@
|
|
|
1
1
|
import * as Client from "@effect/sql/SqlClient"
|
|
2
2
|
import { SqlError } from "@effect/sql/SqlError"
|
|
3
|
-
import type { Statement } from "@effect/sql/Statement"
|
|
4
3
|
import type { QueryPromise } from "drizzle-orm/query-promise"
|
|
5
|
-
import * as DUtils from "drizzle-orm/utils"
|
|
6
4
|
import * as Effect from "effect/Effect"
|
|
7
5
|
import * as Effectable from "effect/Effectable"
|
|
8
|
-
import { globalValue } from "effect/GlobalValue"
|
|
9
6
|
import * as Runtime from "effect/Runtime"
|
|
10
7
|
|
|
11
|
-
|
|
12
|
-
"@effect/sql-drizzle/clientRegistry",
|
|
13
|
-
() => new WeakMap<any, Client.SqlClient>()
|
|
14
|
-
)
|
|
15
|
-
|
|
16
|
-
/** @internal */
|
|
17
|
-
export const registerDialect = (dialect: unknown, client: Client.SqlClient) => {
|
|
18
|
-
clientRegistry.set(dialect, client)
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
const mapResultRow = (DUtils as any).mapResultRow
|
|
8
|
+
let currentRuntime: any = undefined
|
|
22
9
|
|
|
23
10
|
const PatchProto = {
|
|
24
11
|
...Effectable.CommitPrototype,
|
|
@@ -29,31 +16,19 @@ const PatchProto = {
|
|
|
29
16
|
readonly toSQL: () => { sql: string; params: Array<any> }
|
|
30
17
|
}
|
|
31
18
|
) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
} else {
|
|
46
|
-
const { params, sql } = this.toSQL()
|
|
47
|
-
statement = client.unsafe(sql, params)
|
|
48
|
-
}
|
|
49
|
-
return Effect.map(
|
|
50
|
-
statement.values,
|
|
51
|
-
(rows) => {
|
|
52
|
-
if (prepared.customResultMapper) {
|
|
53
|
-
return prepared.customResultMapper(rows)
|
|
54
|
-
}
|
|
55
|
-
return rows.map((row) => mapResultRow(prepared.fields, row, prepared.joinsNotNullableMap))
|
|
56
|
-
}
|
|
19
|
+
return Effect.runtime().pipe(
|
|
20
|
+
Effect.flatMap((context) =>
|
|
21
|
+
Effect.tryPromise({
|
|
22
|
+
try: () => {
|
|
23
|
+
const pre = currentRuntime
|
|
24
|
+
currentRuntime = context
|
|
25
|
+
const out = this.execute()
|
|
26
|
+
currentRuntime = pre
|
|
27
|
+
return out
|
|
28
|
+
},
|
|
29
|
+
catch: (cause) => new SqlError({ cause, message: "Failed to execute QueryPromise" })
|
|
30
|
+
})
|
|
31
|
+
)
|
|
57
32
|
)
|
|
58
33
|
}
|
|
59
34
|
}
|
|
@@ -69,9 +44,9 @@ export const patch = (prototype: any) => {
|
|
|
69
44
|
/** @internal */
|
|
70
45
|
export const makeRemoteCallback = Effect.gen(function*() {
|
|
71
46
|
const client = yield* Client.SqlClient
|
|
72
|
-
const
|
|
73
|
-
const runPromise = Runtime.runPromise(runtime)
|
|
47
|
+
const constructionRuntime = yield* Effect.runtime<never>()
|
|
74
48
|
return (sql: string, params: Array<any>, method: "all" | "execute" | "get" | "values" | "run") => {
|
|
49
|
+
const runPromise = Runtime.runPromise(currentRuntime ? currentRuntime : constructionRuntime)
|
|
75
50
|
const statement = client.unsafe(sql, params)
|
|
76
51
|
if (method === "execute") {
|
|
77
52
|
return runPromise(Effect.map(statement.raw, (header) => ({ rows: [header] })))
|