forge-sql-orm 2.0.28 → 2.0.29
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/ForgeSQLORM.js +19 -17
- package/dist/ForgeSQLORM.js.map +1 -1
- package/dist/ForgeSQLORM.mjs +19 -17
- package/dist/ForgeSQLORM.mjs.map +1 -1
- package/dist/core/ForgeSQLAnalyseOperations.d.ts.map +1 -1
- package/dist/utils/sqlUtils.d.ts +2 -2
- package/dist/utils/sqlUtils.d.ts.map +1 -1
- package/package.json +13 -7
- package/src/core/ForgeSQLAnalyseOperations.ts +3 -2
- package/src/core/ForgeSQLQueryBuilder.ts +8 -8
- package/src/utils/sqlUtils.ts +18 -10
package/dist/ForgeSQLORM.js
CHANGED
|
@@ -1,25 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
|
|
3
3
|
const drizzleOrm = require("drizzle-orm");
|
|
4
|
-
const
|
|
4
|
+
const luxon = require("luxon");
|
|
5
5
|
const sql = require("drizzle-orm/sql/sql");
|
|
6
6
|
const sql$1 = require("@forge/sql");
|
|
7
7
|
const mysqlProxy = require("drizzle-orm/mysql-proxy");
|
|
8
8
|
const mysqlCore = require("drizzle-orm/mysql-core");
|
|
9
|
-
const moment$1 = require("moment/moment.js");
|
|
10
9
|
const table = require("drizzle-orm/table");
|
|
11
10
|
const parseDateTime = (value, format) => {
|
|
12
11
|
let result;
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
12
|
+
if (value instanceof Date) {
|
|
13
|
+
return value;
|
|
14
|
+
}
|
|
15
|
+
const dt = luxon.DateTime.fromFormat(value, format);
|
|
16
|
+
if (dt.isValid) {
|
|
17
|
+
result = dt.toJSDate();
|
|
18
|
+
} else {
|
|
19
|
+
const isoDt = luxon.DateTime.fromISO(value);
|
|
20
|
+
if (isoDt.isValid) {
|
|
21
|
+
result = isoDt.toJSDate();
|
|
18
22
|
} else {
|
|
19
23
|
result = new Date(value);
|
|
20
24
|
}
|
|
21
|
-
} else {
|
|
22
|
-
result = m.toDate();
|
|
23
25
|
}
|
|
24
26
|
if (isNaN(result.getTime())) {
|
|
25
27
|
result = new Date(value);
|
|
@@ -910,7 +912,7 @@ class ForgeSQLAnalyseOperation {
|
|
|
910
912
|
* @returns {string} The SQL query for cluster statement history
|
|
911
913
|
*/
|
|
912
914
|
buildClusterStatementQuery(tables, from, to) {
|
|
913
|
-
const formatDateTime = (date) =>
|
|
915
|
+
const formatDateTime = (date) => luxon.DateTime.fromJSDate(date).toFormat("yyyy-LL-dd'T'HH:mm:ss.SSS");
|
|
914
916
|
const tableConditions = tables.map((table2) => `TABLE_NAMES LIKE CONCAT(SCHEMA_NAME, '.', '%', '${table2}', '%')`).join(" OR ");
|
|
915
917
|
const timeConditions = [];
|
|
916
918
|
if (from) {
|
|
@@ -1200,10 +1202,10 @@ const forgeDateTimeString = mysqlCore.customType({
|
|
|
1200
1202
|
return "datetime";
|
|
1201
1203
|
},
|
|
1202
1204
|
toDriver(value) {
|
|
1203
|
-
return
|
|
1205
|
+
return luxon.DateTime.fromJSDate(value).toFormat("yyyy-LL-dd'T'HH:mm:ss.SSS");
|
|
1204
1206
|
},
|
|
1205
1207
|
fromDriver(value) {
|
|
1206
|
-
const format = "
|
|
1208
|
+
const format = "yyyy-LL-dd'T'HH:mm:ss.SSS";
|
|
1207
1209
|
return parseDateTime(value, format);
|
|
1208
1210
|
}
|
|
1209
1211
|
});
|
|
@@ -1212,10 +1214,10 @@ const forgeTimestampString = mysqlCore.customType({
|
|
|
1212
1214
|
return "timestamp";
|
|
1213
1215
|
},
|
|
1214
1216
|
toDriver(value) {
|
|
1215
|
-
return
|
|
1217
|
+
return luxon.DateTime.fromJSDate(value).toFormat("yyyy-LL-dd'T'HH:mm:ss.SSS");
|
|
1216
1218
|
},
|
|
1217
1219
|
fromDriver(value) {
|
|
1218
|
-
const format = "
|
|
1220
|
+
const format = "yyyy-LL-dd'T'HH:mm:ss.SSS";
|
|
1219
1221
|
return parseDateTime(value, format);
|
|
1220
1222
|
}
|
|
1221
1223
|
});
|
|
@@ -1224,10 +1226,10 @@ const forgeDateString = mysqlCore.customType({
|
|
|
1224
1226
|
return "date";
|
|
1225
1227
|
},
|
|
1226
1228
|
toDriver(value) {
|
|
1227
|
-
return
|
|
1229
|
+
return luxon.DateTime.fromJSDate(value).toFormat("yyyy-LL-dd");
|
|
1228
1230
|
},
|
|
1229
1231
|
fromDriver(value) {
|
|
1230
|
-
const format = "
|
|
1232
|
+
const format = "yyyy-LL-dd";
|
|
1231
1233
|
return parseDateTime(value, format);
|
|
1232
1234
|
}
|
|
1233
1235
|
});
|
|
@@ -1236,7 +1238,7 @@ const forgeTimeString = mysqlCore.customType({
|
|
|
1236
1238
|
return "time";
|
|
1237
1239
|
},
|
|
1238
1240
|
toDriver(value) {
|
|
1239
|
-
return
|
|
1241
|
+
return luxon.DateTime.fromJSDate(value).toFormat("HH:mm:ss.SSS");
|
|
1240
1242
|
},
|
|
1241
1243
|
fromDriver(value) {
|
|
1242
1244
|
return parseDateTime(value, "HH:mm:ss.SSS");
|