@effect/sql-mysql2 0.1.9 → 0.1.11

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.
@@ -126,10 +126,15 @@ const make = options => Effect.gen(function* (_) {
126
126
  });
127
127
  }), conn => Effect.sync(() => conn.release()));
128
128
  const transactionAcquirer = Effect.map(acquireConn, conn => new ConnectionImpl(conn));
129
+ const spanAttributes = [["db.system", "mysql"], ["server.address", options.host ?? "localhost"], ["server.port", options.port ?? 3306]];
130
+ if (options.database) {
131
+ spanAttributes.push(["db.name", options.database]);
132
+ }
129
133
  return Object.assign(Client.make({
130
134
  acquirer: Effect.succeed(poolConnection),
131
135
  transactionAcquirer,
132
- compiler
136
+ compiler,
137
+ spanAttributes
133
138
  }), {
134
139
  config: options
135
140
  });
@@ -1 +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","assign","acquirer","config","layer","scoped","flatMap","unwrap","placeholder","onIdentifier","onCustom","onRecordUpdate","asyncPauseResume","emit","query","buffer","taskPending","on","row","push","queueMicrotask","items","onInterrupt","destroy","onPause","pause","onResume"],"sources":["../../src/Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
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":";;;;;;AAGA,IAAAA,MAAA,gBAAAC,uBAAA,eAAAC,OAAA;AAEA,IAAAC,MAAA,gBAAAD,OAAA;AACA,IAAAE,SAAA,gBAAAH,uBAAA,eAAAC,OAAA;AACA,IAAAG,OAAA,gBAAAH,OAAA;AACA,IAAAI,KAAA,gBAAAL,uBAAA,eAAAC,OAAA;AACA,IAAAK,MAAA,gBAAAN,uBAAA,eAAAC,OAAA;AAEA,IAAAM,OAAA,gBAAAP,uBAAA,eAAAC,OAAA;AACA,IAAAO,QAAA,gBAAAR,uBAAA,eAAAC,OAAA;AACA,IAAAQ,MAAA,gBAAAT,uBAAA,eAAAC,OAAA;AACA,IAAAS,KAAA,gBAAAV,uBAAA,eAAAC,OAAA;AAEA,IAAAU,MAAA,gBAAAX,uBAAA,eAAAC,OAAA;AACA,IAAAW,MAAA,gBAAAZ,uBAAA,eAAAC,OAAA;AACA,IAAAY,KAAA,gBAAAb,uBAAA,eAAAC,OAAA;AAA+B,SAAAa,yBAAAC,CAAA;EAAA,yBAAAC,OAAA;EAAA,IAAAC,CAAA,OAAAD,OAAA;IAAAE,CAAA,OAAAF,OAAA;EAAA,QAAAF,wBAAA,YAAAA,CAAAC,CAAA;IAAA,OAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA;EAAA,GAAAF,CAAA;AAAA;AAAA,SAAAf,wBAAAe,CAAA,EAAAE,CAAA;EAAA,KAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA;EAAA,aAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA;IAAAK,OAAA,EAAAL;EAAA;EAAA,IAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA;EAAA,IAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA;EAAA,IAAAQ,CAAA;MAAAC,SAAA;IAAA;IAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA;EAAA,SAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA;IAAA,IAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA;IAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA;EAAA;EAAA,OAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAAA;AAlB/B;;;;AA4BA;;;;AAIO,MAAMW,WAAW,GAAAC,OAAA,CAAAD,WAAA,gBAAG3B,OAAO,CAAC6B,UAAU,CAAc,0BAA0B,CAAC;AA2BtF,MAAMC,MAAM,gBAAGlC,SAAS,CAACmC,aAAa,CAAC,GAAG,CAAC;AAE3C;;;;AAIO,MAAMC,IAAI,GACfC,OAA0B,IAE1B/B,MAAM,CAACgC,GAAG,CAAC,WAAUC,CAAC;EACpB,MAAMC,QAAQ,GAAGC,YAAY,CAACJ,OAAO,CAACK,mBAAmB,CAAC;EAE1D,MAAMC,aAAa,GAAG/C,MAAM,CAACgD,iBAAiB,CAC5CP,OAAO,CAACQ,oBAAqB,CAC9B,CAACC,KAAK;EAEP,MAAMC,cAAc;IACWC,IAAA;IAA7BC,YAA6BD,IAAuC;MAAvC,KAAAA,IAAI,GAAJA,IAAI;IAAsC;IAE/DE,GAAGA,CACTC,GAAW,EACXC,MAA2B,EAC3BC,SAAS,GAAG,IAAI,EAChBC,WAAW,GAAG,KAAK,EACnBC,MAAA,GAA8B,SAAS;MAEvC,OAAOjD,MAAM,CAACkD,KAAK,CAAgCC,MAAM,IAAI;QAC3D,IAAI,CAACT,IAAI,CAACO,MAAM,CAAC,CAAC;UAChBJ,GAAG;UACHC,MAAM;UACNE;SACD,EAAE,CAACI,KAAqB,EAAEC,OAA2B,EAAEC,OAAY,KAAI;UACtE,IAAIF,KAAK,EAAE;YACTD,MAAM,CAACnD,MAAM,CAACuD,IAAI,CAAC,IAAI9D,MAAA,CAAA+D,QAAQ,CAAC;cAAEJ;YAAK,CAAE,CAAC,CAAC,CAAC;UAC9C,CAAC,MAAM,IAAIL,SAAS,IAAI,CAACC,WAAW,IAAIjB,OAAO,CAACQ,oBAAoB,EAAE;YACpEY,MAAM,CAACnD,MAAM,CAACyD,OAAO,CAACpB,aAAa,CAACgB,OAAO,CAAC,CAAC,CAAC;UAChD,CAAC,MAAM;YACLF,MAAM,CAACnD,MAAM,CAACyD,OAAO,CAACJ,OAAO,CAAC,CAAC;UACjC;QACF,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ;IAEAK,OAAOA,CAACb,GAAW,EAAEc,MAA0C;MAC7D,OAAO,IAAI,CAACf,GAAG,CAACC,GAAG,EAAEc,MAAM,CAAC;IAC9B;IACAC,uBAAuBA,CAACf,GAAW,EAAEc,MAA0C;MAC7E,OAAO,IAAI,CAACf,GAAG,CAACC,GAAG,EAAEc,MAAM,EAAE,KAAK,CAAC;IACrC;IACAE,aAAaA,CAAChB,GAAW,EAAEc,MAA0C;MACnE,OAAO,IAAI,CAACf,GAAG,CAACC,GAAG,EAAEc,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC;IAC1C;IACAG,UAAUA,CAACjB,GAAW,EAAEc,MAA2C;MACjE,OAAO,IAAI,CAACf,GAAG,CAACC,GAAG,EAAEc,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC;IACpD;IACAI,aAAaA,CAAClB,GAAW,EAAEc,MAA0C;MACnE,MAAMK,MAAM,GAAGC,WAAW,CAAC,IAAI,CAACvB,IAAW,EAAEG,GAAG,EAAEc,MAAM,CAAC;MACzD,OAAO5B,OAAO,CAACQ,oBAAoB,GAC/BpC,MAAM,CAAC+D,SAAS,CAACF,MAAM,EAAG/B,CAAC,IAC3BrC,KAAK,CAACuE,eAAe,CACnB9B,aAAa,CAACzC,KAAK,CAACwE,eAAe,CAACnC,CAAC,CAAkB,CAAC,CACzD,CAAC,GACF+B,MAAM;IACZ;;EAGF,MAAMK,IAAI,GAAGtC,OAAO,CAACuC,GAAG,GACpBlE,KAAK,CAACmE,UAAU,CAACrE,MAAM,CAACsE,KAAK,CAACzC,OAAO,CAACuC,GAAG,CAAC,CAAC,GAC3ClE,KAAK,CAACmE,UAAU,CAAC;IACjB,IAAIxC,OAAO,CAAC0C,UAAU,IAAI,EAAE,CAAC;IAC7BC,IAAI,EAAE3C,OAAO,CAAC2C,IAAI;IAClBC,IAAI,EAAE5C,OAAO,CAAC4C,IAAI;IAClBC,QAAQ,EAAE7C,OAAO,CAAC6C,QAAQ;IAC1BC,IAAI,EAAE9C,OAAO,CAAC+C,QAAQ;IACtBC,QAAQ,EAAEhD,OAAO,CAACgD,QAAQ,GACtB7E,MAAM,CAACsE,KAAK,CAACzC,OAAO,CAACgD,QAAQ,CAAC,GAC9BC,SAAS;IACbC,eAAe,EAAElD,OAAO,CAACmD,cAAc;IACvCC,WAAW,EAAEpD,OAAO,CAACqD,aAAa,GAC9BrF,QAAQ,CAACsF,QAAQ,CAACtD,OAAO,CAACqD,aAAa,CAAC,GACxCJ;GACgB,CAAC;EAEzB,OAAO/C,CAAC,CAACjC,MAAM,CAACsF,YAAY,CAAC,MAC3BtF,MAAM,CAACkD,KAAK,CAAQC,MAAM,IAAI;IAC5BkB,IAAI,CAACkB,GAAG,CAAC,MAAMpC,MAAM,CAACnD,MAAM,CAACwF,IAAI,CAAC,CAAC;EACrC,CAAC,CAAC,CACH,CAAC;EAEF,MAAMC,cAAc,GAAG,IAAIhD,cAAc,CAAC4B,IAAI,CAAC;EAE/C,MAAMqB,WAAW,GAAG1F,MAAM,CAAC2F,cAAc,CACvC3F,MAAM,CAACkD,KAAK,CAAkCC,MAAM,IAAI;IACtDkB,IAAI,CAACuB,aAAa,CAAC,CAACxC,KAAK,EAAEV,IAAI,KAAI;MACjC,IAAIU,KAAK,EAAE;QACTD,MAAM,CAAC,IAAI1D,MAAA,CAAA+D,QAAQ,CAAC;UAAEJ;QAAK,CAAE,CAAC,CAAC;MACjC,CAAC,MAAM;QACLD,MAAM,CAACnD,MAAM,CAACyD,OAAO,CAACf,IAAI,CAAC,CAAC;MAC9B;IACF,CAAC,CAAC;EACJ,CAAC,CAAC,EACDA,IAAI,IAAK1C,MAAM,CAAC6F,IAAI,CAAC,MAAMnD,IAAI,CAACoD,OAAO,EAAE,CAAC,CAC5C;EAED,MAAMC,mBAAmB,GAAG/F,MAAM,CAACgG,GAAG,CACpCN,WAAW,EACVhD,IAAI,IAAK,IAAID,cAAc,CAACC,IAAI,CAAC,CACnC;EAED,MAAMuD,cAAc,GAA6B,CAC/C,CAAC,WAAW,EAAE,OAAO,CAAC,EACtB,CAAC,gBAAgB,EAAElE,OAAO,CAAC2C,IAAI,IAAI,WAAW,CAAC,EAC/C,CAAC,aAAa,EAAE3C,OAAO,CAAC4C,IAAI,IAAI,IAAI,CAAC,CACtC;EAED,IAAI5C,OAAO,CAAC6C,QAAQ,EAAE;IACpBqB,cAAc,CAACC,IAAI,CAAC,CAAC,SAAS,EAAEnE,OAAO,CAAC6C,QAAQ,CAAC,CAAC;EACpD;EAEA,OAAO3D,MAAM,CAACkF,MAAM,CAClB7G,MAAM,CAACwC,IAAI,CAAC;IACVsE,QAAQ,EAAEpG,MAAM,CAACyD,OAAO,CAACgC,cAAc,CAAC;IACxCM,mBAAmB;IACnB7D,QAAQ;IACR+D;GACD,CAAC,EACF;IAAEI,MAAM,EAAEtE;EAAO,CAAE,CACpB;AACH,CAAC,CAAC;AAEJ;;;;AAAAL,OAAA,CAAAI,IAAA,GAAAA,IAAA;AAIO,MAAMwE,KAAK,GAGhBD,MAA6C,IAC1CpG,KAAK,CAACsG,MAAM,CAAC9E,WAAW,EAAEzB,MAAM,CAACwG,OAAO,CAAC3G,MAAM,CAAC4G,MAAM,CAACJ,MAAM,CAAC,EAAEvE,IAAI,CAAC,CAAC;AAE3E;;;;AAAAJ,OAAA,CAAA4E,KAAA,GAAAA,KAAA;AAIO,MAAMnE,YAAY,GAAIY,SAAiC,IAC5DrD,SAAS,CAACyC,YAAY,CAAC;EACrBuE,WAAW,EAAGzE,CAAC,IAAK,GAAG;EACvB0E,YAAY,EAAE5D,SAAS,GAAId,CAAC,IAAKL,MAAM,CAACmB,SAAS,CAACd,CAAC,CAAC,CAAC,GAAGL,MAAM;EAC9DgF,QAAQ,EAAEA,CAAA,KAAM,CAAC,EAAE,EAAE,EAAE,CAAC;EACxBC,cAAc,EAAEA,CAAA,KAAM,CAAC,EAAE,EAAE,EAAE;CAC9B,CAAC;AAAAnF,OAAA,CAAAS,YAAA,GAAAA,YAAA;AAEJ,SAAS8B,WAAWA,CAClBvB,IAA0B,EAC1BG,GAAW,EACXc,MAA2B;EAE3B,OAAO,IAAAhE,OAAA,CAAAmH,gBAAgB,EAAiBC,IAAI,IAAI;IAC9C,MAAMC,KAAK,GAAGtE,IAAI,CAACsE,KAAK,CAACnE,GAAG,EAAEc,MAAM,CAAC,CAACK,MAAM,EAAE;IAC9C,IAAIiD,MAAM,GAAe,EAAE;IAC3B,IAAIC,WAAW,GAAG,KAAK;IACvBF,KAAK,CAACG,EAAE,CAAC,OAAO,EAAG/D,KAAc,IAAK2D,IAAI,CAACxD,IAAI,CAAC,IAAI9D,MAAA,CAAA+D,QAAQ,CAAC;MAAEJ;IAAK,CAAE,CAAC,CAAC,CAAC;IACzE4D,KAAK,CAACG,EAAE,CAAC,MAAM,EAAGC,GAAQ,IAAI;MAC5BH,MAAM,CAACf,IAAI,CAACkB,GAAG,CAAC;MAChB,IAAI,CAACF,WAAW,EAAE;QAChBA,WAAW,GAAG,IAAI;QAClBG,cAAc,CAAC,MAAK;UAClB,MAAMC,KAAK,GAAGL,MAAM;UACpBA,MAAM,GAAG,EAAE;UACXF,IAAI,CAACvE,KAAK,CAAC8E,KAAK,CAAC;UACjBJ,WAAW,GAAG,KAAK;QACrB,CAAC,CAAC;MACJ;IACF,CAAC,CAAC;IACFF,KAAK,CAACG,EAAE,CAAC,KAAK,EAAE,MAAMJ,IAAI,CAACxB,GAAG,EAAE,CAAC;IACjC,OAAO;MACLgC,WAAW,EAAEvH,MAAM,CAAC6F,IAAI,CAAC,MAAMmB,KAAK,CAACQ,OAAO,EAAE,CAAC;MAC/CC,OAAO,EAAEzH,MAAM,CAAC6F,IAAI,CAAC,MAAMmB,KAAK,CAACU,KAAK,EAAE,CAAC;MACzCC,QAAQ,EAAE3H,MAAM,CAAC6F,IAAI,CAAC,MAAMmB,KAAK,CAAC7D,MAAM,EAAE;KAC3C;EACH,CAAC,CAAC;AACJ","ignoreList":[]}
@@ -1 +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,CA6GtC,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"}
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"}
@@ -94,10 +94,15 @@ export const make = options => Effect.gen(function* (_) {
94
94
  });
