Use correct query syntax for creating records (#43)

ronin-co · Jan 28, 2025 · 7b5575f · 7b5575f
1 parent 4b09fbb
commit 7b5575f
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -41,12 +41,12 @@
     "resolve-from": "5.0.0"
   },
   "devDependencies": {
-    "ronin": "6.0.22",
+    "ronin": "6.0.25",
     "@biomejs/biome": "1.9.4",
-    "@types/bun": "1.2.0",
+    "@types/bun": "1.2.1",
     "@types/ini": "4.1.1",
     "bun-bagel": "1.1.0",
-    "tsup": "8.3.5",
+    "tsup": "8.3.6",
     "typescript": "5.7.3"
   }
 }
diff --git a/src/utils/queries.ts b/src/utils/queries.ts
@@ -140,7 +140,7 @@ export const createTempModelQuery = (
   queries.push(createModelQuery(tempModelSlug, { fields }));
 
   // Move all the data to the copied model
-  queries.push(`add.${tempModelSlug}.to(() => get.${modelSlug}())`);
+  queries.push(`add.${tempModelSlug}.with(() => get.${modelSlug}())`);
 
   if (customQueries) {
     queries.push(...customQueries);

diff --git a/tests/fixtures/index.ts b/tests/fixtures/index.ts
@@ -197,7 +197,7 @@ export const TestD = model({
       action: 'INSERT',
       when: 'BEFORE',
       // @ts-expect-error Fix in models
-      effects: (): Array<Effect> => [add.comment.to({ name: 'Test' })],
+      effects: (): Array<Effect> => [add.comment.with({ name: 'Test' })],
     },
   ],
 }) as unknown as Model;
@@ -212,7 +212,7 @@ export const TestE = model({
       action: 'DELETE',
       when: 'AFTER',
       // @ts-expect-error Fix in models
-      effects: (): Array<Effect> => [add.comment.to({ name: 'Test' })],
+      effects: (): Array<Effect> => [add.comment.with({ name: 'Test' })],
     },
   ],
 }) as unknown as Model;

