@simplysm/orm-common 13.0.75 → 13.0.77

package/src/query-builder/mssql/mssql-query-builder.ts

@@ -1,8 +1,8 @@
 import type {
   AddColumnQueryDef,
-  AddFkQueryDef,
-  AddIdxQueryDef,
-  AddPkQueryDef,
+  AddForeignKeyQueryDef,
+  AddIndexQueryDef,
+  AddPrimaryKeyQueryDef,
   ClearSchemaQueryDef,
   CreateProcQueryDef,
   CreateTableQueryDef,
@@ -10,9 +10,9 @@ import type {
   SchemaExistsQueryDef,
   DeleteQueryDef,
   DropColumnQueryDef,
-  DropFkQueryDef,
-  DropIdxQueryDef,
-  DropPkQueryDef,
+  DropForeignKeyQueryDef,
+  DropIndexQueryDef,
+  DropPrimaryKeyQueryDef,
   DropProcQueryDef,
   DropTableQueryDef,
   DropViewQueryDef,
@@ -463,7 +463,7 @@ export class MssqlQueryBuilder extends QueryBuilderBase {
 
   //#region ========== DDL - Constraint ==========
 
-  protected addPk(def: AddPkQueryDef): QueryBuildResult {
+  protected addPrimaryKey(def: AddPrimaryKeyQueryDef): QueryBuildResult {
     const table = this.tableName(def.table);
     const cols = def.columns.map((c) => this.expr.wrap(c)).join(", ");
     const pkName = `PK_${def.table.name}`;
@@ -472,13 +472,13 @@ export class MssqlQueryBuilder extends QueryBuilderBase {
     };
   }
 
-  protected dropPk(def: DropPkQueryDef): QueryBuildResult {
+  protected dropPrimaryKey(def: DropPrimaryKeyQueryDef): QueryBuildResult {
     const table = this.tableName(def.table);
     const pkName = `PK_${def.table.name}`;
     return { sql: `ALTER TABLE ${table} DROP CONSTRAINT ${this.expr.wrap(pkName)}` };
   }
 
-  protected addFk(def: AddFkQueryDef): QueryBuildResult {
+  protected addForeignKey(def: AddForeignKeyQueryDef): QueryBuildResult {
     const table = this.tableName(def.table);
     const fk = def.foreignKey;
     const fkCols = fk.fkColumns.map((c) => this.expr.wrap(c)).join(", ");
@@ -494,13 +494,13 @@ export class MssqlQueryBuilder extends QueryBuilderBase {
     return { sql };
   }
 
-  protected dropFk(def: DropFkQueryDef): QueryBuildResult {
+  protected dropForeignKey(def: DropForeignKeyQueryDef): QueryBuildResult {
     return {
       sql: `ALTER TABLE ${this.tableName(def.table)} DROP CONSTRAINT ${this.expr.wrap(def.foreignKey)}`,
     };
   }
 
-  protected addIdx(def: AddIdxQueryDef): QueryBuildResult {
+  protected addIndex(def: AddIndexQueryDef): QueryBuildResult {
     const table = this.tableName(def.table);
     const idx = def.index;
     const cols = idx.columns.map((c) => `${this.expr.wrap(c.name)} ${c.orderBy}`).join(", ");
@@ -508,7 +508,7 @@ export class MssqlQueryBuilder extends QueryBuilderBase {
     return { sql: `CREATE ${unique}INDEX ${this.expr.wrap(idx.name)} ON ${table} (${cols})` };
   }
 
-  protected dropIdx(def: DropIdxQueryDef): QueryBuildResult {
+  protected dropIndex(def: DropIndexQueryDef): QueryBuildResult {
     return { sql: `DROP INDEX ${this.expr.wrap(def.index)} ON ${this.tableName(def.table)}` };
   }
 
@@ -640,7 +640,7 @@ SELECT @result AS name WHERE @result IS NOT NULL`,
 
   protected switchFk(def: SwitchFkQueryDef): QueryBuildResult {
     const table = this.tableName(def.table);
-    if (def.switch === "on") {
+    if (def.enabled) {
       return { sql: `ALTER TABLE ${table} WITH CHECK CHECK CONSTRAINT ALL` };
     }
     return { sql: `ALTER TABLE ${table} NOCHECK CONSTRAINT ALL` };

package/src/query-builder/mysql/mysql-expr-renderer.ts

@@ -1,4 +1,4 @@
-import { DateOnly, DateTime, Time, Uuid, bytesToHex } from "@simplysm/core-common";
+import { bytes, DateOnly, DateTime, Time, Uuid } from "@simplysm/core-common";
 import type {
   ExprColumn,
   ExprValue,
@@ -46,7 +46,7 @@ import type {
   ExprDateDiff,
   ExprDateAdd,
   ExprFormatDate,
-  ExprIfNull,
+  ExprCoalesce,
   ExprNullIf,
   ExprIs,
   ExprSwitch,
@@ -60,9 +60,10 @@ import type {
   ExprLeast,
   ExprRowNum,
   ExprCast,
+  ExprRandom,
   ExprWindow,
   ExprSubquery,
-  DateSeparator,
+  DateUnit,
 } from "../../types/expr";
 import type { DataType } from "../../types/column";
 import { ExprRendererBase } from "../base/expr-renderer-base";
@@ -113,10 +114,10 @@ export class MysqlExprRenderer extends ExprRendererBase {
       return `'${value.toFormatString("HH:mm:ss")}'`;
     }
     if (value instanceof Uuid) {
-      return `0x${bytesToHex(value.toBytes())}`;
+      return `0x${bytes.toHex(value.toBytes())}`;
     }
     if (value instanceof Uint8Array) {
-      return `0x${bytesToHex(value)}`;
+      return `0x${bytes.toHex(value)}`;
     }
     throw new Error(`Unknown value type: ${typeof value}`);
   }
@@ -390,7 +391,7 @@ export class MysqlExprRenderer extends ExprRendererBase {
   protected dateDiff(expr: ExprDateDiff): string {
     const from = this.render(expr.from);
     const to = this.render(expr.to);
-    switch (expr.separator) {
+    switch (expr.unit) {
       case "year":
         return `TIMESTAMPDIFF(YEAR, ${from}, ${to})`;
       case "month":
@@ -409,7 +410,7 @@ export class MysqlExprRenderer extends ExprRendererBase {
   protected dateAdd(expr: ExprDateAdd): string {
     const source = this.render(expr.source);
     const value = this.render(expr.value);
-    const unit = this.dateSeparatorToUnit(expr.separator);
+    const unit = this.dateUnitToSql(expr.unit);
     return `DATE_ADD(${source}, INTERVAL ${value} ${unit})`;
   }
 
@@ -419,8 +420,8 @@ export class MysqlExprRenderer extends ExprRendererBase {
     return `DATE_FORMAT(${this.render(expr.source)}, '${mysqlFormat}')`;
   }
 
-  private dateSeparatorToUnit(sep: DateSeparator): string {
-    switch (sep) {
+  private dateUnitToSql(unit: DateUnit): string {
+    switch (unit) {
       case "year":
         return "YEAR";
       case "month":
@@ -451,7 +452,7 @@ export class MysqlExprRenderer extends ExprRendererBase {
 
   //#region ========== condition ==========
 
-  protected ifNull(expr: ExprIfNull): string {
+  protected coalesce(expr: ExprCoalesce): string {
     if (expr.args.length === 0) return "NULL";
     if (expr.args.length === 1) return this.render(expr.args[0]);
     // COALESCE로 Render (여러 value 중 첫 번째 non-null)
@@ -526,7 +527,7 @@ export class MysqlExprRenderer extends ExprRendererBase {
     return "ROW_NUMBER() OVER ()";
   }
 
-  protected random(): string {
+  protected random(_expr: ExprRandom): string {
     return "RAND()";
   }
 

package/src/query-builder/mysql/mysql-query-builder.ts

@@ -1,9 +1,9 @@
 import { Uuid } from "@simplysm/core-common";
 import type {
   AddColumnQueryDef,
-  AddFkQueryDef,
-  AddIdxQueryDef,
-  AddPkQueryDef,
+  AddForeignKeyQueryDef,
+  AddIndexQueryDef,
+  AddPrimaryKeyQueryDef,
   ClearSchemaQueryDef,
   CreateProcQueryDef,
   CreateTableQueryDef,
@@ -11,9 +11,9 @@ import type {
   SchemaExistsQueryDef,
   DeleteQueryDef,
   DropColumnQueryDef,
-  DropFkQueryDef,
-  DropIdxQueryDef,
-  DropPkQueryDef,
+  DropForeignKeyQueryDef,
+  DropIndexQueryDef,
+  DropPrimaryKeyQueryDef,
   DropProcQueryDef,
   DropTableQueryDef,
   DropViewQueryDef,
@@ -288,7 +288,7 @@ export class MysqlQueryBuilder extends QueryBuilderBase {
     }
 
     // PK가 AI 아님: 임시 Table로 PK 저장 후 조회
-    const tempTableName = this.expr.wrap("SD_TEMP_" + Uuid.new().toString().replace(/-/g, ""));
+    const tempTableName = this.expr.wrap("SD_TEMP_" + Uuid.generate().toString().replace(/-/g, ""));
 
     // recordsSelectQuery에서 PK column만 추출한 SELECT Generate
     const pkSelectDef: SelectQueryDef = {
@@ -343,7 +343,7 @@ export class MysqlQueryBuilder extends QueryBuilderBase {
 
     // OUTPUT 필요: multi-statement (임시table에 PK 저장 + UPDATE + SELECT + DROP)
     const outputCols = def.output.columns.map((c) => `${alias}.${this.expr.wrap(c)}`).join(", ");
-    const tempTableName = this.expr.wrap("SD_TEMP_" + Uuid.new().toString().replace(/-/g, ""));
+    const tempTableName = this.expr.wrap("SD_TEMP_" + Uuid.generate().toString().replace(/-/g, ""));
 
     // UPDATE 대상 PK를 임시 Table에 저장 (UPDATE 후 WHERE condition이 달라질 수 있으므로)
     const pkSelectCols = def.output.pkColNames
@@ -395,7 +395,7 @@ export class MysqlQueryBuilder extends QueryBuilderBase {
 
     // OUTPUT 필요: multi-statement (Delete 전 임시table에 저장 + DELETE + SELECT + DROP)
     const outputCols = def.output.columns.map((c) => `${alias}.${this.expr.wrap(c)}`).join(", ");
-    const tempTableName = this.expr.wrap("SD_TEMP_" + Uuid.new().toString().replace(/-/g, ""));
+    const tempTableName = this.expr.wrap("SD_TEMP_" + Uuid.generate().toString().replace(/-/g, ""));
 
     // Delete 전 임시 Table에 저장
     let createTempSql = `CREATE TEMPORARY TABLE ${tempTableName} AS SELECT ${outputCols} FROM ${table} AS ${alias}`;
@@ -456,7 +456,7 @@ export class MysqlQueryBuilder extends QueryBuilderBase {
 
     // OUTPUT 필요: multi-statement (CREATE TEMP + UPDATE + INSERT + SELECT + DROP)
     const outputCols = def.output.columns.map((c) => this.expr.wrap(c)).join(", ");
-    const tempTableName = this.expr.wrap("SD_TEMP_" + Uuid.new().toString().replace(/-/g, ""));
+    const tempTableName = this.expr.wrap("SD_TEMP_" + Uuid.generate().toString().replace(/-/g, ""));
 
     // UPDATE 대상 PK를 임시 Table에 저장 (UPDATE 후 WHERE condition이 달라질 수 있으므로)
     const pkSelectCols = def.output.pkColNames.map((pk) => this.expr.wrap(pk)).join(", ");
@@ -618,17 +618,17 @@ export class MysqlQueryBuilder extends QueryBuilderBase {
 
   //#region ========== DDL - Constraint ==========
 
-  protected addPk(def: AddPkQueryDef): QueryBuildResult {
+  protected addPrimaryKey(def: AddPrimaryKeyQueryDef): QueryBuildResult {
     const table = this.tableName(def.table);
     const cols = def.columns.map((c) => this.expr.wrap(c)).join(", ");
     return { sql: `ALTER TABLE ${table} ADD PRIMARY KEY (${cols})` };
   }
 
-  protected dropPk(def: DropPkQueryDef): QueryBuildResult {
+  protected dropPrimaryKey(def: DropPrimaryKeyQueryDef): QueryBuildResult {
     return { sql: `ALTER TABLE ${this.tableName(def.table)} DROP PRIMARY KEY` };
   }
 
-  protected addFk(def: AddFkQueryDef): QueryBuildResult {
+  protected addForeignKey(def: AddForeignKeyQueryDef): QueryBuildResult {
     const table = this.tableName(def.table);
     const fk = def.foreignKey;
     const fkCols = fk.fkColumns.map((c) => this.expr.wrap(c)).join(", ");
@@ -641,13 +641,13 @@ export class MysqlQueryBuilder extends QueryBuilderBase {
     };
   }
 
-  protected dropFk(def: DropFkQueryDef): QueryBuildResult {
+  protected dropForeignKey(def: DropForeignKeyQueryDef): QueryBuildResult {
     return {
       sql: `ALTER TABLE ${this.tableName(def.table)} DROP FOREIGN KEY ${this.expr.wrap(def.foreignKey)}`,
     };
   }
 
-  protected addIdx(def: AddIdxQueryDef): QueryBuildResult {
+  protected addIndex(def: AddIndexQueryDef): QueryBuildResult {
     const table = this.tableName(def.table);
     const idx = def.index;
     const cols = idx.columns.map((c) => `${this.expr.wrap(c.name)} ${c.orderBy}`).join(", ");
@@ -655,7 +655,7 @@ export class MysqlQueryBuilder extends QueryBuilderBase {
     return { sql: `CREATE ${unique}INDEX ${this.expr.wrap(idx.name)} ON ${table} (${cols})` };
   }
 
-  protected dropIdx(def: DropIdxQueryDef): QueryBuildResult {
+  protected dropIndex(def: DropIndexQueryDef): QueryBuildResult {
     return { sql: `DROP INDEX ${this.expr.wrap(def.index)} ON ${this.tableName(def.table)}` };
   }
 
@@ -750,7 +750,7 @@ SET FOREIGN_KEY_CHECKS = 1`,
 
   /** MySQL은 전역 설정만 지원 (table 파라미터 무시됨) */
   protected switchFk(def: SwitchFkQueryDef): QueryBuildResult {
-    return def.switch === "on"
+    return def.enabled
       ? { sql: "SET FOREIGN_KEY_CHECKS = 1" }
       : { sql: "SET FOREIGN_KEY_CHECKS = 0" };
   }

package/src/query-builder/postgresql/postgresql-expr-renderer.ts

@@ -1,4 +1,4 @@
-import { DateOnly, DateTime, Time, Uuid, bytesToHex } from "@simplysm/core-common";
+import { bytes, DateOnly, DateTime, Time, Uuid } from "@simplysm/core-common";
 import type {
   ExprColumn,
   ExprValue,
@@ -46,7 +46,7 @@ import type {
   ExprDateDiff,
   ExprDateAdd,
   ExprFormatDate,
-  ExprIfNull,
+  ExprCoalesce,
   ExprNullIf,
   ExprIs,
   ExprSwitch,
@@ -60,9 +60,10 @@ import type {
   ExprLeast,
   ExprRowNum,
   ExprCast,
+  ExprRandom,
   ExprWindow,
   ExprSubquery,
-  DateSeparator,
+  DateUnit,
 } from "../../types/expr";
 import type { DataType } from "../../types/column";
 import { ExprRendererBase } from "../base/expr-renderer-base";
@@ -110,7 +111,7 @@ export class PostgresqlExprRenderer extends ExprRendererBase {
       return `'${value.toString()}'::uuid`;
     }
     if (value instanceof Uint8Array) {
-      return `'\\x${bytesToHex(value)}'::bytea`;
+      return `'\\x${bytes.toHex(value)}'::bytea`;
     }
     throw new Error(`Unknown value type: ${typeof value}`);
   }
@@ -388,7 +389,7 @@ export class PostgresqlExprRenderer extends ExprRendererBase {
   protected dateDiff(expr: ExprDateDiff): string {
     const from = this.render(expr.from);
     const to = this.render(expr.to);
-    switch (expr.separator) {
+    switch (expr.unit) {
       case "year":
         return `EXTRACT(YEAR FROM AGE(${to}, ${from}))::INTEGER`;
       case "month":
@@ -407,7 +408,7 @@ export class PostgresqlExprRenderer extends ExprRendererBase {
   protected dateAdd(expr: ExprDateAdd): string {
     const source = this.render(expr.source);
     const value = this.render(expr.value);
-    const unit = this.dateSeparatorToUnit(expr.separator);
+    const unit = this.dateUnitToSql(expr.unit);
     return `${source} + INTERVAL '1 ${unit}' * ${value}`;
   }
 
@@ -417,8 +418,8 @@ export class PostgresqlExprRenderer extends ExprRendererBase {
     return `TO_CHAR(${this.render(expr.source)}, '${pgFormat}')`;
   }
 
-  private dateSeparatorToUnit(sep: DateSeparator): string {
-    switch (sep) {
+  private dateUnitToSql(unit: DateUnit): string {
+    switch (unit) {
       case "year":
         return "year";
       case "month":
@@ -449,7 +450,7 @@ export class PostgresqlExprRenderer extends ExprRendererBase {
 
   //#region ========== condition ==========
 
-  protected ifNull(expr: ExprIfNull): string {
+  protected coalesce(expr: ExprCoalesce): string {
     if (expr.args.length === 0) return "NULL";
     if (expr.args.length === 1) return this.render(expr.args[0]);
     // PostgreSQL: COALESCE
@@ -524,7 +525,7 @@ export class PostgresqlExprRenderer extends ExprRendererBase {
     return "ROW_NUMBER() OVER ()";
   }
 
-  protected random(): string {
+  protected random(_expr: ExprRandom): string {
     return "RANDOM()";
   }
 

package/src/query-builder/postgresql/postgresql-query-builder.ts

@@ -1,8 +1,8 @@
 import type {
   AddColumnQueryDef,
-  AddFkQueryDef,
-  AddIdxQueryDef,
-  AddPkQueryDef,
+  AddForeignKeyQueryDef,
+  AddIndexQueryDef,
+  AddPrimaryKeyQueryDef,
   ClearSchemaQueryDef,
   CreateProcQueryDef,
   CreateTableQueryDef,
@@ -10,9 +10,9 @@ import type {
   SchemaExistsQueryDef,
   DeleteQueryDef,
   DropColumnQueryDef,
-  DropFkQueryDef,
-  DropIdxQueryDef,
-  DropPkQueryDef,
+  DropForeignKeyQueryDef,
+  DropIndexQueryDef,
+  DropPrimaryKeyQueryDef,
   DropProcQueryDef,
   DropTableQueryDef,
   DropViewQueryDef,
@@ -502,7 +502,7 @@ export class PostgresqlQueryBuilder extends QueryBuilderBase {
 
   //#region ========== DDL - Constraint ==========
 
-  protected addPk(def: AddPkQueryDef): QueryBuildResult {
+  protected addPrimaryKey(def: AddPrimaryKeyQueryDef): QueryBuildResult {
     const table = this.tableName(def.table);
     const cols = def.columns.map((c) => this.expr.wrap(c)).join(", ");
     const pkName = `PK_${def.table.name}`;
@@ -511,13 +511,13 @@ export class PostgresqlQueryBuilder extends QueryBuilderBase {
     };
   }
 
-  protected dropPk(def: DropPkQueryDef): QueryBuildResult {
+  protected dropPrimaryKey(def: DropPrimaryKeyQueryDef): QueryBuildResult {
     const table = this.tableName(def.table);
     const pkName = `PK_${def.table.name}`;
     return { sql: `ALTER TABLE ${table} DROP CONSTRAINT ${this.expr.wrap(pkName)}` };
   }
 
-  protected addFk(def: AddFkQueryDef): QueryBuildResult {
+  protected addForeignKey(def: AddForeignKeyQueryDef): QueryBuildResult {
     const table = this.tableName(def.table);
     const fk = def.foreignKey;
     const fkCols = fk.fkColumns.map((c) => this.expr.wrap(c)).join(", ");
@@ -533,13 +533,13 @@ export class PostgresqlQueryBuilder extends QueryBuilderBase {
     return { sql };
   }
 
-  protected dropFk(def: DropFkQueryDef): QueryBuildResult {
+  protected dropForeignKey(def: DropForeignKeyQueryDef): QueryBuildResult {
     return {
       sql: `ALTER TABLE ${this.tableName(def.table)} DROP CONSTRAINT ${this.expr.wrap(def.foreignKey)}`,
     };
   }
 
-  protected addIdx(def: AddIdxQueryDef): QueryBuildResult {
+  protected addIndex(def: AddIndexQueryDef): QueryBuildResult {
     const table = this.tableName(def.table);
     const idx = def.index;
     const cols = idx.columns.map((c) => `${this.expr.wrap(c.name)} ${c.orderBy}`).join(", ");
@@ -547,7 +547,7 @@ export class PostgresqlQueryBuilder extends QueryBuilderBase {
     return { sql: `CREATE ${unique}INDEX ${this.expr.wrap(idx.name)} ON ${table} (${cols})` };
   }
 
-  protected dropIdx(def: DropIdxQueryDef): QueryBuildResult {
+  protected dropIndex(def: DropIndexQueryDef): QueryBuildResult {
     // PostgreSQL: Index는 schema 레벨에서 유니크하므로 Table명 불필요하지만 스키마는 명시 필요
     const schema = def.table.schema ?? "public";
     return { sql: `DROP INDEX ${this.expr.wrap(schema)}.${this.expr.wrap(def.index)}` };
@@ -674,7 +674,7 @@ END $$`,
 
   protected switchFk(def: SwitchFkQueryDef): QueryBuildResult {
     const table = this.tableName(def.table);
-    if (def.switch === "on") {
+    if (def.enabled) {
       // PostgreSQL: Table의 모든 FK 트리거 Enable
       return { sql: `ALTER TABLE ${table} ENABLE TRIGGER ALL` };
     }

package/src/schema/procedure-builder.ts

@@ -34,7 +34,7 @@ import { type ColumnBuilderRecord, createColumnFactory } from "./factory/column-
  * }
  *
  * // 호출
- * const users = await db.getUserById({ userId: 1n }).result();
+ * const users = await db.getUserById({ userId: 1n }).execute();
  * ```
  *
  * @see {@link Procedure} factory function

package/src/schema/table-builder.ts

@@ -58,7 +58,7 @@ export class TableBuilder<
   readonly $relations!: TRelations;
 
   /** 전체 Type inference (column + relationship) */
-  readonly $infer!: InferColumns<TColumns> & InferDeepRelations<TRelations>;
+  readonly $inferSelect!: InferColumns<TColumns> & InferDeepRelations<TRelations>;
   /** column만 Type inference */
   readonly $inferColumns!: InferColumns<TColumns>;
   /** INSERT용 Type inference (autoIncrement exclude, nullable/default는 optional) */

package/src/schema/view-builder.ts

@@ -55,7 +55,7 @@ export class ViewBuilder<
   /** relationship definition (type for inference) */
   readonly $relations!: TRelations;
   /** 전체 Type inference */
-  readonly $infer!: TData;
+  readonly $inferSelect!: TData;
 
   /**
    * @param meta - View Metadata

package/src/types/db-context-def.ts

@@ -27,7 +27,7 @@ export interface DbContextBase {
   getQueryDefObjectName(
     tableOrView: TableBuilder<any, any> | ViewBuilder<any, any, any>,
   ): QueryDefObjectName;
-  switchFk(table: QueryDefObjectName, switch_: "on" | "off"): Promise<void>;
+  switchFk(table: QueryDefObjectName, enabled: boolean): Promise<void>;
 }
 
 export type DbContextStatus = "ready" | "connect" | "transact";
@@ -61,13 +61,13 @@ export type DbContextInstance<TDef extends DbContextDef<any, any, any>> = DbCont
   DbContextDdlMethods & {
     // Auto-mapped table queryable accessors
     [K in keyof TDef["meta"]["tables"]]: () => import("../exec/queryable").Queryable<
-      TDef["meta"]["tables"][K]["$infer"],
+      TDef["meta"]["tables"][K]["$inferSelect"],
       TDef["meta"]["tables"][K]
     >;
   } & {
     // Auto-mapped view queryable accessors
     [K in keyof TDef["meta"]["views"]]: () => import("../exec/queryable").Queryable<
-      TDef["meta"]["views"][K]["$infer"],
+      TDef["meta"]["views"][K]["$inferSelect"],
       never
     >;
   } & {
@@ -86,7 +86,7 @@ export type DbContextInstance<TDef extends DbContextDef<any, any, any>> = DbCont
 export interface DbContextConnectionMethods {
   connect<TResult>(fn: () => Promise<TResult>, isolationLevel?: IsolationLevel): Promise<TResult>;
   connectWithoutTransaction<TResult>(callback: () => Promise<TResult>): Promise<TResult>;
-  trans<TResult>(fn: () => Promise<TResult>, isolationLevel?: IsolationLevel): Promise<TResult>;
+  transaction<TResult>(fn: () => Promise<TResult>, isolationLevel?: IsolationLevel): Promise<TResult>;
 }
 
 export interface DbContextDdlMethods {
@@ -109,20 +109,20 @@ export interface DbContextDdlMethods {
     column: ColumnBuilder<any, any>,
   ): Promise<void>;
   renameColumn(table: QueryDefObjectName, column: string, newName: string): Promise<void>;
-  addPk(table: QueryDefObjectName, columns: string[]): Promise<void>;
-  dropPk(table: QueryDefObjectName): Promise<void>;
-  addFk(
+  addPrimaryKey(table: QueryDefObjectName, columns: string[]): Promise<void>;
+  dropPrimaryKey(table: QueryDefObjectName): Promise<void>;
+  addForeignKey(
     table: QueryDefObjectName,
     relationName: string,
     relationDef: ForeignKeyBuilder<any, any>,
   ): Promise<void>;
-  addIdx(table: QueryDefObjectName, indexBuilder: IndexBuilder<string[]>): Promise<void>;
-  dropFk(table: QueryDefObjectName, relationName: string): Promise<void>;
-  dropIdx(table: QueryDefObjectName, columns: string[]): Promise<void>;
+  addIndex(table: QueryDefObjectName, indexBuilder: IndexBuilder<string[]>): Promise<void>;
+  dropForeignKey(table: QueryDefObjectName, relationName: string): Promise<void>;
+  dropIndex(table: QueryDefObjectName, columns: string[]): Promise<void>;
   clearSchema(params: { database: string; schema?: string }): Promise<void>;
   schemaExists(database: string, schema?: string): Promise<boolean>;
   truncate(table: QueryDefObjectName): Promise<void>;
-  switchFk(table: QueryDefObjectName, switch_: "on" | "off"): Promise<void>;
+  switchFk(table: QueryDefObjectName, enabled: boolean): Promise<void>;
   // QueryDef generators
   getCreateTableQueryDef(table: TableBuilder<any, any>): QueryDef;
   getCreateViewQueryDef(view: ViewBuilder<any, any, any>): QueryDef;
@@ -146,18 +146,18 @@ export interface DbContextDdlMethods {
     column: ColumnBuilder<any, any>,
   ): QueryDef;
   getRenameColumnQueryDef(table: QueryDefObjectName, column: string, newName: string): QueryDef;
-  getAddPkQueryDef(table: QueryDefObjectName, columns: string[]): QueryDef;
-  getDropPkQueryDef(table: QueryDefObjectName): QueryDef;
-  getAddFkQueryDef(
+  getAddPrimaryKeyQueryDef(table: QueryDefObjectName, columns: string[]): QueryDef;
+  getDropPrimaryKeyQueryDef(table: QueryDefObjectName): QueryDef;
+  getAddForeignKeyQueryDef(
     table: QueryDefObjectName,
     relationName: string,
     relationDef: ForeignKeyBuilder<any, any>,
   ): QueryDef;
-  getAddIdxQueryDef(table: QueryDefObjectName, indexBuilder: IndexBuilder<string[]>): QueryDef;
-  getDropFkQueryDef(table: QueryDefObjectName, relationName: string): QueryDef;
-  getDropIdxQueryDef(table: QueryDefObjectName, columns: string[]): QueryDef;
+  getAddIndexQueryDef(table: QueryDefObjectName, indexBuilder: IndexBuilder<string[]>): QueryDef;
+  getDropForeignKeyQueryDef(table: QueryDefObjectName, relationName: string): QueryDef;
+  getDropIndexQueryDef(table: QueryDefObjectName, columns: string[]): QueryDef;
   getClearSchemaQueryDef(params: { database: string; schema?: string }): QueryDef;
   getSchemaExistsQueryDef(database: string, schema?: string): QueryDef;
   getTruncateQueryDef(table: QueryDefObjectName): QueryDef;
-  getSwitchFkQueryDef(table: QueryDefObjectName, switch_: "on" | "off"): QueryDef;
+  getSwitchFkQueryDef(table: QueryDefObjectName, enabled: boolean): QueryDef;
 }

package/src/types/expr.ts

@@ -6,7 +6,7 @@ import type { SelectQueryDef } from "./query-def";
  *
  * dateDiff, dateAdd 등 Date functionused in
  */
-export type DateSeparator = "year" | "month" | "day" | "hour" | "minute" | "second";
+export type DateUnit = "year" | "month" | "day" | "hour" | "minute" | "second";
 
 //#region ========== value expression ==========
 
@@ -326,7 +326,7 @@ export interface ExprIsoYearMonth {
 /** Date 차이 (DATEDIFF) */
 export interface ExprDateDiff {
   type: "dateDiff";
-  separator: DateSeparator;
+  unit: DateUnit;
   from: Expr;
   to: Expr;
 }
@@ -334,7 +334,7 @@ export interface ExprDateDiff {
 /** Date 연산 (DATEADD) */
 export interface ExprDateAdd {
   type: "dateAdd";
-  separator: DateSeparator;
+  unit: DateUnit;
   source: Expr;
   value: Expr;
 }
@@ -351,8 +351,8 @@ export interface ExprFormatDate {
 //#region ========== condition ==========
 
 /** NULL 대체 (COALESCE - 첫 번째 non-null return) */
-export interface ExprIfNull {
-  type: "ifNull";
+export interface ExprCoalesce {
+  type: "coalesce";
   args: Expr[];
 }
 
@@ -668,7 +668,7 @@ export type Expr =
   | ExprFormatDate
 
   // Condition
-  | ExprIfNull
+  | ExprCoalesce
   | ExprNullIf
   | ExprIs
   | ExprSwitch