@proteinjs/db-driver-knex 1.12.1 → 1.13.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.
Files changed (6) hide show
  1. package/CHANGELOG.md +19 -0
  2. package/dist/src/KnexDriver.d.ts.map +1 -1
  3. package/dist/src/KnexDriver.js +9 -5
  4. package/dist/src/KnexDriver.js.map +1 -1
  5. package/package.json +5 -5
  6. package/src/KnexDriver.ts +10 -6
package/CHANGELOG.md CHANGED
@@ -3,6 +3,25 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [1.13.1](https://github.com/proteinjs/db/compare/@proteinjs/db-driver-knex@1.13.0...@proteinjs/db-driver-knex@1.13.1) (2026-09-01)
7
+
8
+ **Note:** Version bump only for package @proteinjs/db-driver-knex
9
+
10
+
11
+
12
+
13
+
14
+ # [1.13.0](https://github.com/proteinjs/db/compare/@proteinjs/db-driver-knex@1.12.1...@proteinjs/db-driver-knex@1.13.0) (2026-08-31)
15
+
16
+
17
+ ### Features
18
+
19
+ * timeBucket minute grain — widen the unit union to day|hour|minute across query + drivers (USAGE_ATTRIBUTION §5) ([fe25c4b](https://github.com/proteinjs/db/commit/fe25c4b9fbeae3be1ec18f9ff4e1fac4998a9e5e))
20
+
21
+
22
+
23
+
24
+
6
25
  ## [1.12.1](https://github.com/proteinjs/db/compare/@proteinjs/db-driver-knex@1.12.0...@proteinjs/db-driver-knex@1.12.1) (2026-08-29)
7
26
 
8
27
  **Note:** Version bump only for package @proteinjs/db-driver-knex
package/dist/src/KnexDriver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"KnexDriver.d.ts","sourceRoot":"","sources":["../../src/KnexDriver.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AACzC,OAAO,EACL,QAAQ,EACR,4BAA4B,EAC5B,0BAA0B,EAC1B,gBAAgB,EAChB,KAAK,EACL,YAAY,EAEb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAIhD;;GAEG;AACH,qBAAa,UAAW,YAAW,QAAQ;IACzC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAO;IAC1B,OAAO,CAAC,MAAM,CAA+C;IAC7D,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,UAAU,CAAM;IACjB,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC;gBAEhD,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,KAAK,CAAC,GAAG,CAAC;IAavE,OAAO,IAAI,IAAI;IAQf,SAAS;IAIH,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;OAIG;IACG,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzE,+BAA+B;IACzB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInC,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWhD,KAAK;IAKL,IAAI;YAII,uBAAuB;IAOrC,eAAe,IAAI,YAAY;IAM/B;;;;OAIG;IACH,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,GAAG,MAAM;IAsBtF,QAAQ,CACZ,iBAAiB,EAAE,CAAC,MAAM,EAAE,4BAA4B,KAAK,SAAS,EACtE,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAsBxB,MAAM,CACV,iBAAiB,EAAE,CAAC,MAAM,EAAE,0BAA0B,KAAK,SAAS,EACpE,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,CAAC;IAKlB;;;;OAIG;IACG,cAAc,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;CAMlF"}
1
+ {"version":3,"file":"KnexDriver.d.ts","sourceRoot":"","sources":["../../src/KnexDriver.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AACzC,OAAO,EACL,QAAQ,EACR,4BAA4B,EAC5B,0BAA0B,EAC1B,gBAAgB,EAChB,KAAK,EACL,YAAY,EAEb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAIhD;;GAEG;AACH,qBAAa,UAAW,YAAW,QAAQ;IACzC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAO;IAC1B,OAAO,CAAC,MAAM,CAA+C;IAC7D,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,UAAU,CAAM;IACjB,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC;gBAEhD,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,KAAK,CAAC,GAAG,CAAC;IAavE,OAAO,IAAI,IAAI;IAQf,SAAS;IAIH,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;OAIG;IACG,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzE,+BAA+B;IACzB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInC,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWhD,KAAK;IAKL,IAAI;YAII,uBAAuB;IAOrC,eAAe,IAAI,YAAY;IAM/B;;;;OAIG;IACH,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,GAAG,MAAM;IAsBtF,QAAQ,CACZ,iBAAiB,EAAE,CAAC,MAAM,EAAE,4BAA4B,KAAK,SAAS,EACtE,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,gBAAgB,EAAE,CAAC;IA0BxB,MAAM,CACV,iBAAiB,EAAE,CAAC,MAAM,EAAE,0BAA0B,KAAK,SAAS,EACpE,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,CAAC;IAKlB;;;;OAIG;IACG,cAAc,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;CAMlF"}
package/dist/src/KnexDriver.js CHANGED
@@ -221,12 +221,16 @@ var KnexDriver = /** @class */ (function () {
221
221
  useParams: true,
222
222
  prefixTablesWithDb: true,
223
223
  handleCaseSensitivity: this.handleCaseSensitivity.bind(this),
224
- // MySQL day/hour truncation for QueryBuilder.timeBucket. These bucket in the SESSION time
225
- // zone; deployments needing strict UTC buckets should run the connection with time_zone
226
- // = '+00:00' (the Spanner driver truncates in UTC unconditionally). Hour truncation floors
227
- // to the top of the hour via DATE_FORMAT (a stable, groupable bucket key).
224
+ // MySQL day/hour/minute truncation for QueryBuilder.timeBucket. These bucket in the SESSION
225
+ // time zone; deployments needing strict UTC buckets should run the connection with time_zone
226
+ // = '+00:00' (the Spanner driver truncates in UTC unconditionally). Hour/minute truncation
227
+ // floors via DATE_FORMAT (a stable, groupable bucket key).
228
228
  dateTruncExpression: function (resolvedColumnName, unit) {
229
- return unit === 'hour' ? "DATE_FORMAT(".concat(resolvedColumnName, ", '%Y-%m-%d %H:00:00')") : "DATE(".concat(resolvedColumnName, ")");
229
+ return unit === 'minute'
230
+ ? "DATE_FORMAT(".concat(resolvedColumnName, ", '%Y-%m-%d %H:%i:00')")
231
+ : unit === 'hour'
232
+ ? "DATE_FORMAT(".concat(resolvedColumnName, ", '%Y-%m-%d %H:00:00')")
233
+ : "DATE(".concat(resolvedColumnName, ")");
230
234
  },
231
235
  }), sql = _a.sql, params = _a.params;
232
236
  _b.label = 1;
package/dist/src/KnexDriver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"KnexDriver.js","sourceRoot":"","sources":["../../src/KnexDriver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"KnexDriver.js","sourceRoot":"","sources":["../../src/KnexDriver.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@proteinjs/db-driver-knex",
3
- "version": "1.12.1",
3
+ "version": "1.13.1",
4
4
  "main": "./dist/generated/index.js",
5
5
  "types": "./dist/generated/index.d.ts",
6
6
  "exports": {
@@ -41,9 +41,9 @@
41
41
  "test": "jest --runInBand --passWithNoTests"
42
42
  },
43
43
  "dependencies": {
44
- "@proteinjs/db": "^1.39.0",
45
- "@proteinjs/db-query": "^1.9.0",
46
- "@proteinjs/db-transaction-context": "^0.5.23",
44
+ "@proteinjs/db": "^1.41.0",
45
+ "@proteinjs/db-query": "^1.10.0",
46
+ "@proteinjs/db-transaction-context": "^0.5.25",
47
47
  "@proteinjs/logger": "^1.0.21",
48
48
  "@proteinjs/reflection": "^1.2.0",
49
49
  "@proteinjs/util": "^1.6.1",
@@ -67,5 +67,5 @@
67
67
  "ts-jest": "29.1.1",
68
68
  "typescript": "5.2.2"
69
69
  },
70
- "gitHead": "bc027111370f4391426dce2e8faf0b862664b3c5"
70
+ "gitHead": "149e538c8a05858b6eb7d3a2dc362e5ff196caf9"
71
71
  }
package/src/KnexDriver.ts CHANGED
@@ -145,12 +145,16 @@ export class KnexDriver implements DbDriver {
145
145
  useParams: true,
146
146
  prefixTablesWithDb: true,
147
147
  handleCaseSensitivity: this.handleCaseSensitivity.bind(this),
148
- // MySQL day/hour truncation for QueryBuilder.timeBucket. These bucket in the SESSION time
149
- // zone; deployments needing strict UTC buckets should run the connection with time_zone
150
- // = '+00:00' (the Spanner driver truncates in UTC unconditionally). Hour truncation floors
151
- // to the top of the hour via DATE_FORMAT (a stable, groupable bucket key).
152
- dateTruncExpression: (resolvedColumnName: string, unit: 'day' | 'hour') =>
153
- unit === 'hour' ? `DATE_FORMAT(${resolvedColumnName}, '%Y-%m-%d %H:00:00')` : `DATE(${resolvedColumnName})`,
148
+ // MySQL day/hour/minute truncation for QueryBuilder.timeBucket. These bucket in the SESSION
149
+ // time zone; deployments needing strict UTC buckets should run the connection with time_zone
150
+ // = '+00:00' (the Spanner driver truncates in UTC unconditionally). Hour/minute truncation
151
+ // floors via DATE_FORMAT (a stable, groupable bucket key).
152
+ dateTruncExpression: (resolvedColumnName: string, unit: 'day' | 'hour' | 'minute') =>
153
+ unit === 'minute'
154
+ ? `DATE_FORMAT(${resolvedColumnName}, '%Y-%m-%d %H:%i:00')`
155
+ : unit === 'hour'
156
+ ? `DATE_FORMAT(${resolvedColumnName}, '%Y-%m-%d %H:00:00')`
157
+ : `DATE(${resolvedColumnName})`,
154
158
  });
155
159
 
156
160
  try {