@simplysm/orm-common 13.0.76 → 13.0.77

package/dist/create-db-context.d.ts

@@ -23,7 +23,7 @@ import type { DbContextExecutor } from "./types/db";
  * const db = createDbContext(MyDb, executor, { database: "mydb" });
  *
  * await db.connect(async () => {
- *   const users = await db.user().result();
+ *   const users = await db.user().execute();
  * });
  * ```
  */

package/dist/create-db-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-db-context.d.ts","sourceRoot":"","sources":["..\\src\\create-db-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EAGZ,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAc,iBAAiB,EAA8B,MAAM,YAAY,CAAC;AAyB5F;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,eAAe,CAAC,IAAI,SAAS,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EACtE,GAAG,EAAE,IAAI,EACT,QAAQ,EAAE,iBAAiB,EAC3B,GAAG,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GACzC,iBAAiB,CAAC,IAAI,CAAC,CAmVzB"}
+{"version":3,"file":"create-db-context.d.ts","sourceRoot":"","sources":["..\\src\\create-db-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EAGZ,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAc,iBAAiB,EAA8B,MAAM,YAAY,CAAC;AAyB5F;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,eAAe,CAAC,IAAI,SAAS,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EACtE,GAAG,EAAE,IAAI,EACT,QAAQ,EAAE,iBAAiB,EAC3B,GAAG,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GACzC,iBAAiB,CAAC,IAAI,CAAC,CA0VzB"}

package/dist/create-db-context.js

@@ -4,7 +4,7 @@ import { TableBuilder } from "./schema/table-builder.js";
 import { ViewBuilder } from "./schema/view-builder.js";
 import { queryable } from "./exec/queryable.js";
 import { executable } from "./exec/executable.js";
-import { objClearUndefined } from "@simplysm/core-common";
+import { obj } from "@simplysm/core-common";
 import * as tableDdl from "./ddl/table-ddl.js";
 import * as columnDdl from "./ddl/column-ddl.js";
 import * as relationDdl from "./ddl/relation-ddl.js";
@@ -16,6 +16,7 @@ import {
 function createDbContext(def, executor, opt) {
   let aliasCounter = 0;
   let status = "ready";
+  let relationsValidated = false;
   const base = {
     get status() {
       return status;
@@ -42,14 +43,14 @@ function createDbContext(def, executor, opt) {
       return executor.executeDefs(defs, resultMetas);
     },
     getQueryDefObjectName(tableOrView) {
-      return objClearUndefined({
+      return obj.clearUndefined({
         database: tableOrView.meta.database ?? opt.database,
         schema: tableOrView.meta.schema ?? opt.schema,
         name: tableOrView.meta.name
       });
     },
-    async switchFk(table, switch_) {
-      await base.executeDefs([schemaDdl.getSwitchFkQueryDef(table, switch_)]);
+    async switchFk(table, enabled) {
+      await base.executeDefs([schemaDdl.getSwitchFkQueryDef(table, enabled)]);
     }
   };
   const db = {
@@ -78,7 +79,10 @@ function createDbContext(def, executor, opt) {
      * If error occurs, automatically rollback and close connection
      */
     async connect(fn, isolationLevel) {
-      validateRelationsImpl(def);
+      if (!relationsValidated) {
+        validateRelationsImpl(def);
+        relationsValidated = true;
+      }
       base.resetAliasCounter();
       await executor.connect();
       status = "connect";
@@ -120,7 +124,10 @@ function createDbContext(def, executor, opt) {
      * Used for DDL operations or read operations that don't require transactions
      */
     async connectWithoutTransaction(callback) {
-      validateRelationsImpl(def);
+      if (!relationsValidated) {
+        validateRelationsImpl(def);
+        relationsValidated = true;
+      }
       base.resetAliasCounter();
       await executor.connect();
       status = "connect";
@@ -141,7 +148,7 @@ function createDbContext(def, executor, opt) {
      *
      * Used when transaction is needed partially within connectWithoutTransaction
      */
-    async trans(fn, isolationLevel) {
+    async transaction(fn, isolationLevel) {
       if (status === "transact") {
         throw new Error("Already in TRANSACTION state.");
       }
@@ -205,25 +212,25 @@ function createDbContext(def, executor, opt) {
     async renameColumn(table, column, newName) {
       await base.executeDefs([columnDdl.getRenameColumnQueryDef(table, column, newName)]);
     },
-    async addPk(table, columns) {
-      await base.executeDefs([relationDdl.getAddPkQueryDef(table, columns)]);
+    async addPrimaryKey(table, columns) {
+      await base.executeDefs([relationDdl.getAddPrimaryKeyQueryDef(table, columns)]);
     },
-    async dropPk(table) {
-      await base.executeDefs([relationDdl.getDropPkQueryDef(table)]);
+    async dropPrimaryKey(table) {
+      await base.executeDefs([relationDdl.getDropPrimaryKeyQueryDef(table)]);
     },
-    async addFk(table, relationName, relationDef) {
+    async addForeignKey(table, relationName, relationDef) {
       await base.executeDefs([
-        relationDdl.getAddFkQueryDef(base, table, relationName, relationDef)
+        relationDdl.getAddForeignKeyQueryDef(base, table, relationName, relationDef)
       ]);
     },
-    async addIdx(table, indexBuilder) {
-      await base.executeDefs([relationDdl.getAddIdxQueryDef(table, indexBuilder)]);
+    async addIndex(table, indexBuilder) {
+      await base.executeDefs([relationDdl.getAddIndexQueryDef(table, indexBuilder)]);
     },
-    async dropFk(table, relationName) {
-      await base.executeDefs([relationDdl.getDropFkQueryDef(table, relationName)]);
+    async dropForeignKey(table, relationName) {
+      await base.executeDefs([relationDdl.getDropForeignKeyQueryDef(table, relationName)]);
     },
-    async dropIdx(table, columns) {
-      await base.executeDefs([relationDdl.getDropIdxQueryDef(table, columns)]);
+    async dropIndex(table, columns) {
+      await base.executeDefs([relationDdl.getDropIndexQueryDef(table, columns)]);
     },
     async clearSchema(params) {
       await base.executeDefs([schemaDdl.getClearSchemaQueryDef(params)]);
@@ -235,8 +242,8 @@ function createDbContext(def, executor, opt) {
     async truncate(table) {
       await base.executeDefs([schemaDdl.getTruncateQueryDef(table)]);
     },
-    async switchFk(table, switch_) {
-      await base.executeDefs([schemaDdl.getSwitchFkQueryDef(table, switch_)]);
+    async switchFk(table, enabled) {
+      await base.executeDefs([schemaDdl.getSwitchFkQueryDef(table, enabled)]);
     },
     //#endregion
     //#region ========== DDL QueryDef generators ==========
@@ -252,12 +259,12 @@ function createDbContext(def, executor, opt) {
     getDropColumnQueryDef: columnDdl.getDropColumnQueryDef,
     getModifyColumnQueryDef: columnDdl.getModifyColumnQueryDef,
     getRenameColumnQueryDef: columnDdl.getRenameColumnQueryDef,
-    getAddPkQueryDef: relationDdl.getAddPkQueryDef,
-    getDropPkQueryDef: relationDdl.getDropPkQueryDef,
-    getAddFkQueryDef: (table, relationName, relationDef) => relationDdl.getAddFkQueryDef(base, table, relationName, relationDef),
-    getAddIdxQueryDef: relationDdl.getAddIdxQueryDef,
-    getDropFkQueryDef: relationDdl.getDropFkQueryDef,
-    getDropIdxQueryDef: relationDdl.getDropIdxQueryDef,
+    getAddPrimaryKeyQueryDef: relationDdl.getAddPrimaryKeyQueryDef,
+    getDropPrimaryKeyQueryDef: relationDdl.getDropPrimaryKeyQueryDef,
+    getAddForeignKeyQueryDef: (table, relationName, relationDef) => relationDdl.getAddForeignKeyQueryDef(base, table, relationName, relationDef),
+    getAddIndexQueryDef: relationDdl.getAddIndexQueryDef,
+    getDropForeignKeyQueryDef: relationDdl.getDropForeignKeyQueryDef,
+    getDropIndexQueryDef: relationDdl.getDropIndexQueryDef,
     getClearSchemaQueryDef: schemaDdl.getClearSchemaQueryDef,
     getSchemaExistsQueryDef: schemaDdl.getSchemaExistsQueryDef,
     getTruncateQueryDef: schemaDdl.getTruncateQueryDef,

package/dist/create-db-context.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/create-db-context.ts"],
-  "mappings": "AAQA,SAAS,iBAAiB;AAC1B,SAAS,aAAa,0BAA0B;AAChD,SAAS,oBAAoB;AAC7B,SAAS,mBAAmB;AAE5B,SAAS,iBAAiB;AAC1B,SAAS,kBAAkB;AAC3B,SAAS,yBAAyB;AAGlC,YAAY,cAAc;AAC1B,YAAY,eAAe;AAC3B,YAAY,iBAAiB;AAC7B,YAAY,eAAe;AAC3B;AAAA,EACE,cAAc;AAAA,EACd,qBAAqB;AAAA,OAChB;AAiCA,SAAS,gBACd,KACA,UACA,KACyB;AAEzB,MAAI,eAAe;AACnB,MAAI,SAA0B;AAG9B,QAAM,OAAsB;AAAA,IAC1B,IAAI,SAAS;AACX,aAAO;AAAA,IACT;AAAA,IACA,IAAI,OAAO,GAAoB;AAC7B,eAAS;AAAA,IACX;AAAA,IACA,IAAI,WAAW;AACb,aAAO,IAAI;AAAA,IACb;AAAA,IACA,IAAI,SAAS;AACX,aAAO,IAAI;AAAA,IACb;AAAA,IACA,eAAe;AACb,aAAO,IAAI,EAAE,YAAY;AAAA,IAC3B;AAAA,IACA,oBAAoB;AAClB,qBAAe;AAAA,IACjB;AAAA,IACA,YACE,MACA,aACgB;AAChB,UACE,WAAW,cACX,KAAK,KAAK,CAAC,MAAO,UAAgC,SAAS,EAAE,IAAI,CAAC,GAClE;AACA,cAAM,IAAI,MAAM,gDAAgD;AAAA,MAClE;AACA,aAAO,SAAS,YAAY,MAAM,WAAW;AAAA,IAC/C;AAAA,IACA,sBACE,aACoB;AACpB,aAAO,kBAAkB;AAAA,QACvB,UAAU,YAAY,KAAK,YAAY,IAAI;AAAA,QAC3C,QAAQ,YAAY,KAAK,UAAU,IAAI;AAAA,QACvC,MAAM,YAAY,KAAK;AAAA,MACzB,CAAC;AAAA,IACH;AAAA,IACA,MAAM,SAAS,OAA2B,SAAsC;AAC9E,YAAM,KAAK,YAAY,CAAC,UAAU,oBAAoB,OAAO,OAAO,CAAC,CAAC;AAAA,IACxE;AAAA,EACF;AAGA,QAAM,KAAK;AAAA;AAAA,IAET,IAAI,SAAS;AACX,aAAO,KAAK;AAAA,IACd;AAAA,IACA,IAAI,OAAO,GAAoB;AAC7B,WAAK,SAAS;AAAA,IAChB;AAAA,IACA,IAAI,WAAW;AACb,aAAO,KAAK;AAAA,IACd;AAAA,IACA,IAAI,SAAS;AACX,aAAO,KAAK;AAAA,IACd;AAAA,IACA,cAAc,KAAK;AAAA,IACnB,mBAAmB,KAAK;AAAA,IACxB,aAAa,KAAK;AAAA,IAClB,uBAAuB,KAAK;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAU5B,MAAM,QACJ,IACA,gBACkB;AAClB,4BAAsB,GAAG;AACzB,WAAK,kBAAkB;AAEvB,YAAM,SAAS,QAAQ;AACvB,eAAS;AAET,YAAM,SAAS,iBAAiB,cAAc;AAC9C,eAAS;AAET,UAAI;AACJ,UAAI;AACF,iBAAS,MAAM,GAAG;AAElB,cAAM,SAAS,kBAAkB;AACjC,iBAAS;AAAA,MACX,SAAS,KAAK;AACZ,YAAI;AACF,gBAAM,SAAS,oBAAoB;AACnC,mBAAS;AAAA,QACX,SAAS,MAAM;AACb,cAAI,gBAAgB,oBAAoB;AACtC,gBAAI,KAAK,SAAS,YAAY,uBAAuB;AACnD,oBAAM,SAAS,MAAM;AACrB,uBAAS;AACT,oBAAM;AAAA,YACR;AAAA,UACF,OAAO;AACL,kBAAM,SAAS,MAAM;AACrB,qBAAS;AACT,kBAAM;AAAA,UACR;AAAA,QACF;AAEA,cAAM,SAAS,MAAM;AACrB,iBAAS;AACT,cAAM;AAAA,MACR;AAEA,YAAM,SAAS,MAAM;AACrB,eAAS;AACT,aAAO;AAAA,IACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAOA,MAAM,0BAAmC,UAAoD;AAC3F,4BAAsB,GAAG;AACzB,WAAK,kBAAkB;AAEvB,YAAM,SAAS,QAAQ;AACvB,eAAS;AAET,UAAI;AACJ,UAAI;AACF,iBAAS,MAAM,SAAS;AAAA,MAC1B,SAAS,KAAK;AACZ,cAAM,SAAS,MAAM;AACrB,iBAAS;AACT,cAAM;AAAA,MACR;AAEA,YAAM,SAAS,MAAM;AACrB,eAAS;AACT,aAAO;AAAA,IACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAOA,MAAM,MACJ,IACA,gBACkB;AAClB,UAAI,WAAW,YAAY;AACzB,cAAM,IAAI,MAAM,+BAA+B;AAAA,MACjD;AAEA,YAAM,SAAS,iBAAiB,cAAc;AAC9C,eAAS;AAET,UAAI;AACJ,UAAI;AACF,iBAAS,MAAM,GAAG;AAElB,cAAM,SAAS,kBAAkB;AACjC,iBAAS;AAAA,MACX,SAAS,KAAK;AACZ,YAAI;AACF,gBAAM,SAAS,oBAAoB;AACnC,mBAAS;AAAA,QACX,SAAS,MAAM;AACb,cAAI,gBAAgB,oBAAoB;AACtC,gBAAI,KAAK,SAAS,YAAY,uBAAuB;AACnD,oBAAM;AAAA,YACR;AAAA,UACF,OAAO;AACL,kBAAM;AAAA,UACR;AAEA,mBAAS;AAAA,QACX;AACA,cAAM;AAAA,MACR;AAEA,aAAO;AAAA,IACT;AAAA;AAAA;AAAA,IAMA,MAAM,YAAY,OAA8C;AAC9D,YAAM,KAAK,YAAY,CAAC,SAAS,uBAAuB,MAAM,KAAK,CAAC,CAAC;AAAA,IACvE;AAAA,IACA,MAAM,UAAU,OAA0C;AACxD,YAAM,KAAK,YAAY,CAAC,SAAS,qBAAqB,KAAK,CAAC,CAAC;AAAA,IAC/D;AAAA,IACA,MAAM,YAAY,OAA2B,SAAgC;AAC3E,YAAM,KAAK,YAAY,CAAC,SAAS,uBAAuB,OAAO,OAAO,CAAC,CAAC;AAAA,IAC1E;AAAA,IACA,MAAM,WAAW,MAAiD;AAChE,YAAM,KAAK,YAAY,CAAC,SAAS,sBAAsB,IAAW,IAAI,CAAC,CAAC;AAAA,IAC1E;AAAA,IACA,MAAM,SAAS,MAAyC;AACtD,YAAM,KAAK,YAAY,CAAC,SAAS,oBAAoB,IAAI,CAAC,CAAC;AAAA,IAC7D;AAAA,IACA,MAAM,WAAW,WAAsD;AACrE,YAAM,KAAK,YAAY,CAAC,SAAS,sBAAsB,MAAM,SAAS,CAAC,CAAC;AAAA,IAC1E;AAAA,IACA,MAAM,SAAS,WAA8C;AAC3D,YAAM,KAAK,YAAY,CAAC,SAAS,oBAAoB,SAAS,CAAC,CAAC;AAAA,IAClE;AAAA,IACA,MAAM,UACJ,OACA,YACA,QACe;AACf,YAAM,KAAK,YAAY,CAAC,UAAU,qBAAqB,OAAO,YAAY,MAAM,CAAC,CAAC;AAAA,IACpF;AAAA,IACA,MAAM,WAAW,OAA2B,QAA+B;AACzE,YAAM,KAAK,YAAY,CAAC,UAAU,sBAAsB,OAAO,MAAM,CAAC,CAAC;AAAA,IACzE;AAAA,IACA,MAAM,aACJ,OACA,YACA,QACe;AACf,YAAM,KAAK,YAAY,CAAC,UAAU,wBAAwB,OAAO,YAAY,MAAM,CAAC,CAAC;AAAA,IACvF;AAAA,IACA,MAAM,aAAa,OAA2B,QAAgB,SAAgC;AAC5F,YAAM,KAAK,YAAY,CAAC,UAAU,wBAAwB,OAAO,QAAQ,OAAO,CAAC,CAAC;AAAA,IACpF;AAAA,IACA,MAAM,MAAM,OAA2B,SAAkC;AACvE,YAAM,KAAK,YAAY,CAAC,YAAY,iBAAiB,OAAO,OAAO,CAAC,CAAC;AAAA,IACvE;AAAA,IACA,MAAM,OAAO,OAA0C;AACrD,YAAM,KAAK,YAAY,CAAC,YAAY,kBAAkB,KAAK,CAAC,CAAC;AAAA,IAC/D;AAAA,IACA,MAAM,MACJ,OACA,cACA,aACe;AACf,YAAM,KAAK,YAAY;AAAA,QACrB,YAAY,iBAAiB,MAAM,OAAO,cAAc,WAAW;AAAA,MACrE,CAAC;AAAA,IACH;AAAA,IACA,MAAM,OAAO,OAA2B,cAAqD;AAC3F,YAAM,KAAK,YAAY,CAAC,YAAY,kBAAkB,OAAO,YAAY,CAAC,CAAC;AAAA,IAC7E;AAAA,IACA,MAAM,OAAO,OAA2B,cAAqC;AAC3E,YAAM,KAAK,YAAY,CAAC,YAAY,kBAAkB,OAAO,YAAY,CAAC,CAAC;AAAA,IAC7E;AAAA,IACA,MAAM,QAAQ,OAA2B,SAAkC;AACzE,YAAM,KAAK,YAAY,CAAC,YAAY,mBAAmB,OAAO,OAAO,CAAC,CAAC;AAAA,IACzE;AAAA,IACA,MAAM,YAAY,QAA8D;AAC9E,YAAM,KAAK,YAAY,CAAC,UAAU,uBAAuB,MAAM,CAAC,CAAC;AAAA,IACnE;AAAA,IACA,MAAM,aAAa,UAAkB,QAAmC;AACtE,YAAM,SAAS,MAAM,KAAK,YAAY,CAAC,UAAU,wBAAwB,UAAU,MAAM,CAAC,CAAC;AAC3F,aAAO,OAAO,CAAC,EAAE,SAAS;AAAA,IAC5B;AAAA,IACA,MAAM,SAAS,OAA0C;AACvD,YAAM,KAAK,YAAY,CAAC,UAAU,oBAAoB,KAAK,CAAC,CAAC;AAAA,IAC/D;AAAA,IACA,MAAM,SAAS,OAA2B,SAAsC;AAC9E,YAAM,KAAK,YAAY,CAAC,UAAU,oBAAoB,OAAO,OAAO,CAAC,CAAC;AAAA,IACxE;AAAA;AAAA;AAAA,IAMA,wBAAwB,CAAC,UACvB,SAAS,uBAAuB,MAAM,KAAK;AAAA,IAC7C,uBAAuB,CAAC,SACtB,SAAS,sBAAsB,IAAW,IAAI;AAAA,IAChD,uBAAuB,CAAC,cACtB,SAAS,sBAAsB,MAAM,SAAS;AAAA,IAChD,yBAAyB,CACvB,YACG,SAAS,wBAAwB,IAAW,OAAO;AAAA,IACxD,sBAAsB,SAAS;AAAA,IAC/B,wBAAwB,SAAS;AAAA,IACjC,qBAAqB,SAAS;AAAA,IAC9B,qBAAqB,SAAS;AAAA,IAC9B,sBAAsB,UAAU;AAAA,IAChC,uBAAuB,UAAU;AAAA,IACjC,yBAAyB,UAAU;AAAA,IACnC,yBAAyB,UAAU;AAAA,IACnC,kBAAkB,YAAY;AAAA,IAC9B,mBAAmB,YAAY;AAAA,IAC/B,kBAAkB,CAChB,OACA,cACA,gBACG,YAAY,iBAAiB,MAAM,OAAO,cAAc,WAAW;AAAA,IACxE,mBAAmB,YAAY;AAAA,IAC/B,mBAAmB,YAAY;AAAA,IAC/B,oBAAoB,YAAY;AAAA,IAChC,wBAAwB,UAAU;AAAA,IAClC,yBAAyB,UAAU;AAAA,IACnC,qBAAqB,UAAU;AAAA,IAC/B,qBAAqB,UAAU;AAAA;AAAA;AAAA,IAM/B,MAAM,WAAW,SAA8D;AAC7E,YAAM,eAAe,IAAW,KAAK,OAAO;AAAA,IAC9C;AAAA;AAAA,EAGF;AAGA,aAAW,CAAC,KAAK,WAAW,KAAK,OAAO,QAAQ,IAAI,KAAK,MAAM,GAAG;AAChE,IAAC,GAAW,GAAG,IAAI,UAAU,IAAW,WAAqC;AAAA,EAC/E;AACA,aAAW,CAAC,KAAK,IAAI,KAAK,OAAO,QAAQ,IAAI,KAAK,KAAK,GAAG;AACxD,IAAC,GAAW,GAAG,IAAI,UAAU,IAAW,IAAkC;AAAA,EAC5E;AAGA,aAAW,CAAC,KAAK,IAAI,KAAK,OAAO,QAAQ,IAAI,KAAK,UAAU,GAAG;AAC7D,IAAC,GAAW,GAAG,IAAI,WAAW,MAAM,IAAkC;AAAA,EACxE;AAEA,SAAO;AACT;",
+  "mappings": "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",
   "names": []
 }

package/dist/ddl/initialize.js

@@ -8,7 +8,7 @@ import {
   RelationKeyTargetBuilder
 } from "../schema/factory/relation-builder.js";
 import { getCreateObjectQueryDef } from "./table-ddl.js";
-import { getAddFkQueryDef, getAddIdxQueryDef } from "./relation-ddl.js";
+import { getAddForeignKeyQueryDef, getAddIndexQueryDef } from "./relation-ddl.js";
 import { getClearSchemaQueryDef, getSchemaExistsQueryDef } from "./schema-ddl.js";
 async function initialize(db, def, options) {
   const dbNames = (options == null ? void 0 : options.dbs) ?? (db.database !== void 0 ? [db.database] : []);
@@ -36,7 +36,7 @@ async function initialize(db, def, options) {
   } else {
     let appliedMigrations;
     try {
-      appliedMigrations = await db._migration().result();
+      appliedMigrations = await db._migration().execute();
     } catch (err) {
       if (!isTableNotExistsError(err)) {
         throw err;
@@ -74,7 +74,7 @@ async function createAllObjects(db, def) {
     const tableDef = db.getQueryDefObjectName(table);
     for (const [relationName, relationDef] of Object.entries(relations)) {
       if (!(relationDef instanceof ForeignKeyBuilder)) continue;
-      addFkDefs.push(getAddFkQueryDef(db, tableDef, relationName, relationDef));
+      addFkDefs.push(getAddForeignKeyQueryDef(db, tableDef, relationName, relationDef));
     }
   }
   if (addFkDefs.length > 0) {
@@ -86,7 +86,7 @@ async function createAllObjects(db, def) {
     if (indexes == null || indexes.length === 0) continue;
     const indexTableDef = db.getQueryDefObjectName(table);
     for (const indexBuilder of indexes) {
-      createIndexDefs.push(getAddIdxQueryDef(indexTableDef, indexBuilder));
+      createIndexDefs.push(getAddIndexQueryDef(indexTableDef, indexBuilder));
     }
   }
   if (createIndexDefs.length > 0) {

package/dist/ddl/initialize.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/ddl/initialize.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/ddl/relation-ddl.d.ts

@@ -1,29 +1,29 @@
 import type { ForeignKeyBuilder } from "../schema/factory/relation-builder";
 import type { IndexBuilder } from "../schema/factory/index-builder";
-import type { QueryDef, QueryDefObjectName, AddPkQueryDef, DropPkQueryDef, DropFkQueryDef, DropIdxQueryDef } from "../types/query-def";
+import type { QueryDef, QueryDefObjectName, AddPrimaryKeyQueryDef, DropPrimaryKeyQueryDef, DropForeignKeyQueryDef, DropIndexQueryDef } from "../types/query-def";
 import type { DbContextBase } from "../types/db-context-def";
 /**
  * Generate DROP PRIMARY KEY QueryDef
  */
-export declare function getDropPkQueryDef(table: QueryDefObjectName): DropPkQueryDef;
+export declare function getDropPrimaryKeyQueryDef(table: QueryDefObjectName): DropPrimaryKeyQueryDef;
 /**
  * Generate ADD PRIMARY KEY QueryDef
  */
-export declare function getAddPkQueryDef(table: QueryDefObjectName, columns: string[]): AddPkQueryDef;
+export declare function getAddPrimaryKeyQueryDef(table: QueryDefObjectName, columns: string[]): AddPrimaryKeyQueryDef;
 /**
  * Generate ADD FOREIGN KEY QueryDef
  */
-export declare function getAddFkQueryDef(db: DbContextBase, table: QueryDefObjectName, relationName: string, relationDef: ForeignKeyBuilder<any, any>): QueryDef;
+export declare function getAddForeignKeyQueryDef(db: DbContextBase, table: QueryDefObjectName, relationName: string, relationDef: ForeignKeyBuilder<any, any>): QueryDef;
 /**
  * ADD INDEX QueryDef Generate
  */
-export declare function getAddIdxQueryDef(table: QueryDefObjectName, indexBuilder: IndexBuilder<string[]>): QueryDef;
+export declare function getAddIndexQueryDef(table: QueryDefObjectName, indexBuilder: IndexBuilder<string[]>): QueryDef;
 /**
  * DROP FOREIGN KEY QueryDef Generate
  */
-export declare function getDropFkQueryDef(table: QueryDefObjectName, relationName: string): DropFkQueryDef;
+export declare function getDropForeignKeyQueryDef(table: QueryDefObjectName, relationName: string): DropForeignKeyQueryDef;
 /**
  * DROP INDEX QueryDef Generate
  */
-export declare function getDropIdxQueryDef(table: QueryDefObjectName, columns: string[]): DropIdxQueryDef;
+export declare function getDropIndexQueryDef(table: QueryDefObjectName, columns: string[]): DropIndexQueryDef;
 //# sourceMappingURL=relation-ddl.d.ts.map

package/dist/ddl/relation-ddl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"relation-ddl.d.ts","sourceRoot":"","sources":["..\\..\\src\\ddl\\relation-ddl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,KAAK,EACV,QAAQ,EACR,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,cAAc,EACd,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAI7D;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,kBAAkB,GAAG,cAAc,CAE3E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,aAAa,CAE5F;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,aAAa,EACjB,KAAK,EAAE,kBAAkB,EACzB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,GACvC,QAAQ,CAeV;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,kBAAkB,EACzB,YAAY,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,GACnC,QAAQ,CAeV;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,GAAG,cAAc,CAEjG;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,eAAe,CAEhG"}
+{"version":3,"file":"relation-ddl.d.ts","sourceRoot":"","sources":["..\\..\\src\\ddl\\relation-ddl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,KAAK,EACV,QAAQ,EACR,kBAAkB,EAClB,qBAAqB,EACrB,sBAAsB,EACtB,sBAAsB,EACtB,iBAAiB,EAClB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAI7D;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,kBAAkB,GAAG,sBAAsB,CAE3F;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,qBAAqB,CAE5G;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,EAAE,EAAE,aAAa,EACjB,KAAK,EAAE,kBAAkB,EACzB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,GACvC,QAAQ,CAeV;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,kBAAkB,EACzB,YAAY,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,GACnC,QAAQ,CAeV;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,GAAG,sBAAsB,CAEjH;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,iBAAiB,CAEpG"}

package/dist/ddl/relation-ddl.js

@@ -1,17 +1,17 @@
 import { getMatchedPrimaryKeys } from "../exec/queryable.js";
 import { getQueryDefObjectName } from "./table-ddl.js";
-function getDropPkQueryDef(table) {
-  return { type: "dropPk", table };
+function getDropPrimaryKeyQueryDef(table) {
+  return { type: "dropPrimaryKey", table };
 }
-function getAddPkQueryDef(table, columns) {
-  return { type: "addPk", table, columns };
+function getAddPrimaryKeyQueryDef(table, columns) {
+  return { type: "addPrimaryKey", table, columns };
 }
-function getAddFkQueryDef(db, table, relationName, relationDef) {
+function getAddForeignKeyQueryDef(db, table, relationName, relationDef) {
   const targetTable = relationDef.meta.targetFn();
   const fkColumns = relationDef.meta.columns;
   const pk = getMatchedPrimaryKeys(fkColumns, targetTable);
   return {
-    type: "addFk",
+    type: "addForeignKey",
     table,
     foreignKey: {
       name: `FK_${table.name}_${relationName}`,
@@ -21,10 +21,10 @@ function getAddFkQueryDef(db, table, relationName, relationDef) {
     }
   };
 }
-function getAddIdxQueryDef(table, indexBuilder) {
+function getAddIndexQueryDef(table, indexBuilder) {
   const indexMeta = indexBuilder.meta;
   return {
-    type: "addIdx",
+    type: "addIndex",
     table,
     index: {
       name: indexBuilder.meta.name ?? `IDX_${table.name}_${indexMeta.columns.join("_")}`,
@@ -39,18 +39,18 @@ function getAddIdxQueryDef(table, indexBuilder) {
     }
   };
 }
-function getDropFkQueryDef(table, relationName) {
-  return { type: "dropFk", table, foreignKey: `FK_${table.name}_${relationName}` };
+function getDropForeignKeyQueryDef(table, relationName) {
+  return { type: "dropForeignKey", table, foreignKey: `FK_${table.name}_${relationName}` };
 }
-function getDropIdxQueryDef(table, columns) {
-  return { type: "dropIdx", table, index: `IDX_${table.name}_${columns.join("_")}` };
+function getDropIndexQueryDef(table, columns) {
+  return { type: "dropIndex", table, index: `IDX_${table.name}_${columns.join("_")}` };
 }
 export {
-  getAddFkQueryDef,
-  getAddIdxQueryDef,
-  getAddPkQueryDef,
-  getDropFkQueryDef,
-  getDropIdxQueryDef,
-  getDropPkQueryDef
+  getAddForeignKeyQueryDef,
+  getAddIndexQueryDef,
+  getAddPrimaryKeyQueryDef,
+  getDropForeignKeyQueryDef,
+  getDropIndexQueryDef,
+  getDropPrimaryKeyQueryDef
 };
 //# sourceMappingURL=relation-ddl.js.map

package/dist/ddl/relation-ddl.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/ddl/relation-ddl.ts"],
-  "mappings": "AAWA,SAAS,6BAA6B;AACtC,SAAS,6BAA6B;AAK/B,SAAS,kBAAkB,OAA2C;AAC3E,SAAO,EAAE,MAAM,UAAU,MAAM;AACjC;AAKO,SAAS,iBAAiB,OAA2B,SAAkC;AAC5F,SAAO,EAAE,MAAM,SAAS,OAAO,QAAQ;AACzC;AAKO,SAAS,iBACd,IACA,OACA,cACA,aACU;AACV,QAAM,cAAc,YAAY,KAAK,SAAS;AAC9C,QAAM,YAAY,YAAY,KAAK;AACnC,QAAM,KAAK,sBAAsB,WAAW,WAAW;AAEvD,SAAO;AAAA,IACL,MAAM;AAAA,IACN;AAAA,IACA,YAAY;AAAA,MACV,MAAM,MAAM,MAAM,IAAI,IAAI,YAAY;AAAA,MACtC;AAAA,MACA,aAAa,sBAAsB,IAAI,WAAW;AAAA,MAClD,iBAAiB;AAAA,IACnB;AAAA,EACF;AACF;AAKO,SAAS,kBACd,OACA,cACU;AACV,QAAM,YAAY,aAAa;AAE/B,SAAO;AAAA,IACL,MAAM;AAAA,IACN;AAAA,IACA,OAAO;AAAA,MACL,MAAM,aAAa,KAAK,QAAQ,OAAO,MAAM,IAAI,IAAI,UAAU,QAAQ,KAAK,GAAG,CAAC;AAAA,MAChF,SAAS,UAAU,QAAQ,IAAI,CAAC,KAAK,MAAG;AAnE9C;AAmEkD;AAAA,UAC1C,MAAM;AAAA,UACN,WAAS,eAAU,YAAV,mBAAoB,OAAM;AAAA,QACrC;AAAA,OAAE;AAAA,MACF,QAAQ,UAAU;AAAA,IACpB;AAAA,EACF;AACF;AAKO,SAAS,kBAAkB,OAA2B,cAAsC;AACjG,SAAO,EAAE,MAAM,UAAU,OAAO,YAAY,MAAM,MAAM,IAAI,IAAI,YAAY,GAAG;AACjF;AAKO,SAAS,mBAAmB,OAA2B,SAAoC;AAChG,SAAO,EAAE,MAAM,WAAW,OAAO,OAAO,OAAO,MAAM,IAAI,IAAI,QAAQ,KAAK,GAAG,CAAC,GAAG;AACnF;",
+  "mappings": "AAWA,SAAS,6BAA6B;AACtC,SAAS,6BAA6B;AAK/B,SAAS,0BAA0B,OAAmD;AAC3F,SAAO,EAAE,MAAM,kBAAkB,MAAM;AACzC;AAKO,SAAS,yBAAyB,OAA2B,SAA0C;AAC5G,SAAO,EAAE,MAAM,iBAAiB,OAAO,QAAQ;AACjD;AAKO,SAAS,yBACd,IACA,OACA,cACA,aACU;AACV,QAAM,cAAc,YAAY,KAAK,SAAS;AAC9C,QAAM,YAAY,YAAY,KAAK;AACnC,QAAM,KAAK,sBAAsB,WAAW,WAAW;AAEvD,SAAO;AAAA,IACL,MAAM;AAAA,IACN;AAAA,IACA,YAAY;AAAA,MACV,MAAM,MAAM,MAAM,IAAI,IAAI,YAAY;AAAA,MACtC;AAAA,MACA,aAAa,sBAAsB,IAAI,WAAW;AAAA,MAClD,iBAAiB;AAAA,IACnB;AAAA,EACF;AACF;AAKO,SAAS,oBACd,OACA,cACU;AACV,QAAM,YAAY,aAAa;AAE/B,SAAO;AAAA,IACL,MAAM;AAAA,IACN;AAAA,IACA,OAAO;AAAA,MACL,MAAM,aAAa,KAAK,QAAQ,OAAO,MAAM,IAAI,IAAI,UAAU,QAAQ,KAAK,GAAG,CAAC;AAAA,MAChF,SAAS,UAAU,QAAQ,IAAI,CAAC,KAAK,MAAG;AAnE9C;AAmEkD;AAAA,UAC1C,MAAM;AAAA,UACN,WAAS,eAAU,YAAV,mBAAoB,OAAM;AAAA,QACrC;AAAA,OAAE;AAAA,MACF,QAAQ,UAAU;AAAA,IACpB;AAAA,EACF;AACF;AAKO,SAAS,0BAA0B,OAA2B,cAA8C;AACjH,SAAO,EAAE,MAAM,kBAAkB,OAAO,YAAY,MAAM,MAAM,IAAI,IAAI,YAAY,GAAG;AACzF;AAKO,SAAS,qBAAqB,OAA2B,SAAsC;AACpG,SAAO,EAAE,MAAM,aAAa,OAAO,OAAO,OAAO,MAAM,IAAI,IAAI,QAAQ,KAAK,GAAG,CAAC,GAAG;AACrF;",
   "names": []
 }

package/dist/ddl/schema-ddl.d.ts

@@ -17,5 +17,5 @@ export declare function getTruncateQueryDef(table: QueryDefObjectName): Truncate
 /**
  * Generate SWITCH FK QueryDef
  */
-export declare function getSwitchFkQueryDef(table: QueryDefObjectName, switch_: "on" | "off"): SwitchFkQueryDef;
+export declare function getSwitchFkQueryDef(table: QueryDefObjectName, enabled: boolean): SwitchFkQueryDef;
 //# sourceMappingURL=schema-ddl.d.ts.map

package/dist/ddl/schema-ddl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-ddl.d.ts","sourceRoot":"","sources":["..\\..\\src\\ddl\\schema-ddl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAE5B;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,mBAAmB,CAEtB;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,oBAAoB,CAE/F;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,kBAAkB,GAAG,gBAAgB,CAE/E;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,kBAAkB,EACzB,OAAO,EAAE,IAAI,GAAG,KAAK,GACpB,gBAAgB,CAElB"}
+{"version":3,"file":"schema-ddl.d.ts","sourceRoot":"","sources":["..\\..\\src\\ddl\\schema-ddl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAE5B;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,mBAAmB,CAEtB;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,oBAAoB,CAE/F;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,kBAAkB,GAAG,gBAAgB,CAE/E;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,kBAAkB,EACzB,OAAO,EAAE,OAAO,GACf,gBAAgB,CAElB"}

package/dist/ddl/schema-ddl.js

@@ -7,8 +7,8 @@ function getSchemaExistsQueryDef(database, schema) {
 function getTruncateQueryDef(table) {
   return { type: "truncate", table };
 }
-function getSwitchFkQueryDef(table, switch_) {
-  return { type: "switchFk", table, switch: switch_ };
+function getSwitchFkQueryDef(table, enabled) {
+  return { type: "switchFk", table, enabled };
 }
 export {
   getClearSchemaQueryDef,

package/dist/ddl/schema-ddl.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/ddl/schema-ddl.ts"],
-  "mappings": "AAWO,SAAS,uBAAuB,QAGf;AACtB,SAAO,EAAE,MAAM,eAAe,UAAU,OAAO,UAAU,QAAQ,OAAO,OAAO;AACjF;AAKO,SAAS,wBAAwB,UAAkB,QAAuC;AAC/F,SAAO,EAAE,MAAM,gBAAgB,UAAU,OAAO;AAClD;AAKO,SAAS,oBAAoB,OAA6C;AAC/E,SAAO,EAAE,MAAM,YAAY,MAAM;AACnC;AAKO,SAAS,oBACd,OACA,SACkB;AAClB,SAAO,EAAE,MAAM,YAAY,OAAO,QAAQ,QAAQ;AACpD;",
+  "mappings": "AAWO,SAAS,uBAAuB,QAGf;AACtB,SAAO,EAAE,MAAM,eAAe,UAAU,OAAO,UAAU,QAAQ,OAAO,OAAO;AACjF;AAKO,SAAS,wBAAwB,UAAkB,QAAuC;AAC/F,SAAO,EAAE,MAAM,gBAAgB,UAAU,OAAO;AAClD;AAKO,SAAS,oBAAoB,OAA6C;AAC/E,SAAO,EAAE,MAAM,YAAY,MAAM;AACnC;AAKO,SAAS,oBACd,OACA,SACkB;AAClB,SAAO,EAAE,MAAM,YAAY,OAAO,QAAQ;AAC5C;",
   "names": []
 }

package/dist/ddl/table-ddl.js

@@ -1,7 +1,7 @@
 import { TableBuilder } from "../schema/table-builder.js";
 import { ViewBuilder } from "../schema/view-builder.js";
 import { ProcedureBuilder } from "../schema/procedure-builder.js";
-import { objClearUndefined } from "@simplysm/core-common";
+import { obj } from "@simplysm/core-common";
 function getCreateObjectQueryDef(db, builder) {
   if (builder instanceof TableBuilder) {
     return getCreateTableQueryDef(db, builder);
@@ -86,7 +86,7 @@ function getDropProcQueryDef(procedure) {
   return { type: "dropProc", procedure };
 }
 function getQueryDefObjectName(db, tableOrView) {
-  return objClearUndefined({
+  return obj.clearUndefined({
     database: tableOrView.meta.database ?? db.database,
     schema: tableOrView.meta.schema ?? db.schema,
     name: tableOrView.meta.name

package/dist/ddl/table-ddl.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/ddl/table-ddl.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/exec/queryable.d.ts

@@ -22,7 +22,7 @@ declare class JoinQueryable {
      * @param table - Table to join
      * @returns Joined Queryable
      */
-    from<T extends TableBuilder<any, any>>(table: T): Queryable<T["$infer"], T>;
+    from<T extends TableBuilder<any, any>>(table: T): Queryable<T["$inferSelect"], T>;
     /**
      * Directly specify columns in join result
      *
@@ -56,7 +56,7 @@ declare class RecursiveQueryable<TBaseData extends DataRecord> {
      * @param table - Target table to recurse
      * @returns Queryable with self property added (for self-reference)
      */
-    from<T extends TableBuilder<any, any>>(table: T): Queryable<T["$infer"] & {
+    from<T extends TableBuilder<any, any>>(table: T): Queryable<T["$inferSelect"] & {
         self?: TBaseData[];
     }, T>;
     /**
@@ -93,12 +93,12 @@ declare class RecursiveQueryable<TBaseData extends DataRecord> {
  * const users = await db.user()
  *   .where((u) => [expr.eq(u.isActive, true)])
  *   .orderBy((u) => u.name)
- *   .result();
+ *   .execute();
  *
  * // JOIN query
  * const posts = await db.post()
  *   .include((p) => p.user)
- *   .result();
+ *   .execute();
  *
  * // INSERT
  * await db.user().insert([{ name: "Gildong Hong", email: "test@test.com" }]);
@@ -272,7 +272,7 @@ export declare class Queryable<TData extends DataRecord, TFrom extends TableBuil
      * 1:N 관계의 LEFT OUTER JOIN을 수행 (배열로 result Add)
      *
      * @param as - Result에 추가할 property 이름
-     * @param fwd - Join 조건을 정의하는 콜백 function
+     * @param fn - Join 조건을 정의하는 콜백 function
      * @returns join 결과가 배열로 추가된 Queryable
      *
      * @example
@@ -285,14 +285,14 @@ export declare class Queryable<TData extends DataRecord, TFrom extends TableBuil
      * // Result: { id, name, posts: [{ id, title }, ...] }
      * ```
      */
