@effect/sql-mysql2 0.1.17 → 0.2.0

package/dist/cjs/Client.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.makeCompiler = exports.make = exports.layer = exports.MysqlClient = void 0;
+exports.makeCompiler = exports.make = exports.layer = exports.TypeId = exports.MysqlClient = void 0;
 var Client = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Client"));
 var _Error = /*#__PURE__*/require("@effect/sql/Error");
 var Statement = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Statement"));
@@ -46,19 +46,23 @@ function _interopRequireWildcard(e, r) {
  * @since 1.0.0
  */
 
+/**
+ * @category type ids
+ * @since 1.0.0
+ */
+const TypeId = exports.TypeId = /*#__PURE__*/Symbol.for("@effect/sql-mysql2/Client");
 /**
  * @category tags
  * @since 1.0.0
  */
-const MysqlClient = exports.MysqlClient = /*#__PURE__*/Context.GenericTag("sqlfx/mysql2/MysqlClient");
-const escape = /*#__PURE__*/Statement.defaultEscape("`");
+const MysqlClient = exports.MysqlClient = /*#__PURE__*/Context.GenericTag("@effect/sql-mysql2/Client");
 /**
  * @category constructors
  * @since 1.0.0
  */
 const make = options => Effect.gen(function* (_) {
   const compiler = makeCompiler(options.transformQueryNames);
-  const transformRows = Client.defaultTransforms(options.transformResultNames).array;
+  const transformRows = Statement.defaultTransforms(options.transformResultNames).array;
   class ConnectionImpl {
     conn;
     constructor(conn) {
@@ -136,6 +140,7 @@ const make = options => Effect.gen(function* (_) {
     compiler,
     spanAttributes
   }), {
+    [TypeId]: TypeId,
     config: options
   });
 });
@@ -144,19 +149,29 @@ const make = options => Effect.gen(function* (_) {
  * @since 1.0.0
  */
 exports.make = make;
-const layer = config => Layer.scoped(MysqlClient, Effect.flatMap(Config.unwrap(config), make));
+const layer = config => Layer.scopedContext(Config.unwrap(config).pipe(Effect.flatMap(make), Effect.map(client => Context.make(MysqlClient, client).pipe(Context.add(Client.Client, client)))));
 /**
  * @category compiler
  * @since 1.0.0
  */
 exports.layer = layer;
 const makeCompiler = transform => Statement.makeCompiler({
-  placeholder: _ => `?`,
-  onIdentifier: transform ? _ => escape(transform(_)) : escape,
-  onCustom: () => ["", []],
-  onRecordUpdate: () => ["", []]
+  dialect: "mysql",
+  placeholder(_) {
+    return `?`;
+  },
+  onIdentifier: transform ? function (value, withoutTransform) {
+    return withoutTransform ? escape(value) : escape(transform(value));
+  } : escape,
+  onCustom() {
+    return ["", []];
+  },
+  onRecordUpdate() {
+    return ["", []];
+  }
 });
 exports.makeCompiler = makeCompiler;
+const escape = /*#__PURE__*/Statement.defaultEscape("`");
 function queryStream(conn, sql, params) {
   return (0, _Stream.asyncPauseResume)(emit => {
     const query = conn.query(sql, params).stream();

package/dist/cjs/Client.js.map

@@ -1 +1 @@
-{"version":3,"file":"Client.js","names":["Client","_interopRequireWildcard","require","_Error","Statement","_Stream","Chunk","Config","Context","Duration","Effect","Layer","Secret","Stream","Mysql","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","MysqlClient","exports","GenericTag","escape","defaultEscape","make","options","gen","_","compiler","makeCompiler","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","ConnectionImpl","conn","constructor","run","sql","values","transform","rowsAsArray","method","async","resume","error","results","_fields","fail","SqlError","succeed","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","push","assign","acquirer","config","layer","scoped","flatMap","unwrap","placeholder","onIdentifier","onCustom","onRecordUpdate","asyncPauseResume","emit","query","buffer","taskPending","on","row","queueMicrotask","items","onInterrupt","destroy","onPause","pause","onResume"],"sources":["../../src/Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Client.js","names":["Client","_interopRequireWildcard","require","_Error","Statement","_Stream","Chunk","Config","Context","Duration","Effect","Layer","Secret","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","error","results","_fields","fail","SqlError","succeed","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","push","assign","acquirer","config","layer","scopedContext","unwrap","pipe","flatMap","client","add","dialect","placeholder","onIdentifier","withoutTransform","escape","onCustom","onRecordUpdate","defaultEscape","asyncPauseResume","emit","query","buffer","taskPending","on","row","queueMicrotask","items","onInterrupt","destroy","onPause","pause","onResume"],"sources":["../../src/Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/Migrator.js

@@ -26,7 +26,7 @@ Object.keys(Migrator).forEach(function (key) {
 var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
 var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
 var Secret = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Secret"));
-var Client = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("./Client.js"));
+var _Client = /*#__PURE__*/require("./Client.js");
 function _getRequireWildcardCache(e) {
   if ("function" != typeof WeakMap) return null;
   var r = new WeakMap(),
@@ -65,20 +65,9 @@ function _interopRequireWildcard(e, r) {
  * @since 1.0.0
  */
 const run = exports.run = /*#__PURE__*/Migrator.make({
-  getClient: Client.MysqlClient,
-  ensureTable(sql, table) {
-    return sql`CREATE TABLE IF NOT EXISTS ${sql(table)} (
-      migration_id INTEGER UNSIGNED NOT NULL,
-      created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-      name VARCHAR(255) NOT NULL,
-      PRIMARY KEY (migration_id)
-    )`;
-  },
-  lockTable(sql, table) {
-    return sql`LOCK TABLE ${sql(table)} IN ACCESS EXCLUSIVE MODE`;
-  },
-  dumpSchema(sql, path, table) {
+  dumpSchema(path, table) {
     const mysqlDump = args => Effect.gen(function* (_) {
+      const sql = yield* _Client.MysqlClient;
       const dump = yield* _(Command.make("mysqldump", ...(sql.config.username ? ["-u", sql.config.username] : []), ...(sql.config.database ? [sql.config.database] : []), "--skip-comments", "--compact", ...args), Command.env({
         PATH: globalThis.process?.env.PATH,
         MYSQL_HOST: sql.config.host,

package/dist/cjs/Migrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"Migrator.js","names":["Command","_interopRequireWildcard","require","_FileSystem","_Path","Migrator","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","Effect","Layer","Secret","Client","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","n","__proto__","a","getOwnPropertyDescriptor","u","i","set","run","make","getClient","MysqlClient","ensureTable","sql","table","lockTable","dumpSchema","path","mysqlDump","args","gen","_","dump","config","username","database","env","PATH","globalThis","process","MYSQL_HOST","host","MYSQL_TCP_PORT","port","toString","MYSQL_PWD","password","value","undefined","string","replace","trim","pipe","mapError","error","MigrationError","reason","message","dumpMigrations","dumpAll","map","all","concurrency","schema","migrations","dumpFile","file","fs","FileSystem","Path","makeDirectory","dirname","recursive","writeFileString","layer","options","effectDiscard"],"sources":["../../src/Migrator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Migrator.js","names":["Command","_interopRequireWildcard","require","_FileSystem","_Path","Migrator","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","Effect","Layer","Secret","_Client","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","n","__proto__","a","getOwnPropertyDescriptor","u","i","set","run","make","dumpSchema","path","table","mysqlDump","args","gen","_","sql","MysqlClient","dump","config","username","database","env","PATH","globalThis","process","MYSQL_HOST","host","MYSQL_TCP_PORT","port","toString","MYSQL_PWD","password","value","undefined","string","replace","trim","pipe","mapError","error","MigrationError","reason","message","dumpMigrations","dumpAll","map","all","concurrency","schema","migrations","dumpFile","file","fs","FileSystem","Path","makeDirectory","dirname","recursive","writeFileString","layer","options","effectDiscard"],"sources":["../../src/Migrator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/index.js

@@ -3,19 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.statement = exports.schema = exports.resolver = exports.migrator = exports.error = exports.client = void 0;
+exports.migrator = exports.client = void 0;
 var _client = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("./Client.js"));
 exports.client = _client;
-var _error = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Error"));
-exports.error = _error;
 var _migrator = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("./Migrator.js"));
 exports.migrator = _migrator;
-var _resolver = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Resolver"));
-exports.resolver = _resolver;
-var _schema = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Schema"));
-exports.schema = _schema;
-var _statement = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Statement"));
-exports.statement = _statement;
 function _getRequireWildcardCache(e) {
   if ("function" != typeof WeakMap) return null;
   var r = new WeakMap(),

package/dist/dts/Client.d.ts

@@ -12,11 +12,22 @@ import * as Layer from "effect/Layer";
 import type { Scope } from "effect/Scope";
 import * as Secret from "effect/Secret";
 import * as Mysql from "mysql2";
+/**
+ * @category type ids
+ * @since 1.0.0
+ */
+export declare const TypeId: unique symbol;
+/**
+ * @category type ids
+ * @since 1.0.0
+ */
+export type TypeId = typeof TypeId;
 /**
  * @category models
  * @since 1.0.0
  */
 export interface MysqlClient extends Client.Client {
+    readonly [TypeId]: TypeId;
     readonly config: MysqlClientConfig;
 }
 /**
@@ -53,7 +64,7 @@ export declare const make: (options: MysqlClientConfig) => Effect.Effect<MysqlCl
  * @category layers
  * @since 1.0.0
  */
-export declare const layer: (config: Config.Config.Wrap<MysqlClientConfig>) => Layer.Layer<MysqlClient, ConfigError>;
+export declare const layer: (config: Config.Config.Wrap<MysqlClientConfig>) => Layer.Layer<MysqlClient | Client.Client, ConfigError>;
 /**
  * @category compiler
  * @since 1.0.0

package/dist/dts/Client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Client.d.ts","sourceRoot":"","sources":["../../src/Client.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAA;AAG5C,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA;AAGlD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,QAAQ,CAAA;AAE/B;;;GAGG;AACH,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,MAAM;IAChD,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAA;CACnC;AAED;;;GAGG;AACH,eAAO,MAAM,WAAW,uCAA8D,CAAA;AAEtF;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,CAAA;IAE5B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAA;IAEjC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAChC,QAAQ,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAA;IAE/C,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,WAAW,CAAA;IAEvC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAA;IACvD,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAA;CACvD;AAID;;;GAGG;AACH,eAAO,MAAM,IAAI,YACN,iBAAiB,KACzB,OAAO,MAAM,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,CAwHtC,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,CAClB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAC1C,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,WAAW,CAEkC,CAAA;AAE3E;;;GAGG;AACH,eAAO,MAAM,YAAY,eAAgB,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,uBAM1D,CAAA"}
+{"version":3,"file":"Client.d.ts","sourceRoot":"","sources":["../../src/Client.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAA;AAG5C,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA;AAGlD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,QAAQ,CAAA;AAE/B;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,OAAO,MAAgD,CAAA;AAE5E;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAA;AAElC;;;GAGG;AACH,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,MAAM;IAChD,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAA;CACnC;AAED;;;GAGG;AACH,eAAO,MAAM,WAAW,uCAA+D,CAAA;AAEvF;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,CAAA;IAE5B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAA;IAEjC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAChC,QAAQ,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAA;IAE/C,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,WAAW,CAAA;IAEvC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAA;IACvD,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAA;CACvD;AAED;;;GAGG;AACH,eAAO,MAAM,IAAI,YACN,iBAAiB,KACzB,OAAO,MAAM,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,CAuHtC,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,KAAK,WACR,OAAO,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAC5C,MAAM,KAAK,CAAC,WAAW,GAAG,OAAO,MAAM,EAAE,WAAW,CAUpD,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,YAAY,eAAgB,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,uBAiB1D,CAAA"}

package/dist/dts/Migrator.d.ts

@@ -1,11 +1,12 @@
 import type { CommandExecutor } from "@effect/platform/CommandExecutor";
 import { FileSystem } from "@effect/platform/FileSystem";
 import { Path } from "@effect/platform/Path";
+import type * as Client from "@effect/sql/Client";
 import type { SqlError } from "@effect/sql/Error";
 import * as Migrator from "@effect/sql/Migrator";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as Client from "./Client.js";
+import { MysqlClient } from "./Client.js";
 /**
  * @since 1.0.0
  */
@@ -14,10 +15,10 @@ export * from "@effect/sql/Migrator";
  * @category constructor
  * @since 1.0.0
  */
-export declare const run: <R>(options: Migrator.MigratorOptions<R>) => Effect.Effect<ReadonlyArray<readonly [id: number, name: string]>, SqlError | Migrator.MigrationError, Client.MysqlClient | R | FileSystem | Path | CommandExecutor>;
+export declare const run: <R2 = never>(options: Migrator.MigratorOptions<R2>) => Effect.Effect<ReadonlyArray<readonly [id: number, name: string]>, Migrator.MigrationError | SqlError, FileSystem | Path | MysqlClient | Client.Client | CommandExecutor | R2>;
 /**
  * @category layers
  * @since 1.0.0
  */
-export declare const layer: <R>(options: Migrator.MigratorOptions<R>) => Layer.Layer<never, SqlError | Migrator.MigrationError, Client.MysqlClient | FileSystem | Path | CommandExecutor | R>;
+export declare const layer: <R>(options: Migrator.MigratorOptions<R>) => Layer.Layer<never, Migrator.MigrationError | SqlError, MysqlClient | Client.Client | CommandExecutor | FileSystem | Path | R>;
 //# sourceMappingURL=Migrator.d.ts.map

package/dist/dts/Migrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Migrator.d.ts","sourceRoot":"","sources":["../../src/Migrator.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,QAAQ,MAAM,sBAAsB,CAAA;AAChD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;GAEG;AACH,cAAc,sBAAsB,CAAA;AAEpC;;;GAGG;AACH,eAAO,MAAM,GAAG,EAAE,CAAC,CAAC,EAClB,OAAO,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,KACjC,MAAM,CAAC,MAAM,CAChB,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAClD,QAAQ,GAAG,QAAQ,CAAC,cAAc,EAClC,MAAM,CAAC,WAAW,GAAG,CAAC,GAAG,UAAU,GAAG,IAAI,GAAG,eAAe,CAkE5D,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,KAAK,eACP,SAAS,eAAe,CAAC,CAAC,CAAC,KACnC,MAAM,KAAK,CACZ,KAAK,EACL,QAAQ,GAAG,SAAS,cAAc,EAClC,OAAO,WAAW,GAAG,UAAU,GAAG,IAAI,GAAG,eAAe,GAAG,CAAC,CACxB,CAAA"}
+{"version":3,"file":"Migrator.d.ts","sourceRoot":"","sources":["../../src/Migrator.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,KAAK,KAAK,MAAM,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,QAAQ,MAAM,sBAAsB,CAAA;AAChD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAEzC;;GAEG;AACH,cAAc,sBAAsB,CAAA;AAEpC;;;GAGG;AACH,eAAO,MAAM,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,EAC3B,OAAO,EAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,KAClC,MAAM,CAAC,MAAM,CAChB,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAClD,QAAQ,CAAC,cAAc,GAAG,QAAQ,EAClC,UAAU,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,CAAC,MAAM,GAAG,eAAe,GAAG,EAAE,CAuDtE,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,KAAK,eACP,SAAS,eAAe,CAAC,CAAC,CAAC,KACnC,MAAM,KAAK,CACZ,KAAK,EACL,SAAS,cAAc,GAAG,QAAQ,EAClC,WAAW,GAAG,OAAO,MAAM,GAAG,eAAe,GAAG,UAAU,GAAG,IAAI,GAAG,CAAC,CACjC,CAAA"}

package/dist/dts/index.d.ts

@@ -5,24 +5,8 @@
  * @since 1.0.0
  */
 export * as client from "./Client.js";
-/**
- * @since 1.0.0
- */
-export * as error from "@effect/sql/Error";
 /**
  * @since 1.0.0
  */
 export * as migrator from "./Migrator.js";
-/**
- * @since 1.0.0
- */
-export * as resolver from "@effect/sql/Resolver";
-/**
- * @since 1.0.0
- */
-export * as schema from "@effect/sql/Schema";
-/**
- * @since 1.0.0
- */
-export * as statement from "@effect/sql/Statement";
 //# sourceMappingURL=index.d.ts.map

package/dist/dts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAA;AAE1C;;GAEG;AACH,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AAEzC;;GAEG;AACH,OAAO,KAAK,QAAQ,MAAM,sBAAsB,CAAA;AAEhD;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAA;AAE5C;;GAEG;AACH,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;GAEG;AACH,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA"}

package/dist/esm/Client.js

@@ -14,19 +14,23 @@ import * as Layer from "effect/Layer";
 import * as Secret from "effect/Secret";
 import * as Stream from "effect/Stream";
 import * as Mysql from "mysql2";
+/**
+ * @category type ids
+ * @since 1.0.0
+ */
+export const TypeId = /*#__PURE__*/Symbol.for("@effect/sql-mysql2/Client");
 /**
  * @category tags
  * @since 1.0.0
  */
-export const MysqlClient = /*#__PURE__*/Context.GenericTag("sqlfx/mysql2/MysqlClient");
-const escape = /*#__PURE__*/Statement.defaultEscape("`");
+export const MysqlClient = /*#__PURE__*/Context.GenericTag("@effect/sql-mysql2/Client");
 /**
  * @category constructors
  * @since 1.0.0
  */
 export const make = options => Effect.gen(function* (_) {
   const compiler = makeCompiler(options.transformQueryNames);
-  const transformRows = Client.defaultTransforms(options.transformResultNames).array;
+  const transformRows = Statement.defaultTransforms(options.transformResultNames).array;
   class ConnectionImpl {
     conn;
     constructor(conn) {
@@ -104,6 +108,7 @@ export const make = options => Effect.gen(function* (_) {
     compiler,
     spanAttributes
   }), {
+    [TypeId]: TypeId,
     config: options
   });
 });
@@ -111,17 +116,27 @@ export const make = options => Effect.gen(function* (_) {
  * @category layers
  * @since 1.0.0
  */
-export const layer = config => Layer.scoped(MysqlClient, Effect.flatMap(Config.unwrap(config), make));
+export const layer = config => Layer.scopedContext(Config.unwrap(config).pipe(Effect.flatMap(make), Effect.map(client => Context.make(MysqlClient, client).pipe(Context.add(Client.Client, client)))));
 /**
  * @category compiler
  * @since 1.0.0
  */
 export const makeCompiler = transform => Statement.makeCompiler({
-  placeholder: _ => `?`,
-  onIdentifier: transform ? _ => escape(transform(_)) : escape,
-  onCustom: () => ["", []],
-  onRecordUpdate: () => ["", []]
+  dialect: "mysql",
+  placeholder(_) {
+    return `?`;
+  },
+  onIdentifier: transform ? function (value, withoutTransform) {
+    return withoutTransform ? escape(value) : escape(transform(value));
+  } : escape,
+  onCustom() {
+    return ["", []];
+  },
+  onRecordUpdate() {
+    return ["", []];
+  }
 });
+const escape = /*#__PURE__*/Statement.defaultEscape("`");
 function queryStream(conn, sql, params) {
   return asyncPauseResume(emit => {
     const query = conn.query(sql, params).stream();

package/dist/esm/Client.js.map

@@ -1 +1 @@
-{"version":3,"file":"Client.js","names":["Client","SqlError","Statement","asyncPauseResume","Chunk","Config","Context","Duration","Effect","Layer","Secret","Stream","Mysql","MysqlClient","GenericTag","escape","defaultEscape","make","options","gen","_","compiler","makeCompiler","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","ConnectionImpl","conn","constructor","run","sql","values","transform","rowsAsArray","method","async","resume","error","results","_fields","fail","succeed","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","push","Object","assign","acquirer","config","layer","scoped","flatMap","unwrap","placeholder","onIdentifier","onCustom","onRecordUpdate","emit","query","buffer","taskPending","on","row","queueMicrotask","items","onInterrupt","destroy","onPause","pause","onResume"],"sources":["../../src/Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Client.js","names":["Client","SqlError","Statement","asyncPauseResume","Chunk","Config","Context","Duration","Effect","Layer","Secret","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","error","results","_fields","fail","succeed","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","push","Object","assign","acquirer","config","layer","scopedContext","unwrap","pipe","flatMap","client","add","dialect","placeholder","onIdentifier","withoutTransform","escape","onCustom","onRecordUpdate","defaultEscape","emit","query","buffer","taskPending","on","row","queueMicrotask","items","onInterrupt","destroy","onPause","pause","onResume"],"sources":["../../src/Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/Migrator.js

@@ -8,7 +8,7 @@ import * as Migrator from "@effect/sql/Migrator";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Secret from "effect/Secret";
-import * as Client from "./Client.js";
+import { MysqlClient } from "./Client.js";
 /**
  * @since 1.0.0
  */
@@ -18,20 +18,9 @@ export * from "@effect/sql/Migrator";
  * @since 1.0.0
  */
 export const run = /*#__PURE__*/Migrator.make({
-  getClient: Client.MysqlClient,
-  ensureTable(sql, table) {
-    return sql`CREATE TABLE IF NOT EXISTS ${sql(table)} (
-      migration_id INTEGER UNSIGNED NOT NULL,
-      created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-      name VARCHAR(255) NOT NULL,
-      PRIMARY KEY (migration_id)
-    )`;
-  },
-  lockTable(sql, table) {
-    return sql`LOCK TABLE ${sql(table)} IN ACCESS EXCLUSIVE MODE`;
-  },
-  dumpSchema(sql, path, table) {
+  dumpSchema(path, table) {
     const mysqlDump = args => Effect.gen(function* (_) {
+      const sql = yield* MysqlClient;
       const dump = yield* _(Command.make("mysqldump", ...(sql.config.username ? ["-u", sql.config.username] : []), ...(sql.config.database ? [sql.config.database] : []), "--skip-comments", "--compact", ...args), Command.env({
         PATH: globalThis.process?.env.PATH,
         MYSQL_HOST: sql.config.host,

package/dist/esm/Migrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"Migrator.js","names":["Command","FileSystem","Path","Migrator","Effect","Layer","Secret","Client","run","make","getClient","MysqlClient","ensureTable","sql","table","lockTable","dumpSchema","path","mysqlDump","args","gen","_","dump","config","username","database","env","PATH","globalThis","process","MYSQL_HOST","host","MYSQL_TCP_PORT","port","toString","MYSQL_PWD","password","value","undefined","string","replace","trim","pipe","mapError","error","MigrationError","reason","message","dumpMigrations","dumpAll","map","all","concurrency","schema","migrations","dumpFile","file","fs","makeDirectory","dirname","recursive","writeFileString","layer","options","effectDiscard"],"sources":["../../src/Migrator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Migrator.js","names":["Command","FileSystem","Path","Migrator","Effect","Layer","Secret","MysqlClient","run","make","dumpSchema","path","table","mysqlDump","args","gen","_","sql","dump","config","username","database","env","PATH","globalThis","process","MYSQL_HOST","host","MYSQL_TCP_PORT","port","toString","MYSQL_PWD","password","value","undefined","string","replace","trim","pipe","mapError","error","MigrationError","reason","message","dumpMigrations","dumpAll","map","all","concurrency","schema","migrations","dumpFile","file","fs","makeDirectory","dirname","recursive","writeFileString","layer","options","effectDiscard"],"sources":["../../src/Migrator.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,OAAO,MAAM,0BAA0B;AAEnD,SAASC,UAAU,QAAQ,6BAA6B;AACxD,SAASC,IAAI,QAAQ,uBAAuB;AAG5C,OAAO,KAAKC,QAAQ,MAAM,sBAAsB;AAChD,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,SAASC,WAAW,QAAQ,aAAa;AAEzC;;;AAGA,cAAc,sBAAsB;AAEpC;;;;AAIA,OAAO,MAAMC,GAAG,gBAMZL,QAAQ,CAACM,IAAI,CAAC;EAChBC,UAAUA,CAACC,IAAI,EAAEC,KAAK;IACpB,MAAMC,SAAS,GAAIC,IAAmB,IACpCV,MAAM,CAACW,GAAG,CAAC,WAAUC,CAAC;MACpB,MAAMC,GAAG,GAAG,OAAOV,WAAW;MAC9B,MAAMW,IAAI,GAAG,OAAOF,CAAC,CACnBhB,OAAO,CAACS,IAAI,CACV,WAAW,EACX,IAAIQ,GAAG,CAACE,MAAM,CAACC,QAAQ,GAAG,CAAC,IAAI,EAAEH,GAAG,CAACE,MAAM,CAACC,QAAQ,CAAC,GAAG,EAAE,CAAC,EAC3D,IAAIH,GAAG,CAACE,MAAM,CAACE,QAAQ,GAAG,CAACJ,GAAG,CAACE,MAAM,CAACE,QAAQ,CAAC,GAAG,EAAE,CAAC,EACrD,iBAAiB,EACjB,WAAW,EACX,GAAGP,IAAI,CACR,EACDd,OAAO,CAACsB,GAAG,CAAC;QACVC,IAAI,EAAGC,UAAkB,CAACC,OAAO,EAAEH,GAAG,CAACC,IAAI;QAC3CG,UAAU,EAAET,GAAG,CAACE,MAAM,CAACQ,IAAI;QAC3BC,cAAc,EAAEX,GAAG,CAACE,MAAM,CAACU,IAAI,EAAEC,QAAQ,EAAE;QAC3CC,SAAS,EAAEd,GAAG,CAACE,MAAM,CAACa,QAAQ,GAC1B1B,MAAM,CAAC2B,KAAK,CAAChB,GAAG,CAACE,MAAM,CAACa,QAAQ,CAAC,GACjCE;OACL,CAAC,EACFlC,OAAO,CAACmC,MAAM,CACf;MAED,OAAOjB,IAAI,CAACkB,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAClCA,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAC3BC,IAAI,EAAE;IACX,CAAC,CAAC,CAACC,IAAI,CACLlC,MAAM,CAACmC,QAAQ,CAAEC,KAAK,IAAK,IAAIrC,QAAQ,CAACsC,cAAc,CAAC;MAAEC,MAAM,EAAE,QAAQ;MAAEC,OAAO,EAAEH,KAAK,CAACG;IAAO,CAAE,CAAC,CAAC,CACtG;IAEH,MAAMjC,UAAU,GAAGG,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC;IAE3C,MAAM+B,cAAc,GAAG/B,SAAS,CAAC,CAAC,kBAAkB,EAAE,UAAU,EAAED,KAAK,CAAC,CAAC;IAEzE,MAAMiC,OAAO,GAAGzC,MAAM,CAAC0C,GAAG,CACxB1C,MAAM,CAAC2C,GAAG,CAAC,CAACrC,UAAU,EAAEkC,cAAc,CAAC,EAAE;MAAEI,WAAW,EAAE;IAAC,CAAE,CAAC,EAC5D,CAAC,CAACC,MAAM,EAAEC,UAAU,CAAC,KAAKD,MAAM,GAAG,MAAM,GAAGC,UAAU,CACvD;IAED,MAAMC,QAAQ,GAAIC,IAAY,IAC5BhD,MAAM,CAACW,GAAG,CAAC,WAAUC,CAAC;MACpB,MAAMqC,EAAE,GAAG,OAAOrC,CAAC,CAACf,UAAU,CAAC;MAC/B,MAAMU,IAAI,GAAG,OAAOK,CAAC,CAACd,IAAI,CAAC;MAC3B,MAAMgB,IAAI,GAAG,OAAOF,CAAC,CAAC6B,OAAO,CAAC;MAC9B,OAAO7B,CAAC,CAACqC,EAAE,CAACC,aAAa,CAAC3C,IAAI,CAAC4C,OAAO,CAACH,IAAI,CAAC,EAAE;QAAEI,SAAS,EAAE;MAAI,CAAE,CAAC,CAAC;MACnE,OAAOxC,CAAC,CAACqC,EAAE,CAACI,eAAe,CAACL,IAAI,EAAElC,IAAI,CAAC,CAAC;IAC1C,CAAC,CAAC,CAACoB,IAAI,CACLlC,MAAM,CAACmC,QAAQ,CAAEC,KAAK,IAAK,IAAIrC,QAAQ,CAACsC,cAAc,CAAC;MAAEC,MAAM,EAAE,QAAQ;MAAEC,OAAO,EAAEH,KAAK,CAACG;IAAO,CAAE,CAAC,CAAC,CACtG;IAEH,OAAOQ,QAAQ,CAACxC,IAAI,CAAC;EACvB;CACD,CAAC;AAEF;;;;AAIA,OAAO,MAAM+C,KAAK,GAChBC,OAAoC,IAKjCtD,KAAK,CAACuD,aAAa,CAACpD,GAAG,CAACmD,OAAO,CAAC,CAAC","ignoreList":[]}

package/dist/esm/index.js

@@ -5,24 +5,8 @@
  * @since 1.0.0
  */
 export * as client from "./Client.js";
-/**
- * @since 1.0.0
- */
-export * as error from "@effect/sql/Error";
 /**
  * @since 1.0.0
  */
 export * as migrator from "./Migrator.js";
-/**
- * @since 1.0.0
- */
-export * as resolver from "@effect/sql/Resolver";
-/**
- * @since 1.0.0
- */
-export * as schema from "@effect/sql/Schema";
-/**
- * @since 1.0.0
- */
-export * as statement from "@effect/sql/Statement";
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["client","error","migrator","resolver","schema","statement"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAIA;;;AAGA,OAAO,KAAKA,MAAM,MAAM,aAAa;AAErC;;;AAGA,OAAO,KAAKC,KAAK,MAAM,mBAAmB;AAE1C;;;AAGA,OAAO,KAAKC,QAAQ,MAAM,eAAe;AAEzC;;;AAGA,OAAO,KAAKC,QAAQ,MAAM,sBAAsB;AAEhD;;;AAGA,OAAO,KAAKC,MAAM,MAAM,oBAAoB;AAE5C;;;AAGA,OAAO,KAAKC,SAAS,MAAM,uBAAuB","ignoreList":[]}
+{"version":3,"file":"index.js","names":["client","migrator"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAIA;;;AAGA,OAAO,KAAKA,MAAM,MAAM,aAAa;AAErC;;;AAGA,OAAO,KAAKC,QAAQ,MAAM,eAAe","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/sql-mysql2",
-  "version": "0.1.17",
+  "version": "0.2.0",
   "description": "A MySQL toolkit for Effect",
   "license": "MIT",
   "repository": {
@@ -14,7 +14,7 @@
   },
   "peerDependencies": {
     "@effect/platform": "^0.52.2",
-    "@effect/sql": "^0.1.17",
+    "@effect/sql": "^0.2.0",
     "effect": "^3.1.2"
   },
   "publishConfig": {

package/src/Client.ts

@@ -18,11 +18,24 @@ import * as Secret from "effect/Secret"
 import * as Stream from "effect/Stream"
 import * as Mysql from "mysql2"
 
+/**
+ * @category type ids
+ * @since 1.0.0
+ */
+export const TypeId: unique symbol = Symbol.for("@effect/sql-mysql2/Client")
+
+/**
+ * @category type ids
+ * @since 1.0.0
+ */
+export type TypeId = typeof TypeId
+
 /**
  * @category models
  * @since 1.0.0
  */
 export interface MysqlClient extends Client.Client {
+  readonly [TypeId]: TypeId
   readonly config: MysqlClientConfig
 }
 
@@ -30,7 +43,7 @@ export interface MysqlClient extends Client.Client {
  * @category tags
  * @since 1.0.0
  */
-export const MysqlClient = Context.GenericTag<MysqlClient>("sqlfx/mysql2/MysqlClient")
+export const MysqlClient = Context.GenericTag<MysqlClient>("@effect/sql-mysql2/Client")
 
 /**
  * @category models
@@ -57,8 +70,6 @@ export interface MysqlClientConfig {
   readonly transformQueryNames?: (str: string) => string
 }
 
-const escape = Statement.defaultEscape("`")
-
 /**
  * @category constructors
  * @since 1.0.0
@@ -68,8 +79,7 @@ export const make = (
 ): Effect.Effect<MysqlClient, never, Scope> =>
   Effect.gen(function*(_) {
     const compiler = makeCompiler(options.transformQueryNames)
-
-    const transformRows = Client.defaultTransforms(
+    const transformRows = Statement.defaultTransforms(
       options.transformResultNames!
     ).array
 
@@ -183,7 +193,7 @@ export const make = (
         compiler,
         spanAttributes
       }),
-      { config: options }
+      { [TypeId]: TypeId as TypeId, config: options }
     )
   })
 
@@ -191,11 +201,19 @@ export const make = (
  * @category layers
  * @since 1.0.0
  */
-export const layer: (
-  config: Config.Config.Wrap<MysqlClientConfig>
-) => Layer.Layer<MysqlClient, ConfigError> = (
+export const layer = (
   config: Config.Config.Wrap<MysqlClientConfig>
-) => Layer.scoped(MysqlClient, Effect.flatMap(Config.unwrap(config), make))
+): Layer.Layer<MysqlClient | Client.Client, ConfigError> =>
+  Layer.scopedContext(
+    Config.unwrap(config).pipe(
+      Effect.flatMap(make),
+      Effect.map((client) =>
+        Context.make(MysqlClient, client).pipe(
+          Context.add(Client.Client, client)
+        )
+      )
+    )
+  )
 
 /**
  * @category compiler
@@ -203,12 +221,25 @@ export const layer: (
  */
 export const makeCompiler = (transform?: (_: string) => string) =>
   Statement.makeCompiler({
-    placeholder: (_) => `?`,
-    onIdentifier: transform ? (_) => escape(transform(_)) : escape,
-    onCustom: () => ["", []],
-    onRecordUpdate: () => ["", []]
+    dialect: "mysql",
+    placeholder(_) {
+      return `?`
+    },
+    onIdentifier: transform ?
+      function(value, withoutTransform) {
+        return withoutTransform ? escape(value) : escape(transform(value))
+      } :
+      escape,
+    onCustom() {
+      return ["", []]
+    },
+    onRecordUpdate() {
+      return ["", []]
+    }
   })
 
+const escape = Statement.defaultEscape("`")
+
 function queryStream(
   conn: Mysql.PoolConnection,
   sql: string,

package/src/Migrator.ts

@@ -5,12 +5,13 @@ import * as Command from "@effect/platform/Command"
 import type { CommandExecutor } from "@effect/platform/CommandExecutor"
 import { FileSystem } from "@effect/platform/FileSystem"
 import { Path } from "@effect/platform/Path"
+import type * as Client from "@effect/sql/Client"
 import type { SqlError } from "@effect/sql/Error"
 import * as Migrator from "@effect/sql/Migrator"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
 import * as Secret from "effect/Secret"
-import * as Client from "./Client.js"
+import { MysqlClient } from "./Client.js"
 
 /**
  * @since 1.0.0
@@ -21,28 +22,17 @@ export * from "@effect/sql/Migrator"
  * @category constructor
  * @since 1.0.0
  */
-export const run: <R>(
-  options: Migrator.MigratorOptions<R>
+export const run: <R2 = never>(
+  options: Migrator.MigratorOptions<R2>
 ) => Effect.Effect<
   ReadonlyArray<readonly [id: number, name: string]>,
-  SqlError | Migrator.MigrationError,
-  Client.MysqlClient | R | FileSystem | Path | CommandExecutor
+  Migrator.MigrationError | SqlError,
+  FileSystem | Path | MysqlClient | Client.Client | CommandExecutor | R2
 > = Migrator.make({
-  getClient: Client.MysqlClient,
-  ensureTable(sql, table) {
-    return sql`CREATE TABLE IF NOT EXISTS ${sql(table)} (
-      migration_id INTEGER UNSIGNED NOT NULL,
-      created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-      name VARCHAR(255) NOT NULL,
-      PRIMARY KEY (migration_id)
-    )`
-  },
-  lockTable(sql, table) {
-    return sql`LOCK TABLE ${sql(table)} IN ACCESS EXCLUSIVE MODE`
-  },
-  dumpSchema(sql, path, table) {
+  dumpSchema(path, table) {
     const mysqlDump = (args: Array<string>) =>
       Effect.gen(function*(_) {
+        const sql = yield* MysqlClient
         const dump = yield* _(
           Command.make(
             "mysqldump",
@@ -102,6 +92,6 @@ export const layer = <R>(
   options: Migrator.MigratorOptions<R>
 ): Layer.Layer<
   never,
-  SqlError | Migrator.MigrationError,
-  Client.MysqlClient | FileSystem | Path | CommandExecutor | R
+  Migrator.MigrationError | SqlError,
+  MysqlClient | Client.Client | CommandExecutor | FileSystem | Path | R
 > => Layer.effectDiscard(run(options))

package/src/index.ts

@@ -7,27 +7,7 @@
  */
 export * as client from "./Client.js"
 
-/**
- * @since 1.0.0
- */
-export * as error from "@effect/sql/Error"
-
 /**
  * @since 1.0.0
  */
 export * as migrator from "./Migrator.js"
-
-/**
- * @since 1.0.0
- */
-export * as resolver from "@effect/sql/Resolver"
-
-/**
- * @since 1.0.0
- */
-export * as schema from "@effect/sql/Schema"
-
-/**
- * @since 1.0.0
- */
-export * as statement from "@effect/sql/Statement"