95
95
  }), conn => Effect.sync(() => conn.release()));
96
96
  const transactionAcquirer = Effect.map(acquireConn, conn => new ConnectionImpl(conn));
97
+ const spanAttributes = [["db.system", "mysql"], ["server.address", options.host ?? "localhost"], ["server.port", options.port ?? 3306]];
98
+ if (options.database) {
99
+ spanAttributes.push(["db.name", options.database]);
100
+ }
97
101
  return Object.assign(Client.make({
98
102
  acquirer: Effect.succeed(poolConnection),
99
103
  transactionAcquirer,
100
- compiler
104
+ compiler,
105
+ spanAttributes
101
106
  }), {
102
107
  config: options
103
108
  });
@@ -1 +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","Object","assign","acquirer","config","layer","scoped","flatMap","unwrap","placeholder","onIdentifier","onCustom","onRecordUpdate","emit","query","buffer","taskPending","on","row","push","queueMicrotask","items","onInterrupt","destroy","onPause","pause","onResume"],"sources":["../../src/Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
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":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect/sql-mysql2",
3
- "version": "0.1.9",
3
+ "version": "0.1.11",
4
4
  "description": "A MySQL toolkit for Effect",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -13,9 +13,9 @@
13
13
  "mysql2": "^3"
14
14
  },
15
15
  "peerDependencies": {
16
- "@effect/platform": "^0.50.4",
17
- "@effect/sql": "^0.1.9",
18
- "effect": "^3.0.4"
16
+ "@effect/platform": "^0.50.6",
17
+ "@effect/sql": "^0.1.11",
18
+ "effect": "^3.0.6"
19
19
  },
20
20
  "publishConfig": {
21
21
  "provenance": true
package/src/Client.ts CHANGED
@@ -166,11 +166,22 @@ export const make = (
166
166
  (conn) => new ConnectionImpl(conn)
167
167
  )
168
168
 
169
+ const spanAttributes: Array<[string, unknown]> = [
170
+ ["db.system", "mysql"],
171
+ ["server.address", options.host ?? "localhost"],
172
+ ["server.port", options.port ?? 3306]
173
+ ]
174
+
175
+ if (options.database) {
176
+ spanAttributes.push(["db.name", options.database])
177
+ }
178
+
169
179
  return Object.assign(
170
180
  Client.make({
171
181
  acquirer: Effect.succeed(poolConnection),
172
182
  transactionAcquirer,
173
- compiler
183
+ compiler,
184
+ spanAttributes
174
185
  }),
175
186
  { config: options }
176
187
  )