@primate/core 0.5.0 → 0.6.0

package/lib/private/db/migrate/store.js

@@ -0,0 +1,33 @@
+import bundle from "#db/migrate/bundle";
+import E from "#errors";
+import key from "#orm/key";
+import store from "#orm/store";
+import fs from "@rcompat/fs";
+import p from "pema";
+export default async function migration_store() {
+    const root = await fs.project.root();
+    const { path } = await (async () => {
+        const ts = root.join("config", "app.ts");
+        if (await ts.exists())
+            return ts;
+        const js = root.join("config", "app.js");
+        if (await js.exists())
+            return js;
+        throw E.config_file_missing();
+    })();
+    const entry = `export { default } from "${path}";`;
+    const app = await bundle(entry);
+    const migrations_config = app.config("db.migrations");
+    if (migrations_config == undefined)
+        throw E.config_missing("db.migrations");
+    const { table, db } = migrations_config;
+    return store({
+        name: table,
+        db,
+        schema: {
+            id: key.primary(p.u16, { generate: false }),
+            applied: p.date,
+        },
+    });
+}
+//# sourceMappingURL=store.js.map

package/lib/private/db/sql.js

@@ -1,4 +1,4 @@
-import E from "#db/error";
+import E from "#db/errors";
 import assert from "@rcompat/assert";
 import is from "@rcompat/is";
 function normalize_sort(key, direction) {
@@ -115,7 +115,7 @@ const sql = {
         for (const [key, value] of Object.entries(row)) {
             if (value === null)
                 continue;
-            assert.true(key in types, `unexpected column: ${key}`);
+            assert.true(key in types, E.field_unknown(key, "unbind"));
             out[key] = unbinder(types[key], value);
         }
         return out;
@@ -128,7 +128,7 @@ const sql = {
         const base_fields = relation_args.fields ?? Object.keys(as.types);
         const grouped = new Map();
         for (const base_row of args.rows) {
-            const pk_value = base_row[base_pk_key];
+            const pk_value = unbind(as.types[as.pk], base_row[base_pk_key]);
             const relation_entries = Object.entries(relation_args.with);
             if (!grouped.has(pk_value)) {
                 const parent = {};