diff --git a/tests/utils/field.test.ts b/tests/utils/field.test.ts
@@ -172,7 +172,7 @@ describe('fields', () => {
       expect(diff).toHaveLength(4);
       expect(diff).toStrictEqual([
         "create.model({slug:'RONIN_TEMP_account',fields:[{type:'number', slug:'id', unique:true}]})",
-        'add.RONIN_TEMP_account.to(() => get.account())',
+        'add.RONIN_TEMP_account.with(() => get.account())',
         'drop.model("account")',
         'alter.model("RONIN_TEMP_account").to({slug: "account"})',
       ]);
@@ -197,7 +197,7 @@ describe('fields', () => {
       expect(diff).toHaveLength(5);
       expect(diff).toStrictEqual([
         "create.model({slug:'RONIN_TEMP_account',fields:[{type:'link', slug:'profile', target:'profile'}]})",
-        'add.RONIN_TEMP_account.to(() => get.account())',
+        'add.RONIN_TEMP_account.with(() => get.account())',
         'alter.model("RONIN_TEMP_account").alter.field("profile").to({slug: "newProfile"})',
         'drop.model("account")',
         'alter.model("RONIN_TEMP_account").to({slug: "account"})',

diff --git a/tests/utils/migration.test.ts b/tests/utils/migration.test.ts
@@ -46,7 +46,7 @@ describe('migration', () => {
       expect(modelDiff).toHaveLength(4);
       expect(modelDiff).toStrictEqual([
         "create.model({slug:'RONIN_TEMP_account',fields:[{slug:'name', type:'string'}]})",
-        'add.RONIN_TEMP_account.to(() => get.account())',
+        'add.RONIN_TEMP_account.with(() => get.account())',
         'drop.model("account")',
         'alter.model("RONIN_TEMP_account").to({slug: "account"})',
       ]);
@@ -76,7 +76,7 @@ describe('migration', () => {
       expect(modelDiff).toHaveLength(4);
       expect(modelDiff).toStrictEqual([
         "create.model({slug:'RONIN_TEMP_account',fields:[{slug:'name', required:true, unique:true, type:'string'}]})",
-        'add.RONIN_TEMP_account.to(() => get.account())',
+        'add.RONIN_TEMP_account.with(() => get.account())',
         'drop.model("account")',
         'alter.model("RONIN_TEMP_account").to({slug: "account"})',
       ]);
@@ -99,7 +99,7 @@ describe('migration', () => {
       expect(modelDiff).toHaveLength(4);
       expect(modelDiff).toStrictEqual([
         "create.model({slug:'RONIN_TEMP_account',fields:[{slug:'name', type:'string'}]})",
-        'add.RONIN_TEMP_account.to(() => get.account())',
+        'add.RONIN_TEMP_account.with(() => get.account())',
         'drop.model("account")',
         'alter.model("RONIN_TEMP_account").to({slug: "account"})',
       ]);
@@ -132,7 +132,7 @@ describe('migration', () => {
 
         expect(modelDiff).toStrictEqual([
           "create.model({slug:'comment',fields:[{slug:'name', type:'string'}]})",
-          'alter.model("comment").create.trigger({"action":"INSERT","when":"BEFORE","effects":[{"add":{"comment":{"to":{"name":"Test"}}}}]})',
+          'alter.model("comment").create.trigger({"action":"INSERT","when":"BEFORE","effects":[{"add":{"comment":{"with":{"name":"Test"}}}}]})',
         ]);
       });
 
@@ -150,7 +150,7 @@ describe('migration', () => {
         expect(modelDiff).toHaveLength(2);
         expect(modelDiff).toStrictEqual([
           'alter.model("comment").drop.trigger("no slug")',
-          'alter.model("comment").create.trigger({"action":"DELETE","when":"AFTER","effects":[{"add":{"comment":{"to":{"name":"Test"}}}}]})',
+          'alter.model("comment").create.trigger({"action":"DELETE","when":"AFTER","effects":[{"add":{"comment":{"with":{"name":"Test"}}}}]})',
         ]);
       });
     });

diff --git a/tests/utils/protocol.test.ts b/tests/utils/protocol.test.ts
@@ -110,7 +110,7 @@ describe('protocol', () => {
 
     expect(statements).toHaveLength(1);
     expect(statements[0].statement).toStrictEqual(
-      `SELECT "id", "ronin.locked", "ronin.createdAt", "ronin.createdBy", "ronin.updatedAt", "ronin.updatedBy", "handle" FROM "accounts" WHERE ("handle" = 'elaine') LIMIT 1`,
+      `SELECT "id", "ronin.locked", "ronin.createdAt", "ronin.createdBy", "ronin.updatedAt", "ronin.updatedBy", "handle" FROM "accounts" WHERE "handle" = 'elaine' LIMIT 1`,
     );
   });
 

diff --git a/tests/utils/queries.test.ts b/tests/utils/queries.test.ts
@@ -106,7 +106,7 @@ describe('queries', () => {
     const result = createTempModelQuery('user', fields, [], []);
     expect(result).toEqual([
       "create.model({slug:'RONIN_TEMP_user',fields:[{slug:'username', type:'string', name:'Username', unique:true, required:true}]})",
-      'add.RONIN_TEMP_user.to(() => get.user())',
+      'add.RONIN_TEMP_user.with(() => get.user())',
       'drop.model("user")',
       'alter.model("RONIN_TEMP_user").to({slug: "user"})',
     ]);
@@ -126,7 +126,7 @@ describe('queries', () => {
     const result = createTempModelQuery('user', fields, [], [], customQueries);
     expect(result).toEqual([
       "create.model({slug:'RONIN_TEMP_user',fields:[{slug:'username', type:'string', name:'Username', unique:true, required:true}]})",
-      'add.RONIN_TEMP_user.to(() => get.user())',
+      'add.RONIN_TEMP_user.with(() => get.user())',
       ...customQueries,
       'drop.model("user")',
       'alter.model("RONIN_TEMP_user").to({slug: "user"})',
@@ -153,7 +153,7 @@ describe('queries', () => {
     const result = createTempModelQuery('user', fields, [], triggers);
     expect(result).toEqual([
       "create.model({slug:'RONIN_TEMP_user',fields:[{slug:'username', type:'string', name:'Username', unique:true, required:true}]})",
-      'add.RONIN_TEMP_user.to(() => get.user())',
+      'add.RONIN_TEMP_user.with(() => get.user())',
       'drop.model("user")',
       'alter.model("RONIN_TEMP_user").to({slug: "user"})',
       'alter.model("user").create.trigger({"action":"INSERT","when":"BEFORE","effects":[]})',