@wxn0brp/db-string-query 0.0.9 → 0.0.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.
Files changed (56) hide show
  1. package/CHANGELOG.md +21 -0
  2. package/dist/sql/handle/collection.js +1 -1
  3. package/dist/sql/handle/delete.js +1 -1
  4. package/dist/sql/handle/insert.js +9 -5
  5. package/dist/sql/handle/select.js +3 -3
  6. package/dist/sql/handle/update.js +1 -1
  7. package/dist/sql/utils/index.d.ts +7 -0
  8. package/dist/sql/utils/index.js +21 -0
  9. package/dist/sql/utils/join.util.js +8 -11
  10. package/package.json +1 -1
  11. package/src/sql/handle/insert.ts +9 -4
  12. package/src/sql/handle/select.ts +1 -1
  13. package/src/sql/utils/index.ts +26 -0
  14. package/src/sql/utils/join.util.ts +7 -11
  15. package/test/sql/delete.test.ts +8 -8
  16. package/test/sql/index.test.ts +1 -1
  17. package/test/sql/insert.test.ts +8 -8
  18. package/test/sql/select.test.ts +10 -10
  19. package/test/sql/update.test.ts +7 -7
  20. package/test/sql/utils/join.test.ts +1 -1
  21. package/typedocs-generated/assets/hierarchy.js +1 -1
  22. package/typedocs-generated/assets/navigation.js +1 -1
  23. package/typedocs-generated/assets/search.js +1 -1
  24. package/typedocs-generated/classes/js.default.html +2 -2
  25. package/typedocs-generated/classes/sql_index.default.html +2 -2
  26. package/typedocs-generated/classes/sql_utils_join.util.JoinToRelationsEngine.html +2 -2
  27. package/typedocs-generated/functions/sql_handle_collection.handleCreate.html +1 -1
  28. package/typedocs-generated/functions/sql_handle_collection.handleDrop.html +1 -1
  29. package/typedocs-generated/functions/sql_handle_collection.handleExists.html +1 -1
  30. package/typedocs-generated/functions/sql_handle_collection.handleGet.html +1 -1
  31. package/typedocs-generated/functions/sql_handle_delete.handleDelete.html +1 -1
  32. package/typedocs-generated/functions/sql_handle_insert.handleInsert.html +1 -1
  33. package/typedocs-generated/functions/sql_handle_select.handleSelect.html +1 -1
  34. package/typedocs-generated/functions/sql_handle_select.parseJoinClauses.html +1 -1
  35. package/typedocs-generated/functions/sql_handle_select.parseSelectClause.html +1 -1
  36. package/typedocs-generated/functions/sql_handle_update.handleUpdate.html +1 -1
  37. package/typedocs-generated/functions/sql_utils_index.parseNum.html +1 -0
  38. package/typedocs-generated/functions/sql_utils_index.parseReturn.html +1 -0
  39. package/typedocs-generated/functions/sql_utils_index.parseSet.html +1 -0
  40. package/typedocs-generated/functions/sql_utils_index.removeQuotes.html +1 -0
  41. package/typedocs-generated/functions/sql_where.parseWhere.html +1 -1
  42. package/typedocs-generated/hierarchy.html +1 -1
  43. package/typedocs-generated/interfaces/types.Opts.html +2 -2
  44. package/typedocs-generated/interfaces/types.ValtheraParser.html +2 -2
  45. package/typedocs-generated/interfaces/types.ValtheraQuery.html +2 -2
  46. package/typedocs-generated/modules/sql_utils_index.html +1 -0
  47. package/typedocs-generated/modules.html +1 -1
  48. package/typedocs-generated/types/sql_utils_join.util.JoinClause.html +1 -1
  49. package/typedocs-generated/variables/.ValtheraDbParsers.html +1 -1
  50. package/typedocs-generated/variables/.ValtheraDbRelations.html +1 -1
  51. package/dist/sql/utils.d.ts +0 -3
  52. package/dist/sql/utils.js +0 -13
  53. package/src/sql/utils.ts +0 -17
  54. package/typedocs-generated/functions/sql_utils.parseReturn.html +0 -1
  55. package/typedocs-generated/functions/sql_utils.parseSet.html +0 -1
  56. package/typedocs-generated/modules/sql_utils.html +0 -1
package/CHANGELOG.md CHANGED
@@ -2,6 +2,27 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
4
4
 
