@osaas/client-db 0.5.0 → 0.5.2

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.
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAqB/B,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,MAAM,MAAM,YAAY,GACpB,QAAQ,GACR,UAAU,GACV,SAAS,GACT,YAAY,GACZ,SAAS,CAAC;AAEd,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAMhE,CAAC;AACF,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAM3D,CAAC;AACF,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAM/D,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,YAAY,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,YAAY,mBA+HnB"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAqB/B,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,MAAM,MAAM,YAAY,GACpB,QAAQ,GACR,UAAU,GACV,SAAS,GACT,YAAY,GACZ,SAAS,CAAC;AAEd,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAMhE,CAAC;AACF,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAM3D,CAAC;AACF,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAM/D,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,YAAY,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,YAAY,mBAoInB"}
package/lib/index.js CHANGED
@@ -151,8 +151,7 @@ async function setupDatabase(type, name, opts) {
151
151
  switch (type) {
152
152
  case 'valkey':
153
153
  case 'postgres':
154
- case 'mariadb':
155
- case 'clickhouse': {
154
+ case 'mariadb': {
156
155
  const token = await ctx.getServiceAccessToken(exports.DatabaseTypeToServiceId[type]);
157
156
  const ports = await (0, client_core_1.getPortsForInstance)(ctx, exports.DatabaseTypeToServiceId[type], name, token);
158
157
  const port = ports.find((p) => p.internalPort === exports.DatabaseTypeToPort[type]);
@@ -167,6 +166,12 @@ async function setupDatabase(type, name, opts) {
167
166
  url.username = 'admin';
168
167
  return url.toString();
169
168
  }
169
+ case 'clickhouse': {
170
+ const url = new URL(instance.url);
171
+ url.username = opts.username || 'default';
172
+ url.password = opts.password || '';
173
+ return url.toString();
174
+ }
170
175
  default:
171
176
  throw new Error(`Unsupported database type: ${type}`);
172
177
  }
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,+BAA+B;;;AAE/B,oDAAkE;AAClE,4DAgBgC;AAEhC,mCAAoC;AAA3B,kGAAA,QAAQ,OAAA;AASJ,QAAA,uBAAuB,GAAiC;IACnE,MAAM,EAAE,kBAAkB;IAC1B,QAAQ,EAAE,sBAAsB;IAChC,OAAO,EAAE,4BAA4B;IACrC,UAAU,EAAE,uBAAuB;IACnC,OAAO,EAAE,gBAAgB;CAC1B,CAAC;AACW,QAAA,kBAAkB,GAAiC;IAC9D,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,IAAI;IACd,OAAO,EAAE,IAAI;IACb,UAAU,EAAE,IAAI;IAChB,OAAO,EAAE,IAAI;CACd,CAAC;AACW,QAAA,sBAAsB,GAAiC;IAClE,MAAM,EAAE,OAAO;IACf,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,OAAO;IAChB,UAAU,EAAE,YAAY;IACxB,OAAO,EAAE,OAAO;CACjB,CAAC;AASF;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACI,KAAK,UAAU,aAAa,CACjC,IAAkB,EAClB,IAAY,EACZ,IAAkB;IAElB,MAAM,GAAG,GAAG,IAAI,qBAAO,EAAE,CAAC;IAC1B,IAAI,QAAQ,CAAC;IAEb,QAAQ,IAAI,EAAE;QACZ,KAAK,QAAQ;YACX,QAAQ,GAAG,MAAM,IAAA,2CAAyB,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACtD,MAAM;QACR,KAAK,UAAU;YACb,QAAQ,GAAG,MAAM,IAAA,+CAA6B,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAC1D,MAAM;QACR,KAAK,SAAS;YACZ,QAAQ,GAAG,MAAM,IAAA,qDAAmC,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAChE,MAAM;QACR,KAAK,YAAY;YACf,QAAQ,GAAG,MAAM,IAAA,iDAA+B,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAC5D,MAAM;QACR,KAAK,SAAS;YACZ,QAAQ,GAAG,MAAM,IAAA,0CAAwB,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACrD,MAAM;QACR;YACE,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC;KACzD;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,IAAI,EAAE;YACZ,KAAK,QAAQ;gBACX;oBACE,MAAM,OAAO,GAAyB;wBACpC,IAAI;wBACJ,QAAQ,EAAE,IAAI,CAAC,QAAQ;qBACxB,CAAC;oBACF,QAAQ,GAAG,MAAM,IAAA,8CAA4B,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;iBAC7D;gBACD,MAAM;YACR,KAAK,UAAU;gBACb;oBACE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;wBAClB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;qBACtD;oBACD,MAAM,OAAO,GAA6B;wBACxC,IAAI;wBACJ,YAAY,EAAE,IAAI,CAAC,QAAQ;wBAC3B,gBAAgB,EAAE,IAAI,CAAC,QAAQ;wBAC/B,UAAU,EAAE,IAAI,CAAC,QAAQ;qBAC1B,CAAC;oBACF,QAAQ,GAAG,MAAM,IAAA,kDAAgC,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;iBACjE;gBACD,MAAM;YACR,KAAK,SAAS;gBACZ;oBACE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;wBACtB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;qBAC1D;oBACD,MAAM,OAAO,GAAmC;wBAC9C,IAAI;wBACJ,YAAY,EAAE,IAAI,CAAC,YAAY;wBAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ;wBACvB,IAAI,EAAE,IAAI,CAAC,QAAQ;wBACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;qBACxB,CAAC;oBACF,QAAQ,GAAG,MAAM,IAAA,wDAAsC,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;iBACvE;gBACD,MAAM;YACR,KAAK,YAAY;gBACf;oBACE,MAAM,OAAO,GAA+B;wBAC1C,IAAI;wBACJ,QAAQ,EAAE,IAAI,CAAC,QAAQ;wBACvB,IAAI,EAAE,IAAI,CAAC,QAAQ;wBACnB,EAAE,EAAE,IAAI,CAAC,QAAQ;qBAClB,CAAC;oBACF,QAAQ,GAAG,MAAM,IAAA,oDAAkC,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;iBACnE;gBACD,MAAM;YACR,KAAK,SAAS;gBACZ;oBACE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;wBACtB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;qBAC1D;oBACD,MAAM,OAAO,GAAwB;wBACnC,IAAI;wBACJ,aAAa,EAAE,IAAI,CAAC,YAAY;qBACjC,CAAC;oBACF,QAAQ,GAAG,MAAM,IAAA,6CAA2B,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;iBAC5D;gBACD,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC;SACzD;KACF;IAED,QAAQ,IAAI,EAAE;QACZ,KAAK,QAAQ,CAAC;QACd,KAAK,UAAU,CAAC;QAChB,KAAK,SAAS,CAAC,CAAC;YACd,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,qBAAqB,CAC3C,+BAAuB,CAAC,IAAI,CAAC,CAC9B,CAAC;YACF,MAAM,KAAK,GAAG,MAAM,IAAA,iCAAmB,EACrC,GAAG,EACH,+BAAuB,CAAC,IAAI,CAAC,EAC7B,IAAI,EACJ,KAAK,CACN,CAAC;YACF,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CACrB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,0BAAkB,CAAC,IAAI,CAAC,CACnD,CAAC;YACF,IAAI,IAAI,EAAE;gBACR,OAAO,GAAG,8BAAsB,CAAC,IAAI,CAAC,MACpC,IAAI,CAAC,QAAQ,IAAI,SACnB,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,UAAU,IAC5D,IAAI,CAAC,YACP,EAAE,CAAC;aACJ;YACD,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;SAC9D;QACD,KAAK,SAAS,CAAC,CAAC;YACd,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAClC,GAAG,CAAC,QAAQ,GAAI,QAAgB,CAAC,aAAa,CAAC;YAC/C,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC;YACvB,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;SACvB;QACD,KAAK,YAAY,CAAC,CAAC;YACjB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAClC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC;YAC1C,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC;YACnC,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;SACvB;QACD;YACE,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC;KACzD;AACH,CAAC;AAvID,sCAuIC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@osaas/client-db",
3
- "version": "0.5.0",
3
+ "version": "0.5.2",
4
4
  "description": "Open Source Cloud Client SDK database library",
5
5
  "author": "Eyevinn Open Source Cloud <osc@eyevinn.se>",
6
6
  "homepage": "https://www.osaas.io",
@@ -26,12 +26,12 @@
26
26
  },
27
27
  "dependencies": {
28
28
  "@osaas/client-core": "^0.15.1",
29
- "@osaas/client-services": "^0.9.0",
29
+ "@osaas/client-services": "^0.10.0",
30
30
  "chalk": "4.1.2",
31
31
  "ioredis": "^5.5.0"
32
32
  },
33
33
  "publishConfig": {
34
34
  "access": "public"
35
35
  },
36
- "gitHead": "4413b4785d4361bf7e3d82908e9b81683d41eca9"
36
+ "gitHead": "b8f1735b11176f069e983c2bff2449269beb410d"
37
37
  }