-    join<A extends string, R extends DataRecord>(as: A, fwd: (qr: JoinQueryable, cols: QueryableRecord<TData>) => Queryable<R, any>): Queryable<TData & {
+    join<A extends string, R extends DataRecord>(as: A, fn: (qr: JoinQueryable, cols: QueryableRecord<TData>) => Queryable<R, any>): Queryable<TData & {
         [K in A]?: R[];
     }, TFrom>;
     /**
      * N:1 또는 1:1 관계의 LEFT OUTER JOIN을 수행 (단일 객체로 result Add)
      *
      * @param as - Result에 추가할 property 이름
-     * @param fwd - Join 조건을 정의하는 콜백 function
+     * @param fn - Join 조건을 정의하는 콜백 function
      * @returns join 결과가 단일 객체로 추가된 Queryable
      *
      * @example
@@ -305,7 +305,7 @@ export declare class Queryable<TData extends DataRecord, TFrom extends TableBuil
      * // Result: { id, title, user: { id, name } | undefined }
      * ```
      */
-    joinSingle<A extends string, R extends DataRecord>(as: A, fwd: (qr: JoinQueryable, cols: QueryableRecord<TData>) => Queryable<R, any>): Queryable<{
+    joinSingle<A extends string, R extends DataRecord>(as: A, fn: (qr: JoinQueryable, cols: QueryableRecord<TData>) => Queryable<R, any>): Queryable<{
         [K in keyof TData as K extends A ? never : K]: TData[K];
     } & {
         [K in A]?: R;
@@ -373,7 +373,7 @@ export declare class Queryable<TData extends DataRecord, TFrom extends TableBuil
      *
      * 계층 structure data(조직도, 카테고리 트리 등)를 조회할 때 사용
      *
-     * @param fwd - recursive part을 정의하는 콜백 function
+     * @param fn - recursive part을 정의하는 콜백 function
      * @returns recursive CTE가 apply된 Queryable
      *
      * @example
@@ -387,7 +387,7 @@ export declare class Queryable<TData extends DataRecord, TFrom extends TableBuil
      *   )
      * ```
      */
-    recursive(fwd: (qr: RecursiveQueryable<TData>) => Queryable<TData, any>): Queryable<TData, never>;
+    recursive(fn: (qr: RecursiveQueryable<TData>) => Queryable<TData, any>): Queryable<TData, never>;
     /**
      * SELECT query를 실행하고 result 배열을 return
      *
@@ -397,10 +397,10 @@ export declare class Queryable<TData extends DataRecord, TFrom extends TableBuil
      * ```typescript
      * const users = await db.user()
      *   .where((u) => [expr.eq(u.isActive, true)])
-     *   .result();
+     *   .execute();
      * ```
      */
-    result(): Promise<TData[]>;
+    execute(): Promise<TData[]>;
     /**
      * 단일 결과를 return (2개 이상이면 Error)
      *
@@ -435,7 +435,7 @@ export declare class Queryable<TData extends DataRecord, TFrom extends TableBuil
     /**
      * result row 수를 return
      *
-     * @param fwd - 카운트할 column을 지정하는 function (Select)
+     * @param fn - 카운트할 column을 지정하는 function (Select)
      * @returns row 수
      * @throws distinct() 또는 groupBy() 후 직접 호출 시 에러 (wrap() 필요)
      *
@@ -446,7 +446,7 @@ export declare class Queryable<TData extends DataRecord, TFrom extends TableBuil
      *   .count();
      * ```
      */
-    count(fwd?: (cols: QueryableRecord<TData>) => ExprUnit<ColumnPrimitive>): Promise<number>;
+    count(fn?: (cols: QueryableRecord<TData>) => ExprUnit<ColumnPrimitive>): Promise<number>;
     /**
      * 조건에 맞는 data 존재 여부를 확인
      *
@@ -580,8 +580,8 @@ export declare class Queryable<TData extends DataRecord, TFrom extends TableBuil
      *
      * WHERE condition에 맞는 data가 있으면 UPDATE, 없으면 INSERT
      *
-     * @param updateFwd - Update할 column과 값을 반환하는 function
-     * @param insertFwd - Insert할 레코드를 반환하는 function (selection, 미지정 시 updateFwd와 동일)
+     * @param updateFn - Update할 column과 값을 반환하는 function
+     * @param insertFn - Insert할 레코드를 반환하는 function (selection, 미지정 시 updateFn와 동일)
      * @param outputColumns - column name array to receive (Select)
      * @returns outputColumns 지정 시 영향받은 레코드 array return
      *
@@ -604,15 +604,15 @@ export declare class Queryable<TData extends DataRecord, TFrom extends TableBuil
      *   );
      * ```
      */
-    upsert(updateFwd: (cols: QueryableRecord<TData>) => QueryableWriteRecord<TFrom["$inferUpdate"]>): Promise<void>;
-    upsert<K extends keyof TFrom["$inferColumns"] & string>(insertFwd: (cols: QueryableRecord<TData>) => QueryableWriteRecord<TFrom["$inferInsert"]>, outputColumns?: K[]): Promise<Pick<TFrom["$inferColumns"], K>[]>;
-    upsert<U extends QueryableWriteRecord<TFrom["$inferUpdate"]>>(updateFwd: (cols: QueryableRecord<TData>) => U, insertFwd: (updateRecord: U) => QueryableWriteRecord<TFrom["$inferInsert"]>): Promise<void>;
-    upsert<U extends QueryableWriteRecord<TFrom["$inferUpdate"]>, K extends keyof TFrom["$inferColumns"] & string>(updateFwd: (cols: QueryableRecord<TData>) => U, insertFwd: (updateRecord: U) => QueryableWriteRecord<TFrom["$inferInsert"]>, outputColumns?: K[]): Promise<Pick<TFrom["$inferColumns"], K>[]>;
-    getUpsertQueryDef<U extends QueryableWriteRecord<TFrom["$inferUpdate"]>>(updateRecordFwd: (cols: QueryableRecord<TData>) => U, insertRecordFwd: (updateRecord: U) => QueryableWriteRecord<TFrom["$inferInsert"]>, outputColumns?: (keyof TFrom["$inferColumns"] & string)[]): UpsertQueryDef;
+    upsert(updateFn: (cols: QueryableRecord<TData>) => QueryableWriteRecord<TFrom["$inferUpdate"]>): Promise<void>;
+    upsert<K extends keyof TFrom["$inferColumns"] & string>(insertFn: (cols: QueryableRecord<TData>) => QueryableWriteRecord<TFrom["$inferInsert"]>, outputColumns?: K[]): Promise<Pick<TFrom["$inferColumns"], K>[]>;
+    upsert<U extends QueryableWriteRecord<TFrom["$inferUpdate"]>>(updateFn: (cols: QueryableRecord<TData>) => U, insertFn: (updateRecord: U) => QueryableWriteRecord<TFrom["$inferInsert"]>): Promise<void>;
+    upsert<U extends QueryableWriteRecord<TFrom["$inferUpdate"]>, K extends keyof TFrom["$inferColumns"] & string>(updateFn: (cols: QueryableRecord<TData>) => U, insertFn: (updateRecord: U) => QueryableWriteRecord<TFrom["$inferInsert"]>, outputColumns?: K[]): Promise<Pick<TFrom["$inferColumns"], K>[]>;
+    getUpsertQueryDef<U extends QueryableWriteRecord<TFrom["$inferUpdate"]>>(updateRecordFn: (cols: QueryableRecord<TData>) => U, insertRecordFn: (updateRecord: U) => QueryableWriteRecord<TFrom["$inferInsert"]>, outputColumns?: (keyof TFrom["$inferColumns"] & string)[]): UpsertQueryDef;
     /**
      * FK constraint on/off (transaction 내 사용 가능)
      */
-    switchFk(switch_: "on" | "off"): Promise<void>;
+    switchFk(enabled: boolean): Promise<void>;
     private _getCudOutputDef;
 }
 /**
@@ -712,11 +712,11 @@ export type PathProxy<TObject> = {
  *   async getActiveUsers() {
  *     return this.user()
  *       .where((u) => [expr.eq(u.isActive, true)])
- *       .result();
+ *       .execute();
  *   }
  * }
  * ```
  */
-export declare function queryable<TBuilder extends TableBuilder<any, any> | ViewBuilder<any, any, any>>(db: DbContextBase, tableOrView: TBuilder, as?: string): () => Queryable<TBuilder["$infer"], TBuilder extends TableBuilder<any, any> ? TBuilder : never>;
+export declare function queryable<TBuilder extends TableBuilder<any, any> | ViewBuilder<any, any, any>>(db: DbContextBase, tableOrView: TBuilder, as?: string): () => Queryable<TBuilder["$inferSelect"], TBuilder extends TableBuilder<any, any> ? TBuilder : never>;
 export {};
 //# sourceMappingURL=queryable.d.ts.map