5
+ ### [0.0.11](https://github.com/wxn0brP/ValtheraDB-string-query/compare/v0.0.10...v0.0.11) (2025-12-06)
6
+
7
+
8
+ ### Features
9
+
10
+ * bug fixes & organize code ([9a93a89](https://github.com/wxn0brP/ValtheraDB-string-query/commit/9a93a893a9e51e311c63f23e7f9aadae5317f152))
11
+
12
+
13
+ ### Bug Fixes
14
+
15
+ * bugs ([eb94c46](https://github.com/wxn0brP/ValtheraDB-string-query/commit/eb94c469ac8a0ea21afc17d10eeeef3828cc766c))
16
+
17
+ ### [0.0.10](https://github.com/wxn0brP/ValtheraDB-string-query/compare/v0.0.9...v0.0.10) (2025-12-05)
18
+
19
+
20
+ ### Bug Fixes
21
+
22
+ * join uitl ([93b419e](https://github.com/wxn0brP/ValtheraDB-string-query/commit/93b419ef251af6284842aa3b0070d8a86b045243))
23
+ * parse join util ([7573fd2](https://github.com/wxn0brP/ValtheraDB-string-query/commit/7573fd200a2f1d61a55c559e9b18b27b5a75e6e1))
24
+ * select test ([0a81195](https://github.com/wxn0brP/ValtheraDB-string-query/commit/0a8119565f6203bcc06ce9cf49b3f16dae87efa8))
25
+
5
26
  ### [0.0.9](https://github.com/wxn0brP/ValtheraDB-string-query/compare/v0.0.8...v0.0.9) (2025-11-30)
6
27
 
7
28
 
@@ -1,4 +1,4 @@
1
- import { parseReturn } from "../utils.js";
1
+ import { parseReturn } from "../utils/index.js";
2
2
  export function handleGet(query) {
3
3
  if (!/^GET\s+COLLECTIONS$/i.test(query)) {
4
4
  throw new Error("Invalid GET COLLECTIONS syntax.");
@@ -1,4 +1,4 @@
1
- import { parseReturn } from "../../sql/utils.js";
1
+ import { parseReturn } from "../../sql/utils/index.js";
2
2
  import { parseWhere } from "../../sql/where.js";
3
3
  export function handleDelete(query) {
4
4
  const match = query.match(/DELETE FROM ([\w\/]+)(?: WHERE (.+))?/i);
@@ -1,6 +1,7 @@
1
- import { parseReturn } from "../../sql/utils.js";
1
+ import { parseNum, parseReturn } from "../../sql/utils/index.js";
2
+ import { removeQuotes } from "../../sql/utils/index.js";
2
3
  export function handleInsert(query) {
3
- const match = query.match(/INSERT INTO ([\w\/]+)\s*\(([^)]+)\)\s*VALUES\s*\(([^)]+)\)/i);
4
+ const match = query.match(/INSERT INTO\s+((?:`[^`]+`|"[^"]+"|\w+(?:\.\w+)*))\s*\(\s*([^)]+)\s*\)\s*VALUES\s*\(\s*([^)]+)\s*\)/i);
4
5
  if (!match)
5
6
  throw new Error("Invalid INSERT syntax");
6
7
  const collection = match[1];
@@ -46,7 +47,10 @@ export function handleInsert(query) {
46
47
  });
47
48
  if (keys.length !== values.length)
48
49
  throw new Error("Number of columns and values does not match");
49
- const data = Object.fromEntries(keys.map((k, i) => [k, isNaN(values[i]) ? values[i] : Number(values[i])]));
50
- return parseReturn("add", [collection, data]);
50
+ const data = keys.map((k, i) => [
51
+ removeQuotes(k),
52
+ parseNum(values[i])
53
+ ]);
54
+ return parseReturn("add", [removeQuotes(collection), Object.fromEntries(data)]);
51
55
  }
52
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zZXJ0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NxbC9oYW5kbGUvaW5zZXJ0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFekMsTUFBTSxVQUFVLFlBQVksQ0FBQyxLQUFhO0lBQ3RDLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUMsNkRBQTZELENBQUMsQ0FBQztJQUN6RixJQUFJLENBQUMsS0FBSztRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLENBQUMsQ0FBQztJQUNyRCxNQUFNLFVBQVUsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDNUIsTUFBTSxJQUFJLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUV2QyxTQUFTLDBCQUEwQixDQUFDLEdBQVc7UUFDM0MsTUFBTSxNQUFNLEdBQWEsRUFBRSxDQUFDO1FBQzVCLElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQztRQUNqQixJQUFJLGFBQWEsR0FBRyxLQUFLLENBQUM7UUFDMUIsSUFBSSxhQUFhLEdBQUcsS0FBSyxDQUFDO1FBRTFCLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxHQUFHLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7WUFDbEMsTUFBTSxJQUFJLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3BCLElBQUksQ0FBQyxJQUFJLEtBQUssR0FBRyxDQUFDLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztnQkFDbkMsYUFBYSxHQUFHLENBQUMsYUFBYSxDQUFDO2dCQUMvQixPQUFPLElBQUksSUFBSSxDQUFDO1lBQ3BCLENBQUM7aUJBQU0sSUFBSSxJQUFJLEtBQUssR0FBRyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7Z0JBQ3hDLGFBQWEsR0FBRyxDQUFDLGFBQWEsQ0FBQztnQkFDL0IsT0FBTyxJQUFJLElBQUksQ0FBQztZQUNwQixDQUFDO2lCQUFNLElBQUksSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLGFBQWEsSUFBSSxDQUFDLGFBQWEsRUFBRSxDQUFDO2dCQUMxRCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNyQixPQUFPLEdBQUcsRUFBRSxDQUFDO1lBQ2pCLENBQUM7aUJBQU0sQ0FBQztnQkFDSixPQUFPLElBQUksSUFBSSxDQUFDO1lBQ3BCLENBQUM7UUFDTCxDQUFDO1FBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNyQixPQUFPLE1BQU0sQ0FBQztJQUNsQixDQUFDO0lBRUQsTUFBTSxTQUFTLEdBQUcsMEJBQTBCLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdkQsTUFBTSxNQUFNLEdBQUcsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRTtRQUM3QixDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ2IsSUFBSSxDQUFDLENBQUMsTUFBTSxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQ2hCLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsS0FBSyxHQUFHLEVBQUUsQ0FBQztnQkFDMUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUM7WUFDckMsQ0FBQztpQkFBTSxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLEtBQUssR0FBRyxFQUFFLENBQUM7Z0JBQ2pELENBQUMsR0FBRyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ3JDLENBQUM7UUFDTCxDQUFDO1FBQ0QsT0FBTyxDQUFDLENBQUM7SUFDYixDQUFDLENBQUMsQ0FBQztJQUVILElBQUksSUFBSSxDQUFDLE1BQU0sS0FBSyxNQUFNLENBQUMsTUFBTTtRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsNkNBQTZDLENBQUMsQ0FBQztJQUNsRyxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2xILE9BQU8sV0FBVyxDQUFDLEtBQUssRUFBRSxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDO0FBQ2xELENBQUMifQ==
56
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zZXJ0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NxbC9oYW5kbGUvaW5zZXJ0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ25ELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFMUMsTUFBTSxVQUFVLFlBQVksQ0FBQyxLQUFhO0lBQ3RDLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUMscUdBQXFHLENBQUMsQ0FBQztJQUNqSSxJQUFJLENBQUMsS0FBSztRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLENBQUMsQ0FBQztJQUNyRCxNQUFNLFVBQVUsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDNUIsTUFBTSxJQUFJLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUV2QyxTQUFTLDBCQUEwQixDQUFDLEdBQVc7UUFDM0MsTUFBTSxNQUFNLEdBQWEsRUFBRSxDQUFDO1FBQzVCLElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQztRQUNqQixJQUFJLGFBQWEsR0FBRyxLQUFLLENBQUM7UUFDMUIsSUFBSSxhQUFhLEdBQUcsS0FBSyxDQUFDO1FBRTFCLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxHQUFHLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7WUFDbEMsTUFBTSxJQUFJLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3BCLElBQUksQ0FBQyxJQUFJLEtBQUssR0FBRyxDQUFDLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztnQkFDbkMsYUFBYSxHQUFHLENBQUMsYUFBYSxDQUFDO2dCQUMvQixPQUFPLElBQUksSUFBSSxDQUFDO1lBQ3BCLENBQUM7aUJBQU0sSUFBSSxJQUFJLEtBQUssR0FBRyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7Z0JBQ3hDLGFBQWEsR0FBRyxDQUFDLGFBQWEsQ0FBQztnQkFDL0IsT0FBTyxJQUFJLElBQUksQ0FBQztZQUNwQixDQUFDO2lCQUFNLElBQUksSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLGFBQWEsSUFBSSxDQUFDLGFBQWEsRUFBRSxDQUFDO2dCQUMxRCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNyQixPQUFPLEdBQUcsRUFBRSxDQUFDO1lBQ2pCLENBQUM7aUJBQU0sQ0FBQztnQkFDSixPQUFPLElBQUksSUFBSSxDQUFDO1lBQ3BCLENBQUM7UUFDTCxDQUFDO1FBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNyQixPQUFPLE1BQU0sQ0FBQztJQUNsQixDQUFDO0lBRUQsTUFBTSxTQUFTLEdBQUcsMEJBQTBCLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdkQsTUFBTSxNQUFNLEdBQUcsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRTtRQUM3QixDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ2IsSUFBSSxDQUFDLENBQUMsTUFBTSxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQ2hCLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsS0FBSyxHQUFHLEVBQUUsQ0FBQztnQkFDMUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUM7WUFDckMsQ0FBQztpQkFBTSxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLEtBQUssR0FBRyxFQUFFLENBQUM7Z0JBQ2pELENBQUMsR0FBRyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ3JDLENBQUM7UUFDTCxDQUFDO1FBQ0QsT0FBTyxDQUFDLENBQUM7SUFDYixDQUFDLENBQUMsQ0FBQztJQUVILElBQUksSUFBSSxDQUFDLE1BQU0sS0FBSyxNQUFNLENBQUMsTUFBTTtRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsNkNBQTZDLENBQUMsQ0FBQztJQUVsRyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7UUFDNUIsWUFBWSxDQUFDLENBQUMsQ0FBQztRQUNmLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7S0FDdEIsQ0FBQyxDQUFDO0lBQ0gsT0FBTyxXQUFXLENBQUMsS0FBSyxFQUFFLENBQUMsWUFBWSxDQUFDLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3BGLENBQUMifQ==
@@ -1,6 +1,6 @@
1
- import { parseReturn } from "../../sql/utils.js";
1
+ import { parseReturn } from "../../sql/utils/index.js";
2
2
  import { parseWhere } from "../../sql/where.js";
3
- import { JoinToRelationsEngine } from "../utils/join.util.js";
3
+ import { JoinToRelationsEngine } from "../../sql/utils/join.util.js";
4
4
  export function handleSelect(query, opts) {
5
5
  let whereClauseStr;
6
6
  let mainQueryPart = query;
@@ -52,4 +52,4 @@ export function parseSelectClause(selectClause) {
52
52
  select: selectClause.split(/\s*,\s*/),
53
53
  };
54
54
  }
55
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VsZWN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NxbC9oYW5kbGUvc2VsZWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDekMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV4QyxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUU5RCxNQUFNLFVBQVUsWUFBWSxDQUN4QixLQUFhLEVBQ2IsSUFBVztJQUVYLElBQUksY0FBa0MsQ0FBQztJQUN2QyxJQUFJLGFBQWEsR0FBRyxLQUFLLENBQUM7SUFFMUIsTUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUM5RCxJQUFJLFVBQVUsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQ3BCLGNBQWMsR0FBRyxLQUFLLENBQUMsU0FBUyxDQUFDLFVBQVUsR0FBRyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUN4RCxhQUFhLEdBQUcsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDbkQsQ0FBQztJQUVELE1BQU0sS0FBSyxHQUFHLGFBQWEsQ0FBQyxLQUFLLENBQUMsd0RBQXdELENBQUMsQ0FBQztJQUM1RixJQUFJLENBQUMsS0FBSztRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLENBQUMsQ0FBQztJQUVyRCxNQUFNLFdBQVcsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDcEMsTUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzVCLE1BQU0sUUFBUSxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDaEMsTUFBTSxXQUFXLEdBQUcsY0FBYyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUVyRSxNQUFNLFFBQVEsR0FBRyxpQkFBaUIsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUVoRCxJQUFJLFFBQVEsSUFBSSxJQUFJLEVBQUUsWUFBWSxFQUFFLENBQUM7UUFDakMsTUFBTSxXQUFXLEdBQUcsZ0JBQWdCLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDL0MsTUFBTSxlQUFlLEdBQUcsSUFBSSxxQkFBcUIsQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUN0RixNQUFNLFNBQVMsR0FBRyxlQUFlLENBQUMsY0FBYyxDQUFDLFdBQVcsRUFBRSxVQUFVLENBQUMsQ0FBQztRQUMxRSxNQUFNLElBQUksR0FBRyxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFDN0MsT0FBTyxXQUFXLENBQUMsZUFBZSxFQUFFLENBQUMsSUFBSSxFQUFFLFdBQVcsRUFBRSxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztJQUNsRixDQUFDO0lBRUQsT0FBTyxXQUFXLENBQUMsTUFBTSxFQUFFLENBQUMsVUFBVSxFQUFFLFdBQVcsRUFBRSxFQUFFLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztBQUN4RSxDQUFDO0FBRUQsTUFBTSxVQUFVLGdCQUFnQixDQUFDLFFBQWdCO0lBQzdDLE1BQU0sV0FBVyxHQUEyQixFQUFFLENBQUM7SUFDL0MsTUFBTSxTQUFTLEdBQUcsNkVBQTZFLENBQUM7SUFDaEcsSUFBSSxLQUFLLENBQUM7SUFDVixPQUFPLENBQUMsS0FBSyxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQztRQUNqRCxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDdkIsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssQ0FBQztRQUNoQyxNQUFNLFNBQVMsR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUM5QyxXQUFXLENBQUMsS0FBSyxDQUFDLEdBQUcsU0FBUyxDQUFDO0lBQ25DLENBQUM7SUFDRCxPQUFPLFdBQVcsQ0FBQztBQUN2QixDQUFDO0FBRUQsTUFBTSxVQUFVLGlCQUFpQixDQUFDLFlBQW9CO0lBQ2xELFlBQVksR0FBRyxZQUFZLENBQUMsSUFBSSxFQUFFLENBQUM7SUFFbkMsSUFBSSxZQUFZLEtBQUssR0FBRztRQUFFLE9BQU8sRUFBRSxDQUFDO0lBRXBDLE1BQU0sWUFBWSxHQUFHLFlBQVksQ0FBQyxLQUFLLENBQUMsc0JBQXNCLENBQUMsQ0FBQztJQUNoRSxJQUFJLFlBQVksRUFBRSxDQUFDO1FBQ2YsT0FBTztZQUNILE9BQU8sRUFBRSxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQztTQUM1QyxDQUFDO0lBQ04sQ0FBQztJQUVELE9BQU87UUFDSCxNQUFNLEVBQUUsWUFBWSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUM7S0FDeEMsQ0FBQztBQUNOLENBQUMifQ==
55
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VsZWN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NxbC9oYW5kbGUvc2VsZWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDekMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV4QyxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUU3RCxNQUFNLFVBQVUsWUFBWSxDQUN4QixLQUFhLEVBQ2IsSUFBVztJQUVYLElBQUksY0FBa0MsQ0FBQztJQUN2QyxJQUFJLGFBQWEsR0FBRyxLQUFLLENBQUM7SUFFMUIsTUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUM5RCxJQUFJLFVBQVUsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQ3BCLGNBQWMsR0FBRyxLQUFLLENBQUMsU0FBUyxDQUFDLFVBQVUsR0FBRyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUN4RCxhQUFhLEdBQUcsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDbkQsQ0FBQztJQUVELE1BQU0sS0FBSyxHQUFHLGFBQWEsQ0FBQyxLQUFLLENBQUMsd0RBQXdELENBQUMsQ0FBQztJQUM1RixJQUFJLENBQUMsS0FBSztRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLENBQUMsQ0FBQztJQUVyRCxNQUFNLFdBQVcsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDcEMsTUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzVCLE1BQU0sUUFBUSxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDaEMsTUFBTSxXQUFXLEdBQUcsY0FBYyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUVyRSxNQUFNLFFBQVEsR0FBRyxpQkFBaUIsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUVoRCxJQUFJLFFBQVEsSUFBSSxJQUFJLEVBQUUsWUFBWSxFQUFFLENBQUM7UUFDakMsTUFBTSxXQUFXLEdBQUcsZ0JBQWdCLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDL0MsTUFBTSxlQUFlLEdBQUcsSUFBSSxxQkFBcUIsQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUN0RixNQUFNLFNBQVMsR0FBRyxlQUFlLENBQUMsY0FBYyxDQUFDLFdBQVcsRUFBRSxVQUFVLENBQUMsQ0FBQztRQUMxRSxNQUFNLElBQUksR0FBRyxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFDN0MsT0FBTyxXQUFXLENBQUMsZUFBZSxFQUFFLENBQUMsSUFBSSxFQUFFLFdBQVcsRUFBRSxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztJQUNsRixDQUFDO0lBRUQsT0FBTyxXQUFXLENBQUMsTUFBTSxFQUFFLENBQUMsVUFBVSxFQUFFLFdBQVcsRUFBRSxFQUFFLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztBQUN4RSxDQUFDO0FBRUQsTUFBTSxVQUFVLGdCQUFnQixDQUFDLFFBQWdCO0lBQzdDLE1BQU0sV0FBVyxHQUEyQixFQUFFLENBQUM7SUFDL0MsTUFBTSxTQUFTLEdBQUcsNkVBQTZFLENBQUM7SUFDaEcsSUFBSSxLQUFLLENBQUM7SUFDVixPQUFPLENBQUMsS0FBSyxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQztRQUNqRCxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDdkIsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssQ0FBQztRQUNoQyxNQUFNLFNBQVMsR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUM5QyxXQUFXLENBQUMsS0FBSyxDQUFDLEdBQUcsU0FBUyxDQUFDO0lBQ25DLENBQUM7SUFDRCxPQUFPLFdBQVcsQ0FBQztBQUN2QixDQUFDO0FBRUQsTUFBTSxVQUFVLGlCQUFpQixDQUFDLFlBQW9CO0lBQ2xELFlBQVksR0FBRyxZQUFZLENBQUMsSUFBSSxFQUFFLENBQUM7SUFFbkMsSUFBSSxZQUFZLEtBQUssR0FBRztRQUFFLE9BQU8sRUFBRSxDQUFDO0lBRXBDLE1BQU0sWUFBWSxHQUFHLFlBQVksQ0FBQyxLQUFLLENBQUMsc0JBQXNCLENBQUMsQ0FBQztJQUNoRSxJQUFJLFlBQVksRUFBRSxDQUFDO1FBQ2YsT0FBTztZQUNILE9BQU8sRUFBRSxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQztTQUM1QyxDQUFDO0lBQ04sQ0FBQztJQUVELE9BQU87UUFDSCxNQUFNLEVBQUUsWUFBWSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUM7S0FDeEMsQ0FBQztBQUNOLENBQUMifQ==
@@ -1,4 +1,4 @@
1
- import { parseReturn, parseSet } from "../../sql/utils.js";
1
+ import { parseReturn, parseSet } from "../../sql/utils/index.js";
2
2
  import { parseWhere } from "../../sql/where.js";
3
3
  export function handleUpdate(query) {
4
4
  const match = query.match(/UPDATE\s+([\w\/]+)\s+SET\s+(.+)\s+WHERE\s+(.+)/i);
@@ -0,0 +1,7 @@
1
+ import { ValtheraQuery } from "../../types.js";
2
+ export declare function parseReturn(method: string, args: any[]): ValtheraQuery;
3
+ export declare function parseSet(setString: string): {
4
+ [k: string]: any;
5
+ };
6
+ export declare function removeQuotes(str: string): string;
7
+ export declare function parseNum(str: string): string | number;
@@ -0,0 +1,21 @@
1
+ export function parseReturn(method, args) {
2
+ return { method, args };
3
+ }
4
+ export function parseSet(setString) {
5
+ return Object.fromEntries(setString.split(/\s*,\s*/).map(pair => {
6
+ const [key, value] = pair.split(/\s*=\s*/);
7
+ let parsedValue = value;
8
+ if (!isNaN(+value))
9
+ parsedValue = +value;
10
+ else
11
+ parsedValue = removeQuotes(value);
12
+ return [removeQuotes(key), parsedValue];
13
+ }));
14
+ }
15
+ export function removeQuotes(str) {
16
+ return str.replace(/^['"`]|['"`]$/g, "");
17
+ }
18
+ export function parseNum(str) {
19
+ return isNaN(+str) ? str : +str;
20
+ }
21
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3FsL3V0aWxzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE1BQU0sVUFBVSxXQUFXLENBQUMsTUFBYyxFQUFFLElBQVc7SUFDbkQsT0FBTyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQztBQUM1QixDQUFDO0FBRUQsTUFBTSxVQUFVLFFBQVEsQ0FBQyxTQUFpQjtJQUN0QyxPQUFPLE1BQU0sQ0FBQyxXQUFXLENBQ3JCLFNBQVMsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFO1FBQ2xDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLEdBQVEsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUNoRCxJQUFJLFdBQVcsR0FBUSxLQUFLLENBQUM7UUFDN0IsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQztZQUFFLFdBQVcsR0FBRyxDQUFDLEtBQUssQ0FBQzs7WUFDcEMsV0FBVyxHQUFHLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUV2QyxPQUFPLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBQzVDLENBQUMsQ0FBQyxDQUNMLENBQUM7QUFDTixDQUFDO0FBRUQsTUFBTSxVQUFVLFlBQVksQ0FBQyxHQUFXO0lBQ3BDLE9BQU8sR0FBRyxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsRUFBRSxFQUFFLENBQUMsQ0FBQztBQUM3QyxDQUFDO0FBRUQsTUFBTSxVQUFVLFFBQVEsQ0FBQyxHQUFXO0lBQ2hDLE9BQU8sS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUM7QUFDcEMsQ0FBQyJ9
@@ -9,12 +9,13 @@ export class JoinToRelationsEngine {
9
9
  identifyPkFk(left, right, mainTable, knownFks) {
10
10
  const [leftTable, leftField] = left.split(".");
11
11
  const [rightTable, rightField] = right.split(".");
12
- // Check if one of the fields is already known as a foreign key
13
- const leftFull = `${leftTable}.${leftField}`;
14
- const rightFull = `${rightTable}.${rightField}`;
15
- if (knownFks.has(leftFull))
12
+ if (leftTable === mainTable)
13
+ return { pk: left, fk: right };
14
+ else if (rightTable === mainTable)
15
+ return { pk: right, fk: left };
16
+ if (knownFks.has(left))
16
17
  return { pk: right, fk: left };
17
- else if (knownFks.has(rightFull))
18
+ else if (knownFks.has(right))
18
19
  return { pk: left, fk: right };
19
20
  // If either of the above conditions are met, use a heuristic: set pk to the field named "id" or "_id"
20
21
  if (leftField === "id" || leftField === "_id") {
@@ -23,10 +24,6 @@ export class JoinToRelationsEngine {
23
24
  else if (rightField === "id" || rightField === "_id") {
24
25
  return { pk: right, fk: left };
25
26
  }
26
- if (leftTable === mainTable)
27
- return { pk: left, fk: right };
28
- else if (rightTable === mainTable)
29
- return { pk: right, fk: left };
30
27
  // If still unsure, throw an error
31
28
  throw new Error(`Cannot determine pk/fk from condition: "${left} = ${right}"`);
32
29
  }
@@ -38,7 +35,7 @@ export class JoinToRelationsEngine {
38
35
  const { pk, fk } = this.identifyPkFk(left, right, mainTable, knownFks);
39
36
  const [pkTable, pkField] = pk.split(".");
40
37
  const [fkTable, fkField] = fk.split(".");
41
- knownFks.add(`${fkTable}.${fkField}`);
38
+ knownFks.add(fk);
42
39
  const dbKey = this.tableDbMap?.[fkTable] || this.defaultDbKey;
43
40
  relations[alias] = {
44
41
  type: "1n",
@@ -52,4 +49,4 @@ export class JoinToRelationsEngine {
52
49
  return relations;
53
50
  }
54
51
  }
55
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiam9pbi51dGlsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NxbC91dGlscy9qb2luLnV0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsTUFBTSxPQUFPLHFCQUFxQjtJQUlsQjtJQUNBO0lBSkosZ0JBQWdCLEdBQWdCLElBQUksR0FBRyxFQUFFLENBQUM7SUFFbEQsWUFDWSxZQUFvQixFQUNwQixVQUFtQztRQURuQyxpQkFBWSxHQUFaLFlBQVksQ0FBUTtRQUNwQixlQUFVLEdBQVYsVUFBVSxDQUF5QjtJQUMzQyxDQUFDO0lBRUcsWUFBWSxDQUFDLElBQVksRUFBRSxLQUFhLEVBQUUsU0FBaUIsRUFBRSxRQUFxQjtRQUN0RixNQUFNLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDL0MsTUFBTSxDQUFDLFVBQVUsRUFBRSxVQUFVLENBQUMsR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBRWxELCtEQUErRDtRQUMvRCxNQUFNLFFBQVEsR0FBRyxHQUFHLFNBQVMsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUM3QyxNQUFNLFNBQVMsR0FBRyxHQUFHLFVBQVUsSUFBSSxVQUFVLEVBQUUsQ0FBQztRQUVoRCxJQUFJLFFBQVEsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1lBQ3RCLE9BQU8sRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsQ0FBQzthQUM5QixJQUFJLFFBQVEsQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDO1lBQzVCLE9BQU8sRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsQ0FBQztRQUVuQyxzR0FBc0c7UUFDdEcsSUFBSSxTQUFTLEtBQUssSUFBSSxJQUFJLFNBQVMsS0FBSyxLQUFLLEVBQUUsQ0FBQztZQUM1QyxPQUFPLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFFLENBQUM7UUFDbkMsQ0FBQzthQUFNLElBQUksVUFBVSxLQUFLLElBQUksSUFBSSxVQUFVLEtBQUssS0FBSyxFQUFFLENBQUM7WUFDckQsT0FBTyxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxDQUFDO1FBQ25DLENBQUM7UUFFRCxJQUFJLFNBQVMsS0FBSyxTQUFTO1lBQ3ZCLE9BQU8sRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsQ0FBQzthQUM5QixJQUFJLFVBQVUsS0FBSyxTQUFTO1lBQzdCLE9BQU8sRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsQ0FBQztRQUVuQyxrQ0FBa0M7UUFDbEMsTUFBTSxJQUFJLEtBQUssQ0FBQywyQ0FBMkMsSUFBSSxNQUFNLEtBQUssR0FBRyxDQUFDLENBQUM7SUFDbkYsQ0FBQztJQUVNLGNBQWMsQ0FDakIsV0FBdUIsRUFDdkIsU0FBaUI7UUFFakIsTUFBTSxTQUFTLEdBQTJCLEVBQUUsQ0FBQztRQUM3QyxNQUFNLFFBQVEsR0FBRyxJQUFJLEdBQUcsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztRQUVoRCxLQUFLLE1BQU0sQ0FBQyxLQUFLLEVBQUUsU0FBUyxDQUFDLElBQUksTUFBTSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDO1lBQzNELE1BQU0sQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUVqRCxNQUFNLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQUM7WUFFdkUsTUFBTSxDQUFDLE9BQU8sRUFBRSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ3pDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUV6QyxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsT0FBTyxJQUFJLE9BQU8sRUFBRSxDQUFDLENBQUM7WUFFdEMsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLElBQUksQ0FBQyxZQUFZLENBQUM7WUFFOUQsU0FBUyxDQUFDLEtBQUssQ0FBQyxHQUFHO2dCQUNmLElBQUksRUFBRSxJQUFJO2dCQUNWLElBQUksRUFBRSxDQUFDLEtBQUssRUFBRSxPQUFPLENBQUM7Z0JBQ3RCLEVBQUUsRUFBRSxPQUFPO2dCQUNYLEVBQUUsRUFBRSxPQUFPO2dCQUNYLEVBQUUsRUFBRSxLQUFLO2FBQ1osQ0FBQztRQUNOLENBQUM7UUFFRCxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsUUFBUSxDQUFDO1FBRWpDLE9BQU8sU0FBUyxDQUFDO0lBQ3JCLENBQUM7Q0FDSiJ9
52
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiam9pbi51dGlsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NxbC91dGlscy9qb2luLnV0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsTUFBTSxPQUFPLHFCQUFxQjtJQUlsQjtJQUNBO0lBSkosZ0JBQWdCLEdBQWdCLElBQUksR0FBRyxFQUFFLENBQUM7SUFFbEQsWUFDWSxZQUFvQixFQUNwQixVQUFtQztRQURuQyxpQkFBWSxHQUFaLFlBQVksQ0FBUTtRQUNwQixlQUFVLEdBQVYsVUFBVSxDQUF5QjtJQUMzQyxDQUFDO0lBRUcsWUFBWSxDQUFDLElBQVksRUFBRSxLQUFhLEVBQUUsU0FBaUIsRUFBRSxRQUFxQjtRQUN0RixNQUFNLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDL0MsTUFBTSxDQUFDLFVBQVUsRUFBRSxVQUFVLENBQUMsR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBRWxELElBQUksU0FBUyxLQUFLLFNBQVM7WUFDdkIsT0FBTyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxDQUFDO2FBQzlCLElBQUksVUFBVSxLQUFLLFNBQVM7WUFDN0IsT0FBTyxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxDQUFDO1FBRW5DLElBQUksUUFBUSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUM7WUFDbEIsT0FBTyxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxDQUFDO2FBQzlCLElBQUksUUFBUSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUM7WUFDeEIsT0FBTyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxDQUFDO1FBRW5DLHNHQUFzRztRQUN0RyxJQUFJLFNBQVMsS0FBSyxJQUFJLElBQUksU0FBUyxLQUFLLEtBQUssRUFBRSxDQUFDO1lBQzVDLE9BQU8sRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsQ0FBQztRQUNuQyxDQUFDO2FBQU0sSUFBSSxVQUFVLEtBQUssSUFBSSxJQUFJLFVBQVUsS0FBSyxLQUFLLEVBQUUsQ0FBQztZQUNyRCxPQUFPLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLENBQUM7UUFDbkMsQ0FBQztRQUVELGtDQUFrQztRQUNsQyxNQUFNLElBQUksS0FBSyxDQUFDLDJDQUEyQyxJQUFJLE1BQU0sS0FBSyxHQUFHLENBQUMsQ0FBQztJQUNuRixDQUFDO0lBRU0sY0FBYyxDQUNqQixXQUF1QixFQUN2QixTQUFpQjtRQUVqQixNQUFNLFNBQVMsR0FBMkIsRUFBRSxDQUFDO1FBQzdDLE1BQU0sUUFBUSxHQUFHLElBQUksR0FBRyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO1FBRWhELEtBQUssTUFBTSxDQUFDLEtBQUssRUFBRSxTQUFTLENBQUMsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUM7WUFDM0QsTUFBTSxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsR0FBRyxTQUFTLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1lBRWpELE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxRQUFRLENBQUMsQ0FBQztZQUV2RSxNQUFNLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDekMsTUFBTSxDQUFDLE9BQU8sRUFBRSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBRXpDLFFBQVEsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUM7WUFFakIsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLElBQUksQ0FBQyxZQUFZLENBQUM7WUFFOUQsU0FBUyxDQUFDLEtBQUssQ0FBQyxHQUFHO2dCQUNmLElBQUksRUFBRSxJQUFJO2dCQUNWLElBQUksRUFBRSxDQUFDLEtBQUssRUFBRSxPQUFPLENBQUM7Z0JBQ3RCLEVBQUUsRUFBRSxPQUFPO2dCQUNYLEVBQUUsRUFBRSxPQUFPO2dCQUNYLEVBQUUsRUFBRSxLQUFLO2FBQ1osQ0FBQztRQUNOLENBQUM7UUFFRCxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsUUFBUSxDQUFDO1FBRWpDLE9BQU8sU0FBUyxDQUFDO0lBQ3JCLENBQUM7Q0FDSiJ9
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@wxn0brp/db-string-query",
3
- "version": "0.0.9",
3
+ "version": "0.0.11",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "repository": {
@@ -1,7 +1,8 @@
1
- import { parseReturn } from "#sql/utils";
1
+ import { parseNum, parseReturn } from "#sql/utils";
2
+ import { removeQuotes } from "#sql/utils";
2
3
 
3
4
  export function handleInsert(query: string) {
4
- const match = query.match(/INSERT INTO ([\w\/]+)\s*\(([^)]+)\)\s*VALUES\s*\(([^)]+)\)/i);
5
+ const match = query.match(/INSERT INTO\s+((?:`[^`]+`|"[^"]+"|\w+(?:\.\w+)*))\s*\(\s*([^)]+)\s*\)\s*VALUES\s*\(\s*([^)]+)\s*\)/i);
5
6
  if (!match) throw new Error("Invalid INSERT syntax");
6
7
  const collection = match[1];
7
8
  const keys = match[2].split(/\s*,\s*/);
@@ -45,6 +46,10 @@ export function handleInsert(query: string) {
45
46
  });
46
47
 
47
48
  if (keys.length !== values.length) throw new Error("Number of columns and values does not match");
48
- const data = Object.fromEntries(keys.map((k, i) => [k, isNaN(values[i] as any) ? values[i] : Number(values[i])]));
49
- return parseReturn("add", [collection, data]);
49
+
50
+ const data = keys.map((k, i) => [
51
+ removeQuotes(k),
52
+ parseNum(values[i])
53
+ ]);
54
+ return parseReturn("add", [removeQuotes(collection), Object.fromEntries(data)]);
50
55
  }
@@ -1,7 +1,7 @@
1
1
  import { parseReturn } from "#sql/utils";
2
2
  import { parseWhere } from "#sql/where";
3
3
  import { Opts } from "#types.js";
4
- import { JoinToRelationsEngine } from "../utils/join.util.js";
4
+ import { JoinToRelationsEngine } from "#sql/utils/join.util";
5
5
 
6
6
  export function handleSelect(
7
7
  query: string,
@@ -0,0 +1,26 @@
1
+ import { ValtheraQuery } from "../../types";
2
+
3
+ export function parseReturn(method: string, args: any[]): ValtheraQuery {
4
+ return { method, args };
5
+ }
6
+
7
+ export function parseSet(setString: string) {
8
+ return Object.fromEntries(
9
+ setString.split(/\s*,\s*/).map(pair => {
10
+ const [key, value]: any = pair.split(/\s*=\s*/);
11
+ let parsedValue: any = value;
12
+ if (!isNaN(+value)) parsedValue = +value;
13
+ else parsedValue = removeQuotes(value);
14
+
15
+ return [removeQuotes(key), parsedValue];
16
+ })
17
+ );
18
+ }
19
+
20
+ export function removeQuotes(str: string) {
21
+ return str.replace(/^['"`]|['"`]$/g, "");
22
+ }
23
+
24
+ export function parseNum(str: string) {
25
+ return isNaN(+str) ? str : +str;
26
+ }
@@ -13,13 +13,14 @@ export class JoinToRelationsEngine {
13
13
  const [leftTable, leftField] = left.split(".");
14
14
  const [rightTable, rightField] = right.split(".");
15
15
 
16
- // Check if one of the fields is already known as a foreign key
17
- const leftFull = `${leftTable}.${leftField}`;
18
- const rightFull = `${rightTable}.${rightField}`;
16
+ if (leftTable === mainTable)
17
+ return { pk: left, fk: right };
18
+ else if (rightTable === mainTable)
19
+ return { pk: right, fk: left };
19
20
 
20
- if (knownFks.has(leftFull))
21
+ if (knownFks.has(left))
21
22
  return { pk: right, fk: left };
22
- else if (knownFks.has(rightFull))
23
+ else if (knownFks.has(right))
23
24
  return { pk: left, fk: right };
24
25
 
25
26
  // If either of the above conditions are met, use a heuristic: set pk to the field named "id" or "_id"
@@ -29,11 +30,6 @@ export class JoinToRelationsEngine {
29
30
  return { pk: right, fk: left };
30
31
  }
31
32
 
32
- if (leftTable === mainTable)
33
- return { pk: left, fk: right };
34
- else if (rightTable === mainTable)
35
- return { pk: right, fk: left };
36
-
37
33
  // If still unsure, throw an error
38
34
  throw new Error(`Cannot determine pk/fk from condition: "${left} = ${right}"`);
39
35
  }
@@ -53,7 +49,7 @@ export class JoinToRelationsEngine {
53
49
  const [pkTable, pkField] = pk.split(".");
54
50
  const [fkTable, fkField] = fk.split(".");
55
51
 
56
- knownFks.add(`${fkTable}.${fkField}`);
52
+ knownFks.add(fk);
57
53
 
58
54
  const dbKey = this.tableDbMap?.[fkTable] || this.defaultDbKey;
59
55
 
@@ -4,7 +4,7 @@ import { describe, expect, test } from "bun:test";
4
4
  const sqlParser = new SQLParser();
5
5
 
6
6
  describe("SQL Parser - DELETE", () => {
7
- test("should parse a simple DELETE query", () => {
7
+ test("1. should parse a simple DELETE query", () => {
8
8
  const query = "DELETE FROM users WHERE id = 1";
9
9
  const parsedQuery = sqlParser.parse(query);
10
10
 
@@ -15,7 +15,7 @@ describe("SQL Parser - DELETE", () => {
15
15
  expect(parsedQuery.args[1]).toEqual({ id: 1 }); // where clause
16
16
  });
17
17
 
18
- test("should parse DELETE query without WHERE clause", () => {
18
+ test("2. should parse DELETE query without WHERE clause", () => {
19
19
  const query = "DELETE FROM users";
20
20
  const parsedQuery = sqlParser.parse(query);
21
21
 
@@ -26,7 +26,7 @@ describe("SQL Parser - DELETE", () => {
26
26
  expect(parsedQuery.args[1]).toEqual({}); // empty where clause
27
27
  });
28
28
 
29
- test("should parse DELETE with complex WHERE conditions", () => {
29
+ test("3. should parse DELETE with complex WHERE conditions", () => {
30
30
  const query = "DELETE FROM users WHERE age > 65 AND status = 'inactive'";
31
31
  const parsedQuery = sqlParser.parse(query);
32
32
 
@@ -37,7 +37,7 @@ describe("SQL Parser - DELETE", () => {
37
37
  expect(parsedQuery.args[1]).toEqual({ $gt: { age: 65 }, status: "inactive" }); // where clause
38
38
  });
39
39
 
40
- test("should parse DELETE with string values", () => {
40
+ test("4. should parse DELETE with string values", () => {
41
41
  const query = "DELETE FROM posts WHERE title = 'Unwanted Post'";
42
42
  const parsedQuery = sqlParser.parse(query);
43
43
 
@@ -48,7 +48,7 @@ describe("SQL Parser - DELETE", () => {
48
48
  expect(parsedQuery.args[1]).toEqual({ title: "Unwanted Post" }); // where clause
49
49
  });
50
50
 
51
- test("should parse DELETE with numeric values", () => {
51
+ test("5. should parse DELETE with numeric values", () => {
52
52
  const query = "DELETE FROM products WHERE price = 0";
53
53
  const parsedQuery = sqlParser.parse(query);
54
54
 
@@ -59,7 +59,7 @@ describe("SQL Parser - DELETE", () => {
59
59
  expect(parsedQuery.args[1]).toEqual({ price: 0 }); // where clause
60
60
  });
61
61
 
62
- test("should throw error for invalid DELETE syntax", () => {
62
+ test("6. should throw error for invalid DELETE syntax", () => {
63
63
  const query = "DELETE users WHERE id = 1"; // missing FROM keyword
64
64
 
65
65
  expect(() => {
@@ -67,7 +67,7 @@ describe("SQL Parser - DELETE", () => {
67
67
  }).toThrow("Invalid DELETE syntax");
68
68
  });
69
69
 
70
- test("should parse DELETE with quoted string values", () => {
70
+ test("7. should parse DELETE with quoted string values", () => {
71
71
  const query = "DELETE FROM users WHERE name = 'John Doe'";
72
72
  const parsedQuery = sqlParser.parse(query);
73
73
 
@@ -78,7 +78,7 @@ describe("SQL Parser - DELETE", () => {
78
78
  expect(parsedQuery.args[1]).toEqual({ name: "John Doe" }); // where clause
79
79
  });
80
80
 
81
- test("should handle DELETE with multiple condition types", () => {
81
+ test("8. should handle DELETE with multiple condition types", () => {
82
82
  const query = "DELETE FROM orders WHERE total > 1000 AND status = 'cancelled' AND user_id != 5";
83
83
  const parsedQuery = sqlParser.parse(query);
84
84
 
@@ -4,7 +4,7 @@ import { describe, expect, test } from "bun:test";
4
4
  const sqlParser = new SQLParser();
5
5
 
6
6
  describe("SQL Parser - SELECT", () => {
7
- test("should parse with ;", () => {
7
+ test("1. should parse with ;", () => {
8
8
  const query = "SELECT * FROM users WHERE id = 1;";
9
9
  const parsedQuery = sqlParser.parse(query);
10
10
 
@@ -4,7 +4,7 @@ import { describe, expect, test } from "bun:test";
4
4
  const sqlParser = new SQLParser();
5
5
 
6
6
  describe("SQL Parser - INSERT", () => {
7
- test("should parse a simple INSERT query", () => {
7
+ test("1. should parse a simple INSERT query", () => {
8
8
  const query = "INSERT INTO users (name, email) VALUES ('John', 'john@example.com')";
9
9
  const parsedQuery = sqlParser.parse(query);
10
10
 
@@ -15,7 +15,7 @@ describe("SQL Parser - INSERT", () => {
15
15
  expect(parsedQuery.args[1]).toEqual({ name: "John", email: "john@example.com" }); // data
16
16
  });
17
17
 
18
- test("should parse INSERT with numeric values", () => {
18
+ test("2. should parse INSERT with numeric values", () => {
19
19
  const query = "INSERT INTO products (id, name, price) VALUES (1, 'Laptop', 999.99)";
20
20
  const parsedQuery = sqlParser.parse(query);
21
21
 
@@ -26,7 +26,7 @@ describe("SQL Parser - INSERT", () => {
26
26
  expect(parsedQuery.args[1]).toEqual({ id: 1, name: "Laptop", price: 999.99 }); // data with numeric values
27
27
  });
28
28
 
29
- test("should parse INSERT with mixed data types", () => {
29
+ test("3. should parse INSERT with mixed data types", () => {
30
30
  const query = "INSERT INTO users (id, name, active, score) VALUES (1, 'Jane', true, 95.5)";
31
31
  const parsedQuery = sqlParser.parse(query);
32
32
 
@@ -37,7 +37,7 @@ describe("SQL Parser - INSERT", () => {
37
37
  expect(parsedQuery.args[1]).toEqual({ id: 1, name: "Jane", active: "true", score: 95.5 });
38
38
  });
39
39
 
40
- test("should handle INSERT with quoted values containing commas", () => {
40
+ test("4. should handle INSERT with quoted values containing commas", () => {
41
41
  const query = `INSERT INTO posts (title, content) VALUES ('Hello, World!', 'This is a post, with commas.')`;
42
42
  const parsedQuery = sqlParser.parse(query);
43
43
 
@@ -51,7 +51,7 @@ describe("SQL Parser - INSERT", () => {
51
51
  });
52
52
  });
53
53
 
54
- test("should throw error for mismatched columns and values", () => {
54
+ test("5. should throw error for mismatched columns and values", () => {
55
55
  const query = "INSERT INTO users (name, email) VALUES ('John')"; // missing value
56
56
 
57
57
  expect(() => {
@@ -59,7 +59,7 @@ describe("SQL Parser - INSERT", () => {
59
59
  }).toThrow("Number of columns and values does not match");
60
60
  });
61
61
 
62
- test("should throw error for invalid INSERT syntax", () => {
62
+ test("6. should throw error for invalid INSERT syntax", () => {
63
63
  const query = "INSERT users (name) VALUES ('John')"; // missing INTO
64
64
 
65
65
  expect(() => {
@@ -67,7 +67,7 @@ describe("SQL Parser - INSERT", () => {
67
67
  }).toThrow("Invalid INSERT syntax");
68
68
  });
69
69
 
70
- test("should handle INSERT with double quotes", () => {
70
+ test("7. should handle INSERT with double quotes", () => {
71
71
  const query = 'INSERT INTO users (name, email) VALUES ("Jane", "jane@example.com")';
72
72
  const parsedQuery = sqlParser.parse(query);
73
73
 
@@ -78,7 +78,7 @@ describe("SQL Parser - INSERT", () => {
78
78
  expect(parsedQuery.args[1]).toEqual({ name: "Jane", email: "jane@example.com" });
79
79
  });
80
80
 
81
- test("should handle INSERT with mixed quote types", () => {
81
+ test("8. should handle INSERT with mixed quote types", () => {
82
82
  const query = `INSERT INTO users (name, email, description) VALUES ("Jane", 'jane@example.com', "User, with 'special' chars")`;
83
83
  const parsedQuery = sqlParser.parse(query);
84
84
 
@@ -4,7 +4,7 @@ import { describe, expect, test } from "bun:test";
4
4
  const sqlParser = new SQLParser();
5
5
 
6
6
  describe("SQL Parser - SELECT", () => {
7
- test("should parse a simple SELECT query", () => {
7
+ test("1. should parse a simple SELECT query", () => {
8
8
  const query = "SELECT * FROM users WHERE id = 1";
9
9
  const parsedQuery = sqlParser.parse(query);
10
10
 
@@ -15,7 +15,7 @@ describe("SQL Parser - SELECT", () => {
15
15
  expect(parsedQuery.args[1]).toEqual({ id: 1 }); // where clause
16
16
  });
17
17
 
18
- test("should parse a SELECT query with specific columns", () => {
18
+ test("2. should parse a SELECT query with specific columns", () => {
19
19
  const query = "SELECT name, email FROM users WHERE active = 1";
20
20
  const parsedQuery = sqlParser.parse(query);
21
21
 
@@ -27,7 +27,7 @@ describe("SQL Parser - SELECT", () => {
27
27
  expect(parsedQuery.args[3]).toEqual({ select: ["name", "email"] }); // select options
28
28
  });
29
29
 
30
- test("should parse a SELECT query without WHERE clause", () => {
30
+ test("3. should parse a SELECT query without WHERE clause", () => {
31
31
  const query = "SELECT * FROM users";
32
32
  const parsedQuery = sqlParser.parse(query);
33
33
 
@@ -38,7 +38,7 @@ describe("SQL Parser - SELECT", () => {
38
38
  expect(parsedQuery.args[1]).toEqual({}); // empty where clause
39
39
  });
40
40
 
41
- test("should parse a SELECT query with EXCLUDE clause", () => {
41
+ test("4. should parse a SELECT query with EXCLUDE clause", () => {
42
42
  const query = "SELECT * EXCLUDE password, createdAt FROM users WHERE active = 1";
43
43
  const parsedQuery = sqlParser.parse(query);
44
44
 
@@ -50,7 +50,7 @@ describe("SQL Parser - SELECT", () => {
50
50
  expect(parsedQuery.args[3]).toEqual({ exclude: ["password", "createdAt"] }); // exclude options
51
51
  });
52
52
 
53
- test("should parse a SELECT query with complex WHERE conditions", () => {
53
+ test("5. should parse a SELECT query with complex WHERE conditions", () => {
54
54
  const query = "SELECT * FROM users WHERE age > 18 AND status = 'active'";
55
55
  const parsedQuery = sqlParser.parse(query);
56
56
 
@@ -61,7 +61,7 @@ describe("SQL Parser - SELECT", () => {
61
61
  expect(parsedQuery.args[1]).toEqual({ $gt: { age: 18 }, status: "active" }); // where clause
62
62
  });
63
63
 
64
- test("should parse a SELECT query with a JOIN clause", () => {
64
+ test("6. should parse a SELECT query with a JOIN clause", () => {
65
65
  const query = "SELECT posts.*, users.name FROM posts JOIN users ON posts.userId = users.id WHERE posts.id = 1";
66
66
  const parsedQuery = sqlParser.parse(query, { defaultDbKey: "db" });
67
67
 
@@ -73,16 +73,16 @@ describe("SQL Parser - SELECT", () => {
73
73
  expect(parsedQuery.args[2]).toEqual({
74
74
  users: {
75
75
  type: '1n',
76
- path: ['db', 'posts'],
77
- pk: 'id',
78
- fk: 'userId',
76
+ path: ['db', 'users'],
77
+ pk: 'userId',
78
+ fk: 'id',
79
79
  as: 'users'
80
80
  }
81
81
  }); // relations
82
82
  expect(parsedQuery.args[3]).toEqual({ select: ["posts.*", "users.name"] }); // select options
83
83
  });
84
84
 
85
- test("should throw error for invalid SELECT syntax", () => {
85
+ test("7. should throw error for invalid SELECT syntax", () => {
86
86
  const query = "SELECT FROM users";
87
87
 
88
88
  expect(() => {
@@ -4,7 +4,7 @@ import { describe, expect, test } from "bun:test";
4
4
  const sqlParser = new SQLParser();
5
5
 
6
6
  describe("SQL Parser - UPDATE", () => {
7
- test("should parse a simple UPDATE query", () => {
7
+ test("1. should parse a simple UPDATE query", () => {
8
8
  const query = "UPDATE users SET name = 'John' WHERE id = 1";
9
9
  const parsedQuery = sqlParser.parse(query);
10
10
 
@@ -16,7 +16,7 @@ describe("SQL Parser - UPDATE", () => {
16
16
  expect(parsedQuery.args[2]).toEqual({ name: "John" }); // set clause
17
17
  });
18
18
 
19
- test("should parse UPDATE with multiple SET fields", () => {
19
+ test("2. should parse UPDATE with multiple SET fields", () => {
20
20
  const query = "UPDATE users SET name = 'Jane', email = 'jane@example.com' WHERE id = 2";
21
21
  const parsedQuery = sqlParser.parse(query);
22
22
 
@@ -28,7 +28,7 @@ describe("SQL Parser - UPDATE", () => {
28
28
  expect(parsedQuery.args[2]).toEqual({ name: "Jane", email: "jane@example.com" }); // set clause
29
29
  });
30
30
 
31
- test("should parse UPDATE with numeric values", () => {
31
+ test("3. should parse UPDATE with numeric values", () => {
32
32
  const query = "UPDATE products SET price = 29.99, stock = 100 WHERE id = 1";
33
33
  const parsedQuery = sqlParser.parse(query);
34
34
 
@@ -40,7 +40,7 @@ describe("SQL Parser - UPDATE", () => {
40
40
  expect(parsedQuery.args[2]).toEqual({ price: 29.99, stock: 100 }); // set clause
41
41
  });
42
42
 
43
- test("should parse UPDATE with string values containing spaces", () => {
43
+ test("4. should parse UPDATE with string values containing spaces", () => {
44
44
  const query = "UPDATE posts SET title = 'Hello World Post', content = 'This is the content' WHERE id = 1";
45
45
  const parsedQuery = sqlParser.parse(query);
46
46
 
@@ -55,7 +55,7 @@ describe("SQL Parser - UPDATE", () => {
55
55
  }); // set clause
56
56
  });
57
57
 
58
- test("should throw error for invalid UPDATE syntax", () => {
58
+ test("5. should throw error for invalid UPDATE syntax", () => {
59
59
  const query = "UPDATE users name = 'John' WHERE id = 1"; // missing SET keyword
60
60
 
61
61
  expect(() => {
@@ -63,7 +63,7 @@ describe("SQL Parser - UPDATE", () => {
63
63
  }).toThrow("Invalid UPDATE syntax");
64
64
  });
65
65
 
66
- test("should handle UPDATE with complex WHERE conditions", () => {
66
+ test("6. should handle UPDATE with complex WHERE conditions", () => {
67
67
  const query = "UPDATE users SET status = 'inactive' WHERE age > 65 AND active = 1";
68
68
  const parsedQuery = sqlParser.parse(query);
69
69
 
@@ -75,7 +75,7 @@ describe("SQL Parser - UPDATE", () => {
75
75
  expect(parsedQuery.args[2]).toEqual({ status: "inactive" }); // set clause
76
76
  });
77
77
 
78
- test("should throw error when there is no WHERE clause", () => {
78
+ test("7. should throw error when there is no WHERE clause", () => {
79
79
  const query = "UPDATE users SET name = 'John'"; // missing WHERE
80
80
 
81
81
  expect(() => {
@@ -2,7 +2,7 @@ import { JoinClause, JoinToRelationsEngine } from "#sql/utils/join.util";
2
2
  import { describe, expect, test } from "bun:test";
3
3
 
4
4
  describe("SQL Utils - Join", () => {
5
- test("works", () => {
5
+ test("1. works", () => {
6
6
  const joinClauses: JoinClause = {
7
7
  comments: "posts.id = comments.post_id",
8
8
  users: "comments.user_id = users.id",
@@ -1 +1 @@
1
- window.hierarchyData = "eJyVjssKwjAQRf/lrmPLCIrJV7hyI0VCM6XRmGomgiL9d6mPogtBN7OYmXvuuSJ1XRaYNelKIXETuM6+iwJzBelhRrtnGKxsyC0nu7RJOEFh56ODmc7mCqcUYOBj5tTYmqXMlwNL8Rkp2rwPUKiDFYFBFjcZGJMxNxxbH1ziCLPWWhFR1Svodw/HjT2FPArQdPESuJNZyq0Uz6+vnY9Fr0BE/8HlGDY+Oj7/2tH3Nx6zdwM="
1
+ window.hierarchyData = "eJyVjssKwjAQRf/lrmPbFJQ2X+HKjYiEZkqjMdVMBKX03yU+ii4E3cxiZu65Z0Do+8hQa1lvBAK1jppoe89QA2SdptcHgsJKu9hR0EsdmAIE9tYbqHK+EDgHBwXrI4VWN8R5vB6Js89I1sWDg0DjNDMUIptZYsymXDp21plAPhkVlZBlsRkFZFG9mRhq9dnFSUGW1UvhzibOd5w9v762PhYJXhb/wfnkttYbuvzaMY43yBF3UQ=="
@@ -1 +1 @@
1
- window.navigationData = "eJylll9P2zAUxb+L9xoxGgobfaUIbS/bgLEHVFVufLuYGSfYDhQhvvsUu03sxHEc8Rqf8/O5vv6T+zekYKfQAqEElVjlaIEeC1IxkJ+PcvXIUIL+UU7QIk1QllNGBHC0uG9sd5ipHARebn5iIUHIlvOMBcUbTeqpXPZJ+p54iNfAsKIFH2M2uh51ZXEpJ7DrV6k/f7TUPuzT815NNmWjNvj57Hx+cjyPLTnIFpbepdulP3hwDzKqaAJbXDHV+jOGpTT+/ZjLmaVfnbnlUz3mQ+eYEwYDg1nBGGR1af3o8omtjXndyqKqMa4LAVhBy91WXCMGyZbLnebM7qKRLUVRTkXXnlHw5Y5KJaeijWsUfgVqKvkKVA9rN54AA3uVPd0zkgmdW3aY3qQHquUIBqVcglDBoEYyIei3DtMb9EC1HMGgEuoOBIMayYSgNx2mN+iBajkCO0rfd98Lyi8YriSMbdk9vOsam8DEMOIJM9i24GJXJcEj29dIJiz27w7Tm/ZAtRyeoBEvW82Mf90GL/oWE3XfV4oyz3NTU/RQVBjdqmtQleBDq2VglnB8wwxuc4t147nVrIe0oPyoVgcKXDeiqFLrLX9bNO/+Jf9LOfi70MV7rf3uJM5c3ROjXssA3ndQ0uPzL7PTtLMJX3IQA8dFD8X3/Y9LcltlWK1u5Gjo6vqp9OeoRD9K+82lXIHY4qxB1MMdzumZ58/O/DEGQK4wBvmrAvEaQdS6PnD1vvoPAUgwPQ=="
1
+ window.navigationData = "eJylllFv2yAUhf8Le7W6xk27Na9NVW0P3dpu60MVVcS+mUkJdgFnqab+98kQ29hgjLVXc87HgXvBPP1FEg4SLRCKUIFlhhZol6clBfHxJJM7iiL0QliKFnGEkozQlANDi6fG9gtTmQHHy/V3zAVw0XL2mBO8ViRL1WWfxe+Rg3gPFEuSszFmo7OoK4NLWAoHe5Xq8/8u1YZ92B/V6bpo1Bo/n13Oz07noUv2srmh79LNpW8duK0IWnQKG1xS2foTioXQ/uNYlzOLP3fmFq/VmAudYZZSGBhMckohqZZmRxev9Fmbn1tZ0Gq064oDltByNyVTiEGy4epOc2FWUcuWPC+moivPKPj6QIQUU9HaNQq/ATmVfAPSwpqFT4GCucuO6mnJhMote0xn0ppqOLxBCRPApTeolkwI+qXHdAatqYbDG1RAVQFvUC2ZEPShx3QGramGw9NR6r77mhN2RXEpYKxlj/C+a2wCHUOLJ8xg2rybXRYpHmlfLZmw2T97TGfammo4HEED/mwVM/zvNnjRt5ig+76UhIqBS90TVNkmxFXFvC13Q5tp8mrtWEvdgyw5CyZq+XifDp4ui/jguFJbHIddvoe7MpfDZ8pEmnpvq29zwk4qp680jSioPNVB/pE3r5lr9pswcPdWH++02j0Xdebq3wPyrfDgXcc/Pr38NDuPe0frTwZ84BJQQ+G9+tgldcumWa1u5MCr1dmp1OegRN8K8yVBmAS+wUmDqIZ7nPMLx3tVv4M9oK4wBHlXAn8LICqdDVy9r/4BTs99eA=="