@effect/sql-mysql2 0.42.0 → 0.43.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 +3 -3
- package/dist/cjs/MysqlClient.js.map +1 -1
- package/dist/cjs/MysqlMigrator.js +2 -5
- package/dist/cjs/MysqlMigrator.js.map +1 -1
- package/dist/dts/MysqlMigrator.d.ts.map +1 -1
- package/dist/esm/MysqlClient.js +3 -3
- package/dist/esm/MysqlClient.js.map +1 -1
- package/dist/esm/MysqlMigrator.js +2 -5
- package/dist/esm/MysqlMigrator.js.map +1 -1
- package/package.json +5 -5
- package/src/MysqlClient.ts +5 -5
- package/src/MysqlMigrator.ts +4 -6
package/dist/cjs/MysqlClient.js
CHANGED
|
@@ -9,7 +9,7 @@ var Client = _interopRequireWildcard(require("@effect/sql/SqlClient"));
|
|
|
9
9
|
var _SqlError = require("@effect/sql/SqlError");
|
|
10
10
|
var _SqlStream = require("@effect/sql/SqlStream");
|
|
11
11
|
var Statement = _interopRequireWildcard(require("@effect/sql/Statement"));
|
|
12
|
-
var
|
|
12
|
+
var OtelSemConv = _interopRequireWildcard(require("@opentelemetry/semantic-conventions"));
|
|
13
13
|
var Chunk = _interopRequireWildcard(require("effect/Chunk"));
|
|
14
14
|
var Config = _interopRequireWildcard(require("effect/Config"));
|
|
15
15
|
var Context = _interopRequireWildcard(require("effect/Context"));
|
|
@@ -138,9 +138,9 @@ const make = options => Effect.gen(function* () {
|
|
|
138
138
|
});
|
|
139
139
|
}), conn => Effect.sync(() => conn.release()));
|
|
140
140
|
const transactionAcquirer = Effect.map(acquireConn, conn => new ConnectionImpl(conn));
|
|
141
|
-
const spanAttributes = [...(options.spanAttributes ? Object.entries(options.spanAttributes) : []), [
|
|
141
|
+
const spanAttributes = [...(options.spanAttributes ? Object.entries(options.spanAttributes) : []), [OtelSemConv.ATTR_DB_SYSTEM_NAME, OtelSemConv.DB_SYSTEM_NAME_VALUE_MYSQL], [OtelSemConv.ATTR_SERVER_ADDRESS, options.host ?? "localhost"], [OtelSemConv.ATTR_SERVER_PORT, options.port ?? 3306]];
|
|
142
142
|
if (options.database) {
|
|
143
|
-
spanAttributes.push([
|
|
143
|
+
spanAttributes.push([OtelSemConv.ATTR_DB_NAMESPACE, options.database]);
|
|
144
144
|
}
|
|
145
145
|
return Object.assign(yield* Client.make({
|
|
146
146
|
acquirer: Effect.succeed(poolConnection),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MysqlClient.js","names":["Reactivity","_interopRequireWildcard","require","Client","_SqlError","_SqlStream","Statement","Otel","Chunk","Config","Context","Duration","Effect","Layer","Redacted","Stream","Mysql","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","TypeId","exports","Symbol","for","MysqlClient","GenericTag","make","options","gen","compiler","makeCompiler","transformQueryNames","transformRows","transformResultNames","defaultTransforms","array","undefined","ConnectionImpl","conn","constructor","runRaw","sql","values","rowsAsArray","method","async","resume","cause","results","_fields","fail","SqlError","message","succeed","run","pipe","map","Array","isArray","execute","params","executeRaw","executeValues","executeUnprepared","executeStream","stream","queryStream","mapChunks","_","unsafeFromArray","toReadonlyArray","pool","url","createPool","uri","value","multipleStatements","supportBigNumbers","connectionLimit","maxConnections","idleTimeout","connectionTTL","toMillis","poolConfig","host","port","database","user","username","password","acquireRelease","query","void","end","timeoutFail","duration","seconds","onTimeout","Error","poolConnection","acquireConn","getConnection","sync","release","transactionAcquirer","spanAttributes","entries","SEMATTRS_DB_SYSTEM","DBSYSTEMVALUES_MYSQL","push","SEMATTRS_DB_NAME","assign","acquirer","config","layerConfig","scopedContext","unwrap","flatMap","client","add","SqlClient","provide","layer","transform","dialect","placeholder","onIdentifier","withoutTransform","escape","onCustom","onRecordUpdate","defaultEscape","asyncPauseResume","emit","buffer","taskPending","on","row","queueMicrotask","items","onInterrupt","destroy","onPause","pause","onResume"],"sources":["../../src/MysqlClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"MysqlClient.js","names":["Reactivity","_interopRequireWildcard","require","Client","_SqlError","_SqlStream","Statement","OtelSemConv","Chunk","Config","Context","Duration","Effect","Layer","Redacted","Stream","Mysql","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","TypeId","exports","Symbol","for","MysqlClient","GenericTag","make","options","gen","compiler","makeCompiler","transformQueryNames","transformRows","transformResultNames","defaultTransforms","array","undefined","ConnectionImpl","conn","constructor","runRaw","sql","values","rowsAsArray","method","async","resume","cause","results","_fields","fail","SqlError","message","succeed","run","pipe","map","Array","isArray","execute","params","executeRaw","executeValues","executeUnprepared","executeStream","stream","queryStream","mapChunks","_","unsafeFromArray","toReadonlyArray","pool","url","createPool","uri","value","multipleStatements","supportBigNumbers","connectionLimit","maxConnections","idleTimeout","connectionTTL","toMillis","poolConfig","host","port","database","user","username","password","acquireRelease","query","void","end","timeoutFail","duration","seconds","onTimeout","Error","poolConnection","acquireConn","getConnection","sync","release","transactionAcquirer","spanAttributes","entries","ATTR_DB_SYSTEM_NAME","DB_SYSTEM_NAME_VALUE_MYSQL","ATTR_SERVER_ADDRESS","ATTR_SERVER_PORT","push","ATTR_DB_NAMESPACE","assign","acquirer","config","layerConfig","scopedContext","unwrap","flatMap","client","add","SqlClient","provide","layer","transform","dialect","placeholder","onIdentifier","withoutTransform","escape","onCustom","onRecordUpdate","defaultEscape","asyncPauseResume","emit","buffer","taskPending","on","row","queueMicrotask","items","onInterrupt","destroy","onPause","pause","onResume"],"sources":["../../src/MysqlClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -61,11 +61,8 @@ const run = exports.run = /*#__PURE__*/Migrator.make({
|
|
|
61
61
|
dumpSchema(path, table) {
|
|
62
62
|
const mysqlDump = args => Effect.gen(function* () {
|
|
63
63
|
const sql = yield* _MysqlClient.MysqlClient;
|
|
64
|
-
const dump = yield* (0, _Function.pipe)(Command.make("mysqldump", ...(sql.config.username ? ["-u", sql.config.username] : []), ...(sql.config.database ? [sql.config.database] : []), "--skip-comments", "--compact", ...args), Command.env({
|
|
65
|
-
PATH: globalThis.process?.env.PATH
|
|
66
|
-
MYSQL_HOST: sql.config.host,
|
|
67
|
-
MYSQL_TCP_PORT: sql.config.port?.toString(),
|
|
68
|
-
MYSQL_PWD: sql.config.password ? Redacted.value(sql.config.password) : undefined
|
|
64
|
+
const dump = yield* (0, _Function.pipe)(Command.make("mysqldump", ...(sql.config.host ? ["-h", sql.config.host] : []), ...(sql.config.port ? ["-P", sql.config.port.toString()] : []), ...(sql.config.username ? ["-u", sql.config.username] : []), ...(sql.config.password ? [`-p${Redacted.value(sql.config.password)}`] : []), ...(sql.config.database ? [sql.config.database] : []), "--skip-comments", "--compact", ...args), Command.env({
|
|
65
|
+
PATH: globalThis.process?.env.PATH
|
|
69
66
|
}), Command.string);
|
|
70
67
|
return dump.replace(/^\/\*.*$/gm, "").replace(/\n{2,}/gm, "\n\n").trim();
|
|
71
68
|
}).pipe(Effect.mapError(error => new Migrator.MigrationError({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MysqlMigrator.js","names":["Command","_interopRequireWildcard","require","_FileSystem","_Path","Migrator","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","Effect","_Function","Layer","Redacted","_MysqlClient","_FileSystem2","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","set","getOwnPropertyDescriptor","run","make","dumpSchema","path","table","mysqlDump","args","gen","sql","MysqlClient","dump","pipe","config","
|
|
1
|
+
{"version":3,"file":"MysqlMigrator.js","names":["Command","_interopRequireWildcard","require","_FileSystem","_Path","Migrator","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","Effect","_Function","Layer","Redacted","_MysqlClient","_FileSystem2","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","set","getOwnPropertyDescriptor","run","make","dumpSchema","path","table","mysqlDump","args","gen","sql","MysqlClient","dump","pipe","config","host","port","toString","username","password","value","database","env","PATH","globalThis","process","string","replace","trim","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/MysqlMigrator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MysqlMigrator.d.ts","sourceRoot":"","sources":["../../src/MysqlMigrator.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,QAAQ,MAAM,sBAAsB,CAAA;AAChD,OAAO,KAAK,KAAK,MAAM,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C;;GAEG;AACH,cAAc,sBAAsB,CAAA;AAEpC;;GAEG;AACH,cAAc,iCAAiC,CAAA;AAE/C;;;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,SAAS,GAAG,eAAe,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"MysqlMigrator.d.ts","sourceRoot":"","sources":["../../src/MysqlMigrator.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,QAAQ,MAAM,sBAAsB,CAAA;AAChD,OAAO,KAAK,KAAK,MAAM,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C;;GAEG;AACH,cAAc,sBAAsB,CAAA;AAEpC;;GAEG;AACH,cAAc,iCAAiC,CAAA;AAE/C;;;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,SAAS,GAAG,eAAe,GAAG,EAAE,CAqDzE,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,CAAC,EACrB,SAAS,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,KACnC,KAAK,CAAC,KAAK,CACZ,KAAK,EACL,QAAQ,CAAC,cAAc,GAAG,QAAQ,EAClC,WAAW,GAAG,MAAM,CAAC,SAAS,GAAG,eAAe,GAAG,UAAU,GAAG,IAAI,GAAG,CAAC,CACpC,CAAA"}
|
package/dist/esm/MysqlClient.js
CHANGED
|
@@ -6,7 +6,7 @@ import * as Client from "@effect/sql/SqlClient";
|
|
|
6
6
|
import { SqlError } from "@effect/sql/SqlError";
|
|
7
7
|
import { asyncPauseResume } from "@effect/sql/SqlStream";
|
|
8
8
|
import * as Statement from "@effect/sql/Statement";
|
|
9
|
-
import * as
|
|
9
|
+
import * as OtelSemConv from "@opentelemetry/semantic-conventions";
|
|
10
10
|
import * as Chunk from "effect/Chunk";
|
|
11
11
|
import * as Config from "effect/Config";
|
|
12
12
|
import * as Context from "effect/Context";
|
|
@@ -130,9 +130,9 @@ export const make = options => Effect.gen(function* () {
|
|
|
130
130
|
});
|
|
131
131
|
}), conn => Effect.sync(() => conn.release()));
|
|
132
132
|
const transactionAcquirer = Effect.map(acquireConn, conn => new ConnectionImpl(conn));
|
|
133
|
-
const spanAttributes = [...(options.spanAttributes ? Object.entries(options.spanAttributes) : []), [
|
|
133
|
+
const spanAttributes = [...(options.spanAttributes ? Object.entries(options.spanAttributes) : []), [OtelSemConv.ATTR_DB_SYSTEM_NAME, OtelSemConv.DB_SYSTEM_NAME_VALUE_MYSQL], [OtelSemConv.ATTR_SERVER_ADDRESS, options.host ?? "localhost"], [OtelSemConv.ATTR_SERVER_PORT, options.port ?? 3306]];
|
|
134
134
|
if (options.database) {
|
|
135
|
-
spanAttributes.push([
|
|
135
|
+
spanAttributes.push([OtelSemConv.ATTR_DB_NAMESPACE, options.database]);
|
|
136
136
|
}
|
|
137
137
|
return Object.assign(yield* Client.make({
|
|
138
138
|
acquirer: Effect.succeed(poolConnection),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MysqlClient.js","names":["Reactivity","Client","SqlError","asyncPauseResume","Statement","
|
|
1
|
+
{"version":3,"file":"MysqlClient.js","names":["Reactivity","Client","SqlError","asyncPauseResume","Statement","OtelSemConv","Chunk","Config","Context","Duration","Effect","Layer","Redacted","Stream","Mysql","TypeId","Symbol","for","MysqlClient","GenericTag","make","options","gen","compiler","makeCompiler","transformQueryNames","transformRows","transformResultNames","defaultTransforms","array","undefined","ConnectionImpl","conn","constructor","runRaw","sql","values","rowsAsArray","method","async","resume","cause","results","_fields","fail","message","succeed","run","pipe","map","Array","isArray","execute","params","executeRaw","executeValues","executeUnprepared","executeStream","stream","queryStream","mapChunks","_","unsafeFromArray","toReadonlyArray","pool","url","createPool","uri","value","multipleStatements","supportBigNumbers","connectionLimit","maxConnections","idleTimeout","connectionTTL","toMillis","poolConfig","host","port","database","user","username","password","acquireRelease","query","void","end","timeoutFail","duration","seconds","onTimeout","Error","poolConnection","acquireConn","getConnection","sync","release","transactionAcquirer","spanAttributes","Object","entries","ATTR_DB_SYSTEM_NAME","DB_SYSTEM_NAME_VALUE_MYSQL","ATTR_SERVER_ADDRESS","ATTR_SERVER_PORT","push","ATTR_DB_NAMESPACE","assign","acquirer","config","layerConfig","scopedContext","unwrap","flatMap","client","add","SqlClient","provide","layer","transform","dialect","placeholder","onIdentifier","withoutTransform","escape","onCustom","onRecordUpdate","defaultEscape","emit","buffer","taskPending","on","row","queueMicrotask","items","onInterrupt","destroy","onPause","pause","onResume"],"sources":["../../src/MysqlClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -26,11 +26,8 @@ export const run = /*#__PURE__*/Migrator.make({
|
|
|
26
26
|
dumpSchema(path, table) {
|
|
27
27
|
const mysqlDump = args => Effect.gen(function* () {
|
|
28
28
|
const sql = yield* MysqlClient;
|
|
29
|
-
const dump = yield* pipe(Command.make("mysqldump", ...(sql.config.username ? ["-u", sql.config.username] : []), ...(sql.config.database ? [sql.config.database] : []), "--skip-comments", "--compact", ...args), Command.env({
|
|
30
|
-
PATH: globalThis.process?.env.PATH
|
|
31
|
-
MYSQL_HOST: sql.config.host,
|
|
32
|
-
MYSQL_TCP_PORT: sql.config.port?.toString(),
|
|
33
|
-
MYSQL_PWD: sql.config.password ? Redacted.value(sql.config.password) : undefined
|
|
29
|
+
const dump = yield* pipe(Command.make("mysqldump", ...(sql.config.host ? ["-h", sql.config.host] : []), ...(sql.config.port ? ["-P", sql.config.port.toString()] : []), ...(sql.config.username ? ["-u", sql.config.username] : []), ...(sql.config.password ? [`-p${Redacted.value(sql.config.password)}`] : []), ...(sql.config.database ? [sql.config.database] : []), "--skip-comments", "--compact", ...args), Command.env({
|
|
30
|
+
PATH: globalThis.process?.env.PATH
|
|
34
31
|
}), Command.string);
|
|
35
32
|
return dump.replace(/^\/\*.*$/gm, "").replace(/\n{2,}/gm, "\n\n").trim();
|
|
36
33
|
}).pipe(Effect.mapError(error => new Migrator.MigrationError({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MysqlMigrator.js","names":["Command","FileSystem","Path","Migrator","Effect","pipe","Layer","Redacted","MysqlClient","run","make","dumpSchema","path","table","mysqlDump","args","gen","sql","dump","config","
|
|
1
|
+
{"version":3,"file":"MysqlMigrator.js","names":["Command","FileSystem","Path","Migrator","Effect","pipe","Layer","Redacted","MysqlClient","run","make","dumpSchema","path","table","mysqlDump","args","gen","sql","dump","config","host","port","toString","username","password","value","database","env","PATH","globalThis","process","string","replace","trim","mapError","error","MigrationError","reason","message","dumpMigrations","dumpAll","map","all","concurrency","schema","migrations","dumpFile","file","fs","makeDirectory","dirname","recursive","writeFileString","layer","options","effectDiscard"],"sources":["../../src/MysqlMigrator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect/sql-mysql2",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.43.1",
|
|
4
4
|
"description": "A MySQL toolkit for Effect",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -15,10 +15,10 @@
|
|
|
15
15
|
"mysql2": "^3.11.0"
|
|
16
16
|
},
|
|
17
17
|
"peerDependencies": {
|
|
18
|
-
"@effect/
|
|
19
|
-
"
|
|
20
|
-
"@effect/
|
|
21
|
-
"effect": "^
|
|
18
|
+
"@effect/sql": "^0.42.0",
|
|
19
|
+
"effect": "^3.16.16",
|
|
20
|
+
"@effect/experimental": "^0.52.2",
|
|
21
|
+
"@effect/platform": "^0.88.1"
|
|
22
22
|
},
|
|
23
23
|
"publishConfig": {
|
|
24
24
|
"provenance": true
|
package/src/MysqlClient.ts
CHANGED
|
@@ -7,7 +7,7 @@ import type { Connection } from "@effect/sql/SqlConnection"
|
|
|
7
7
|
import { SqlError } from "@effect/sql/SqlError"
|
|
8
8
|
import { asyncPauseResume } from "@effect/sql/SqlStream"
|
|
9
9
|
import * as Statement from "@effect/sql/Statement"
|
|
10
|
-
import * as
|
|
10
|
+
import * as OtelSemConv from "@opentelemetry/semantic-conventions"
|
|
11
11
|
import * as Chunk from "effect/Chunk"
|
|
12
12
|
import * as Config from "effect/Config"
|
|
13
13
|
import type { ConfigError } from "effect/ConfigError"
|
|
@@ -242,13 +242,13 @@ export const make = (
|
|
|
242
242
|
|
|
243
243
|
const spanAttributes: Array<[string, unknown]> = [
|
|
244
244
|
...(options.spanAttributes ? Object.entries(options.spanAttributes) : []),
|
|
245
|
-
[
|
|
246
|
-
[
|
|
247
|
-
[
|
|
245
|
+
[OtelSemConv.ATTR_DB_SYSTEM_NAME, OtelSemConv.DB_SYSTEM_NAME_VALUE_MYSQL],
|
|
246
|
+
[OtelSemConv.ATTR_SERVER_ADDRESS, options.host ?? "localhost"],
|
|
247
|
+
[OtelSemConv.ATTR_SERVER_PORT, options.port ?? 3306]
|
|
248
248
|
]
|
|
249
249
|
|
|
250
250
|
if (options.database) {
|
|
251
|
-
spanAttributes.push([
|
|
251
|
+
spanAttributes.push([OtelSemConv.ATTR_DB_NAMESPACE, options.database])
|
|
252
252
|
}
|
|
253
253
|
|
|
254
254
|
return Object.assign(
|
package/src/MysqlMigrator.ts
CHANGED
|
@@ -42,19 +42,17 @@ export const run: <R2 = never>(
|
|
|
42
42
|
const dump = yield* pipe(
|
|
43
43
|
Command.make(
|
|
44
44
|
"mysqldump",
|
|
45
|
+
...(sql.config.host ? ["-h", sql.config.host] : []),
|
|
46
|
+
...(sql.config.port ? ["-P", sql.config.port.toString()] : []),
|
|
45
47
|
...(sql.config.username ? ["-u", sql.config.username] : []),
|
|
48
|
+
...(sql.config.password ? [`-p${Redacted.value(sql.config.password)}`] : []),
|
|
46
49
|
...(sql.config.database ? [sql.config.database] : []),
|
|
47
50
|
"--skip-comments",
|
|
48
51
|
"--compact",
|
|
49
52
|
...args
|
|
50
53
|
),
|
|
51
54
|
Command.env({
|
|
52
|
-
PATH: (globalThis as any).process?.env.PATH
|
|
53
|
-
MYSQL_HOST: sql.config.host,
|
|
54
|
-
MYSQL_TCP_PORT: sql.config.port?.toString(),
|
|
55
|
-
MYSQL_PWD: sql.config.password
|
|
56
|
-
? Redacted.value(sql.config.password)
|
|
57
|
-
: undefined
|
|
55
|
+
PATH: (globalThis as any).process?.env.PATH
|
|
58
56
|
}),
|
|
59
57
|
Command.string
|
|
60
58
|
)
|