@pdg/drizzle-mysql 1.0.1 → 1.0.3

package/README.md

@@ -38,14 +38,27 @@ const posts = mysqlTable('posts', {
 const db = drizzleMySql({
   url: process.env.DATABASE_URL!,
   schema: { users, posts },
+  getTimestamp: () => new Date().toISOString(),
 });
 const user = db.query(users);
 ```
 
-`drizzleMySql` 옵션은 `url`, `schema`, 선택 사항인 `timestamp`입니다. `db.query(table)`은 해당 테이블에 맞춰 타입이 지정된 쿼리 객체를 반환합니다. 연결을 다 사용한 뒤 `await db.close()`로 커넥션 풀을 닫습니다.
+`drizzleMySql` 옵션은 모두 필수인 `url`, `schema`, `getTimestamp`입니다. `db.query(table)`은 해당 테이블에 맞춰 타입이 지정된 쿼리 객체를 반환합니다. `new MySqlQuery(table, db.current, getTimestamp?)`의 세 번째 인자는 선택 사항이며, 생략하면 해당 `drizzleMySql`에 설정한 생성 함수를 사용합니다. 명시하면 그 쿼리 객체에서만 해당 함수를 우선 사용합니다. 연결을 다 사용한 뒤 `await db.close()`로 커넥션 풀을 닫습니다.
 
 ### 데이터 추가·수정·삭제
 
+입력값을 변수로 준비할 때는 `insertValues` / `updateValues` 헬퍼를 사용하면 스키마 제네릭을 반복해서 지정하지 않아도 됩니다. 해당 쿼리의 입력 타입과 컬럼 정책으로 검사하며, 전달한 객체 또는 배열을 그대로 반환합니다. 헬퍼 자체는 DB 쿼리, 런타임 정책 검사, 기본 시각 생성을 실행하지 않습니다. 런타임 처리는 `add` / `edit`에서 수행합니다.
+
+```ts
+const insertValues = user.insertValues({ name: '홍길동' });
+const id = await user.add(insertValues);
+const updateValues = user.updateValues({ name: '김민수' });
+await user.editByPrimaryKey(updateValues, id);
+
+const rows = user.insertValues([{ name: '사용자1' }, { name: '사용자2' }]);
+await user.add(rows);
+```
+
 자동 증가 기본 키가 있는 테이블에서 `add`는 생성된 키를 반환합니다. 여러 행을 넣으면 키 배열을 반환합니다.
 
 ```ts
@@ -102,6 +115,8 @@ const projected = await user.find(
 );
 ```
 
+문자열 컬럼 선택의 별칭 키워드는 대소문자를 구분하지 않습니다. `name as displayName`, `name AS displayName`, `name As displayName`, `name aS displayName`을 모두 사용할 수 있으며, 결과 키의 대소문자는 지정한 별칭 그대로 유지됩니다. `select`, `find`, `columns`에서 동일하게 적용됩니다.
+
 테이블의 TypeScript 속성명과 SQL 컬럼명을 다르게 지정하면 기본 전체 조회 결과 키와 추론된 타입이 달라질 수 있습니다. 기본 컬럼 선택을 사용할 경우 스키마 속성명과 SQL 컬럼명을 같게 작성하는 것을 권장합니다. 이름이 다르면 필요한 컬럼을 명시적으로 선택하고 별칭을 지정하세요.
 
 ### 조건식
@@ -320,7 +335,9 @@ await db.trans(async () => {
 
 ### 생성·수정 시각
 
-컬럼 정책은 이 패키지에서 가져온 `mysqlTable`에 선언합니다. 자동 증가 컬럼은 기본적으로 등록과 수정이 금지되며, 각각 `insertAllowed()`와 `updateAllowed()`로 허용할 수 있습니다. 다른 컬럼은 `insertBlocked()`와 `updateBlocked()`로 금지하거나 `updateRequired()`로 수정 시 필수로 지정합니다. 금지된 값을 전달하거나 필수 수정 값을 누락하면 런타임에도 오류가 발생합니다.
+컬럼 정책은 이 패키지에서 가져온 `mysqlTable`에 선언합니다. 자동 증가 컬럼은 기본적으로 등록과 수정이 금지되며, 각각 `insertAllowed()`와 `updateAllowed()`로 허용할 수 있습니다. `primaryKey()`로 지정한 컬럼도 기본적으로 수정이 금지되며, `updateAllowed()`를 명시해야 수정할 수 있습니다. 다른 컬럼은 `insertBlocked()`와 `updateBlocked()`로 금지하거나 `updateRequired()`로 수정 시 필수로 지정합니다. 금지된 값을 전달하거나 필수 수정 값을 누락하면 런타임에도 오류가 발생합니다.
+
+금지 컬럼은 `MySqlInsertValues` / `MySqlUpdateValues`의 키에서 제외됩니다. 따라서 타입이 지정된 객체 리터럴에는 `undefined`로도 지정할 수 없습니다. TypeScript의 구조적 타입 검사로 인해 추가 속성이 있는 기존 변수를 전달하는 경우에는 컴파일을 통과할 수 있지만, 런타임에서는 금지 컬럼 키가 있으면 값이 `undefined`여도 오류가 발생합니다.
 
 ```ts
 import { drizzleMySql, mysqlTable, int, varchar, datetime } from '@pdg/drizzle-mysql';
@@ -332,13 +349,20 @@ const users = mysqlTable('users', {
   created_at: datetime({ mode: 'string' }).notNull().createdAt(),
   updated_at: datetime({ mode: 'string' }).notNull().updatedAt(),
 });
-const db = drizzleMySql({ url: process.env.DATABASE_URL!, schema: { users }, timestamp: () => new Date().toISOString() });
+const db = drizzleMySql({ url: process.env.DATABASE_URL!, schema: { users }, getTimestamp: () => new Date().toISOString() });
 const usersQuery = db.query(users);
 const id = await usersQuery.add({ name: '사용자' });
 await usersQuery.editByPrimaryKey({ name: '수정' }, id);
 ```
 
-`createdAt()`은 등록 시, `updatedAt()`은 등록과 수정 시 `timestamp` 생성 함수의 값을 자동으로 넣습니다. 지정된 시각 컬럼은 직접 입력할 수 없으며 생성 함수를 설정하지 않으면 해당 작업에서 오류가 발생합니다. 컬럼의 데이터 형식에 맞는 값을 반환해야 합니다. 정책은 `MySqlQuery`에만 적용되며 `db.current()`의 원본 Drizzle 쿼리에는 적용되지 않습니다. `mysqlTableCreator`, `mysqlSchema` 또는 Drizzle에서 직접 가져온 `mysqlTable`은 컬럼 정책을 수집하지 않으므로 정책이 필요한 테이블에는 이 패키지의 `mysqlTable`을 사용합니다.
+`createdAt()`과 `updatedAt()` 컬럼은 `add` 시 직접 값을 지정할 수 있습니다. 생략하거나 `undefined`를 전달한 컬럼만 `getTimestamp` 생성 함수의 기본값으로 채우며, 한 행에서 생성한 값은 누락된 시각 컬럼들이 공유합니다. `edit` 시에는 `createdAt()`의 직접 입력을 금지하고 기존 값을 유지합니다. `updatedAt()`은 직접 지정한 값을 사용하며, 생략하거나 `undefined`이면 기본 시각으로 갱신합니다. 명시적인 `updateBlocked()` 정책은 계속 적용되며, `updatedAt().updateRequired()`는 생략 시 기본 시각을 사용합니다. 직접 지정하는 값과 생성 함수의 반환값은 컬럼의 데이터 형식에 맞아야 합니다. `MySqlQuery`에 `db.current`가 아닌 연결 함수를 직접 전달하는 경우에는 기본 시각이 필요한 작업을 위해 세 번째 인자로 시각 생성 함수도 지정해야 하며, 생성 함수 없이 기본 시각이 필요한 작업을 실행하면 오류가 발생합니다. 정책은 `MySqlQuery`에만 적용되며 `db.current()`의 원본 Drizzle 쿼리에는 적용되지 않습니다. `mysqlTableCreator`, `mysqlSchema` 또는 Drizzle에서 직접 가져온 `mysqlTable`은 컬럼 정책을 수집하지 않으므로 정책이 필요한 테이블에는 이 패키지의 `mysqlTable`을 사용합니다.
+
+```ts
+await usersQuery.add({ name: '사용자', created_at: '2026-01-01 00:00:00' });
+// created_at은 지정한 값을 유지하고 updated_at은 getTimestamp의 값을 사용합니다.
+await usersQuery.editByPrimaryKey({ updated_at: '2026-01-02 00:00:00' }, id);
+// updated_at은 지정한 값을 사용합니다.
+```
 
 ### 집계·SQL 표현식
 

package/dist/@types/MySqlInsertValues.d.cts

@@ -3,14 +3,15 @@ import type { MySqlInsertValue as InsertValue } from 'drizzle-orm/mysql-core/que
 import type { TablePolicies } from '../mysqlTable.cjs';
 type Blocked<T extends MySqlTable> = {
     [K in keyof InsertValue<T>]: K extends keyof TablePolicies<T> ? TablePolicies<T>[K] extends {
-        timestamp: string;
-    } | {
         insert: 'blocked';
     } ? K : TablePolicies<T>[K] extends {
         insert: 'allowed';
     } ? never : K extends keyof T['_']['columns'] ? T['_']['columns'][K]['_']['isAutoincrement'] extends true ? K : never : never : K extends keyof T['_']['columns'] ? T['_']['columns'][K]['_']['isAutoincrement'] extends true ? K : never : never;
 }[keyof InsertValue<T>];
-export type MySqlInsertValues<T extends MySqlTable, B extends keyof InsertValue<T> = never> = Omit<InsertValue<T>, B | Blocked<T>> & {
-    [K in B | Blocked<T>]?: never;
-};
+type TimestampKeys<T extends MySqlTable> = {
+    [K in keyof InsertValue<T>]-?: K extends keyof TablePolicies<T> ? TablePolicies<T>[K] extends {
+        timestamp: string;
+    } ? K : never : never;
+}[keyof InsertValue<T>] & keyof InsertValue<T>;
+export type MySqlInsertValues<T extends MySqlTable, B extends keyof InsertValue<T> = never> = Omit<InsertValue<T>, B | Blocked<T> | TimestampKeys<T>> & Partial<Pick<InsertValue<T>, Exclude<TimestampKeys<T>, B | Blocked<T>>>>;
 export {};

package/dist/@types/MySqlInsertValues.d.ts

@@ -3,14 +3,15 @@ import type { MySqlInsertValue as InsertValue } from 'drizzle-orm/mysql-core/que
 import type { TablePolicies } from '../mysqlTable.js';
 type Blocked<T extends MySqlTable> = {
     [K in keyof InsertValue<T>]: K extends keyof TablePolicies<T> ? TablePolicies<T>[K] extends {
-        timestamp: string;
-    } | {
         insert: 'blocked';
     } ? K : TablePolicies<T>[K] extends {
         insert: 'allowed';
     } ? never : K extends keyof T['_']['columns'] ? T['_']['columns'][K]['_']['isAutoincrement'] extends true ? K : never : never : K extends keyof T['_']['columns'] ? T['_']['columns'][K]['_']['isAutoincrement'] extends true ? K : never : never;
 }[keyof InsertValue<T>];
-export type MySqlInsertValues<T extends MySqlTable, B extends keyof InsertValue<T> = never> = Omit<InsertValue<T>, B | Blocked<T>> & {
-    [K in B | Blocked<T>]?: never;
-};
+type TimestampKeys<T extends MySqlTable> = {
+    [K in keyof InsertValue<T>]-?: K extends keyof TablePolicies<T> ? TablePolicies<T>[K] extends {
+        timestamp: string;
+    } ? K : never : never;
+}[keyof InsertValue<T>] & keyof InsertValue<T>;
+export type MySqlInsertValues<T extends MySqlTable, B extends keyof InsertValue<T> = never> = Omit<InsertValue<T>, B | Blocked<T> | TimestampKeys<T>> & Partial<Pick<InsertValue<T>, Exclude<TimestampKeys<T>, B | Blocked<T>>>>;
 export {};

package/dist/@types/MySqlUpdateValues.d.cts

@@ -1,23 +1,26 @@
 import type { MySqlTable } from 'drizzle-orm/mysql-core/table';
 import type { MySqlUpdateSetSource } from 'drizzle-orm/mysql-core/query-builders/update';
 import type { TablePolicies } from '../mysqlTable.cjs';
+type DefaultBlocked<T extends MySqlTable, K> = K extends keyof T['_']['columns'] ? T['_']['columns'][K]['_']['isPrimaryKey'] extends true ? K : T['_']['columns'][K]['_']['isAutoincrement'] extends true ? K : never : never;
 type Blocked<T extends MySqlTable> = {
     [K in keyof MySqlUpdateSetSource<T>]-?: K extends keyof TablePolicies<T> ? TablePolicies<T>[K] extends {
-        timestamp: string;
+        timestamp: 'created';
     } | {
         update: 'blocked';
     } ? K : TablePolicies<T>[K] extends {
-        update: 'allowed' | 'required';
-    } ? never : K extends keyof T['_']['columns'] ? T['_']['columns'][K]['_']['isAutoincrement'] extends true ? K : never : never : K extends keyof T['_']['columns'] ? T['_']['columns'][K]['_']['isAutoincrement'] extends true ? K : never : never;
+        update: 'allowed';
+    } ? never : K extends keyof T['_']['columns'] ? T['_']['columns'][K]['_']['isPrimaryKey'] extends true ? K : TablePolicies<T>[K] extends {
+        update: 'required';
+    } ? never : DefaultBlocked<T, K> : never : DefaultBlocked<T, K>;
 }[keyof MySqlUpdateSetSource<T>] & keyof MySqlUpdateSetSource<T>;
 type RequiredKeys<T extends MySqlTable> = {
     [K in keyof MySqlUpdateSetSource<T>]-?: K extends keyof TablePolicies<T> ? TablePolicies<T>[K] extends {
         update: 'required';
-    } ? K : never : never;
+    } ? TablePolicies<T>[K] extends {
+        timestamp: 'updated';
+    } ? never : K : never : never;
 }[keyof MySqlUpdateSetSource<T>] & keyof MySqlUpdateSetSource<T>;
 export type MySqlUpdateValues<T extends MySqlTable, B extends keyof MySqlUpdateSetSource<T> = never, R extends Exclude<keyof MySqlUpdateSetSource<T>, B | Blocked<T>> = never> = Omit<MySqlUpdateSetSource<T>, B | Blocked<T> | R | RequiredKeys<T>> & {
-    [K in B | Blocked<T>]?: never;
-} & {
     [K in Exclude<R | RequiredKeys<T>, B | Blocked<T>>]-?: Exclude<MySqlUpdateSetSource<T>[K], undefined>;
 };
 export {};

package/dist/@types/MySqlUpdateValues.d.ts

@@ -1,23 +1,26 @@
 import type { MySqlTable } from 'drizzle-orm/mysql-core/table';
 import type { MySqlUpdateSetSource } from 'drizzle-orm/mysql-core/query-builders/update';
 import type { TablePolicies } from '../mysqlTable.js';
+type DefaultBlocked<T extends MySqlTable, K> = K extends keyof T['_']['columns'] ? T['_']['columns'][K]['_']['isPrimaryKey'] extends true ? K : T['_']['columns'][K]['_']['isAutoincrement'] extends true ? K : never : never;
 type Blocked<T extends MySqlTable> = {
     [K in keyof MySqlUpdateSetSource<T>]-?: K extends keyof TablePolicies<T> ? TablePolicies<T>[K] extends {
-        timestamp: string;
+        timestamp: 'created';
     } | {
         update: 'blocked';
     } ? K : TablePolicies<T>[K] extends {
-        update: 'allowed' | 'required';
-    } ? never : K extends keyof T['_']['columns'] ? T['_']['columns'][K]['_']['isAutoincrement'] extends true ? K : never : never : K extends keyof T['_']['columns'] ? T['_']['columns'][K]['_']['isAutoincrement'] extends true ? K : never : never;
+        update: 'allowed';
+    } ? never : K extends keyof T['_']['columns'] ? T['_']['columns'][K]['_']['isPrimaryKey'] extends true ? K : TablePolicies<T>[K] extends {
+        update: 'required';
+    } ? never : DefaultBlocked<T, K> : never : DefaultBlocked<T, K>;
 }[keyof MySqlUpdateSetSource<T>] & keyof MySqlUpdateSetSource<T>;
 type RequiredKeys<T extends MySqlTable> = {
     [K in keyof MySqlUpdateSetSource<T>]-?: K extends keyof TablePolicies<T> ? TablePolicies<T>[K] extends {
         update: 'required';
-    } ? K : never : never;
+    } ? TablePolicies<T>[K] extends {
+        timestamp: 'updated';
+    } ? never : K : never : never;
 }[keyof MySqlUpdateSetSource<T>] & keyof MySqlUpdateSetSource<T>;
 export type MySqlUpdateValues<T extends MySqlTable, B extends keyof MySqlUpdateSetSource<T> = never, R extends Exclude<keyof MySqlUpdateSetSource<T>, B | Blocked<T>> = never> = Omit<MySqlUpdateSetSource<T>, B | Blocked<T> | R | RequiredKeys<T>> & {
-    [K in B | Blocked<T>]?: never;
-} & {
     [K in Exclude<R | RequiredKeys<T>, B | Blocked<T>>]-?: Exclude<MySqlUpdateSetSource<T>[K], undefined>;
 };
 export {};

package/dist/MySqlQuery.d.cts

@@ -3,19 +3,21 @@ import { MySqlTable, MySqlColumn, type MySqlAsyncSelectBase } from 'drizzle-orm/
 import type { SelectedFields } from 'drizzle-orm/operations';
 import type { GetSelectTableName } from 'drizzle-orm/query-builders/select.types';
 import type { MySqlColumnSelectionName, MySqlSelectedNamedColumnUnion, MySqlSelectedNamedColumns, MySqlSelectedTableColumns, MySqlAliasTable } from './columns.cjs';
-import type { MySqlInsertValues, MySqlUpdateValues, MySqlCompareValues, MySqlColumnName, MySqlArrayCompareValues, MySqlRangeCompareValues, MySqlPatternCompareValues, MySqlNullConditionInput, MySqlConditions } from './@types.cjs';
+import type { MySqlInsertValues, MySqlUpdateValues, MySqlCompareValues, MySqlColumnName, MySqlArrayCompareValues, MySqlRangeCompareValues, MySqlPatternCompareValues, MySqlNullConditionInput, MySqlConditions } from './@types/index.cjs';
 import type { MySql2Database } from 'drizzle-orm/mysql2';
 /********************************************************************************************************************
  * MySqlQuery
  * ******************************************************************************************************************/
 export declare class MySqlQuery<TTable extends MySqlTable, IV extends MySqlInsertValues<TTable> = MySqlInsertValues<TTable>, UV extends MySqlUpdateValues<TTable> = MySqlUpdateValues<TTable>, AR = AddResult<TTable>> {
     private readonly current;
-    private readonly getTimestamp;
+    private readonly getTimestamp?;
     readonly t: TTable;
     /********************************************************************************************************************
      * constructor
      * ******************************************************************************************************************/
-    constructor(table: TTable, current: () => MySql2Database, getTimestamp: () => any);
+    constructor(table: TTable, current: (() => MySql2Database) & {
+        getTimestamp?: () => unknown;
+    }, getTimestamp?: (() => unknown) | undefined);
     private readonly drizzle;
     /********************************************************************************************************************
      * (PROTECTED) getTx
@@ -92,9 +94,18 @@ export declare class MySqlQuery<TTable extends MySqlTable, IV extends MySqlInser
     count(where?: BaseWhere<this>): Promise<number>;
     private prepareValues;
     /********************************************************************************************************************
-     * (PRIVATE) insertValues
+     * (PRIVATE) executeInsert
      * ******************************************************************************************************************/
-    private insertValues;
+    private executeInsert;
+    /********************************************************************************************************************
+     * insertValues
+     * ******************************************************************************************************************/
+    insertValues(values: IV[]): IV[];
+    insertValues(values: IV): IV;
+    /********************************************************************************************************************
+     * updateValues
+     * ******************************************************************************************************************/
+    updateValues(values: UV): UV;
     /********************************************************************************************************************
      * add
      * ******************************************************************************************************************/

package/dist/MySqlQuery.d.ts

@@ -3,19 +3,21 @@ import { MySqlTable, MySqlColumn, type MySqlAsyncSelectBase } from 'drizzle-orm/
 import type { SelectedFields } from 'drizzle-orm/operations';
 import type { GetSelectTableName } from 'drizzle-orm/query-builders/select.types';
 import type { MySqlColumnSelectionName, MySqlSelectedNamedColumnUnion, MySqlSelectedNamedColumns, MySqlSelectedTableColumns, MySqlAliasTable } from './columns.js';
-import type { MySqlInsertValues, MySqlUpdateValues, MySqlCompareValues, MySqlColumnName, MySqlArrayCompareValues, MySqlRangeCompareValues, MySqlPatternCompareValues, MySqlNullConditionInput, MySqlConditions } from './@types.js';
+import type { MySqlInsertValues, MySqlUpdateValues, MySqlCompareValues, MySqlColumnName, MySqlArrayCompareValues, MySqlRangeCompareValues, MySqlPatternCompareValues, MySqlNullConditionInput, MySqlConditions } from './@types/index.js';
 import type { MySql2Database } from 'drizzle-orm/mysql2';
 /********************************************************************************************************************
  * MySqlQuery
  * ******************************************************************************************************************/
 export declare class MySqlQuery<TTable extends MySqlTable, IV extends MySqlInsertValues<TTable> = MySqlInsertValues<TTable>, UV extends MySqlUpdateValues<TTable> = MySqlUpdateValues<TTable>, AR = AddResult<TTable>> {
     private readonly current;
-    private readonly getTimestamp;
+    private readonly getTimestamp?;
     readonly t: TTable;
     /********************************************************************************************************************
      * constructor
      * ******************************************************************************************************************/
-    constructor(table: TTable, current: () => MySql2Database, getTimestamp: () => any);
+    constructor(table: TTable, current: (() => MySql2Database) & {
+        getTimestamp?: () => unknown;
+    }, getTimestamp?: (() => unknown) | undefined);
     private readonly drizzle;
     /********************************************************************************************************************
      * (PROTECTED) getTx
@@ -92,9 +94,18 @@ export declare class MySqlQuery<TTable extends MySqlTable, IV extends MySqlInser
     count(where?: BaseWhere<this>): Promise<number>;
     private prepareValues;
     /********************************************************************************************************************
-     * (PRIVATE) insertValues
+     * (PRIVATE) executeInsert
      * ******************************************************************************************************************/
-    private insertValues;
+    private executeInsert;
+    /********************************************************************************************************************
+     * insertValues
+     * ******************************************************************************************************************/
+    insertValues(values: IV[]): IV[];
+    insertValues(values: IV): IV;
+    /********************************************************************************************************************
+     * updateValues
+     * ******************************************************************************************************************/
+    updateValues(values: UV): UV;
     /********************************************************************************************************************
      * add
      * ******************************************************************************************************************/

package/dist/columns.d.cts

@@ -26,7 +26,8 @@ export type MySqlSelectedTableColumns<T extends MySqlTable> = {
 /********************************************************************************************************************
  * MySqlColumnSelectionName
  * ******************************************************************************************************************/
-export type MySqlColumnSelectionName<T extends MySqlTable> = (keyof T['_']['columns'] & string) | `${keyof T['_']['columns'] & string} as ${string}`;
+type AsKeyword = 'as' | 'AS' | 'As' | 'aS';
+export type MySqlColumnSelectionName<T extends MySqlTable> = (keyof T['_']['columns'] & string) | `${keyof T['_']['columns'] & string} ${AsKeyword} ${string}`;
 /********************************************************************************************************************
  * MySqlSelectedNamedColumn
  * ******************************************************************************************************************/
@@ -34,11 +35,11 @@ type MySqlColumnForName<T extends MySqlTable, N extends string> = Extract<T['_']
 /********************************************************************************************************************
  * MySqlSelectedNamedColumn
  * ******************************************************************************************************************/
-type MySqlSelectionKey<T extends MySqlTable, N extends string> = N extends `${string} as ${infer Alias}` ? Alias : string extends MySqlColumnForName<T, N>['_']['name'] ? N : MySqlColumnForName<T, N>['_']['name'];
+type MySqlSelectionKey<T extends MySqlTable, N extends string> = N extends `${string} ${AsKeyword} ${infer Alias}` ? Alias : string extends MySqlColumnForName<T, N>['_']['name'] ? N : MySqlColumnForName<T, N>['_']['name'];
 /********************************************************************************************************************
  * MySqlSelectedNamedColumn
  * ******************************************************************************************************************/
-type MySqlSelectionValue<T extends MySqlTable, N extends string> = N extends `${infer Name} as ${string}` ? SQL.Aliased<MySqlColumnForName<T, Name>['_']['data']> : MySqlColumnForName<T, N>;
+type MySqlSelectionValue<T extends MySqlTable, N extends string> = N extends `${infer Name} ${AsKeyword} ${string}` ? SQL.Aliased<MySqlColumnForName<T, Name>['_']['data']> : MySqlColumnForName<T, N>;
 /********************************************************************************************************************
  * MySqlSelectedNamedColumn
  * ******************************************************************************************************************/

package/dist/columns.d.ts

@@ -26,7 +26,8 @@ export type MySqlSelectedTableColumns<T extends MySqlTable> = {
 /********************************************************************************************************************
  * MySqlColumnSelectionName
  * ******************************************************************************************************************/
-export type MySqlColumnSelectionName<T extends MySqlTable> = (keyof T['_']['columns'] & string) | `${keyof T['_']['columns'] & string} as ${string}`;
+type AsKeyword = 'as' | 'AS' | 'As' | 'aS';
+export type MySqlColumnSelectionName<T extends MySqlTable> = (keyof T['_']['columns'] & string) | `${keyof T['_']['columns'] & string} ${AsKeyword} ${string}`;
 /********************************************************************************************************************
  * MySqlSelectedNamedColumn
  * ******************************************************************************************************************/
@@ -34,11 +35,11 @@ type MySqlColumnForName<T extends MySqlTable, N extends string> = Extract<T['_']
 /********************************************************************************************************************
  * MySqlSelectedNamedColumn
  * ******************************************************************************************************************/
-type MySqlSelectionKey<T extends MySqlTable, N extends string> = N extends `${string} as ${infer Alias}` ? Alias : string extends MySqlColumnForName<T, N>['_']['name'] ? N : MySqlColumnForName<T, N>['_']['name'];
+type MySqlSelectionKey<T extends MySqlTable, N extends string> = N extends `${string} ${AsKeyword} ${infer Alias}` ? Alias : string extends MySqlColumnForName<T, N>['_']['name'] ? N : MySqlColumnForName<T, N>['_']['name'];
 /********************************************************************************************************************
  * MySqlSelectedNamedColumn
  * ******************************************************************************************************************/
-type MySqlSelectionValue<T extends MySqlTable, N extends string> = N extends `${infer Name} as ${string}` ? SQL.Aliased<MySqlColumnForName<T, Name>['_']['data']> : MySqlColumnForName<T, N>;
+type MySqlSelectionValue<T extends MySqlTable, N extends string> = N extends `${infer Name} ${AsKeyword} ${string}` ? SQL.Aliased<MySqlColumnForName<T, Name>['_']['data']> : MySqlColumnForName<T, N>;
 /********************************************************************************************************************
  * MySqlSelectedNamedColumn
  * ******************************************************************************************************************/

package/dist/conditions.d.cts

@@ -1,87 +1,87 @@
 import * as native from 'drizzle-orm';
 import { MySqlTable } from 'drizzle-orm/mysql-core';
 import type { Column, SQL } from 'drizzle-orm';
-import type { MySqlColumnName, MySqlConditions, MySqlNullConditionInput } from './@types.cjs';
+import type { MySqlColumnName, MySqlConditions, MySqlNullConditionInput } from './@types/index.cjs';
 export declare function createConditions<TSchema extends Record<string, MySqlTable>>(schema: TSchema): {
     eq: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends Column>(left: TColumn, right: native.GetColumnData<TColumn, "raw"> | native.SQLWrapper): SQL;
         <T>(left: SQL.Aliased<T>, right: T | native.SQLWrapper): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable>, right: unknown): SQL;
     };
     ne: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends Column>(left: TColumn, right: native.GetColumnData<TColumn, "raw"> | native.SQLWrapper): SQL;
         <T>(left: SQL.Aliased<T>, right: T | native.SQLWrapper): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable>, right: unknown): SQL;
     };
     gt: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends Column>(left: TColumn, right: native.GetColumnData<TColumn, "raw"> | native.SQLWrapper): SQL;
         <T>(left: SQL.Aliased<T>, right: T | native.SQLWrapper): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable>, right: unknown): SQL;
     };
     gte: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends Column>(left: TColumn, right: native.GetColumnData<TColumn, "raw"> | native.SQLWrapper): SQL;
         <T>(left: SQL.Aliased<T>, right: T | native.SQLWrapper): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable>, right: unknown): SQL;
     };
     lt: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends Column>(left: TColumn, right: native.GetColumnData<TColumn, "raw"> | native.SQLWrapper): SQL;
         <T>(left: SQL.Aliased<T>, right: T | native.SQLWrapper): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable>, right: unknown): SQL;
     };
     lte: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends Column>(left: TColumn, right: native.GetColumnData<TColumn, "raw"> | native.SQLWrapper): SQL;
         <T>(left: SQL.Aliased<T>, right: T | native.SQLWrapper): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable>, right: unknown): SQL;
     };
     inArray: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlArrayCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlArrayCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.cjs").MySqlArrayCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.cjs").MySqlArrayCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.inArray;
     notInArray: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlArrayCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlArrayCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.cjs").MySqlArrayCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.cjs").MySqlArrayCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.notInArray;
     between: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlRangeCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlRangeCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.cjs").MySqlRangeCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.cjs").MySqlRangeCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.between;
     notBetween: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlRangeCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlRangeCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.cjs").MySqlRangeCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.cjs").MySqlRangeCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.notBetween;
     like: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.cjs").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.cjs").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.like;
     notLike: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.cjs").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.cjs").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.notLike;
     ilike: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.cjs").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.cjs").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.ilike;
     notIlike: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.cjs").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.cjs").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.notIlike;
     isNull: {
         <T extends MySqlTable>(table: T, name: MySqlColumnName<T>): SQL;

package/dist/conditions.d.ts

@@ -1,87 +1,87 @@
 import * as native from 'drizzle-orm';
 import { MySqlTable } from 'drizzle-orm/mysql-core';
 import type { Column, SQL } from 'drizzle-orm';
-import type { MySqlColumnName, MySqlConditions, MySqlNullConditionInput } from './@types.js';
+import type { MySqlColumnName, MySqlConditions, MySqlNullConditionInput } from './@types/index.js';
 export declare function createConditions<TSchema extends Record<string, MySqlTable>>(schema: TSchema): {
     eq: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.js").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends Column>(left: TColumn, right: native.GetColumnData<TColumn, "raw"> | native.SQLWrapper): SQL;
         <T>(left: SQL.Aliased<T>, right: T | native.SQLWrapper): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable>, right: unknown): SQL;
     };
     ne: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.js").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends Column>(left: TColumn, right: native.GetColumnData<TColumn, "raw"> | native.SQLWrapper): SQL;
         <T>(left: SQL.Aliased<T>, right: T | native.SQLWrapper): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable>, right: unknown): SQL;
     };
     gt: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.js").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends Column>(left: TColumn, right: native.GetColumnData<TColumn, "raw"> | native.SQLWrapper): SQL;
         <T>(left: SQL.Aliased<T>, right: T | native.SQLWrapper): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable>, right: unknown): SQL;
     };
     gte: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.js").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends Column>(left: TColumn, right: native.GetColumnData<TColumn, "raw"> | native.SQLWrapper): SQL;
         <T>(left: SQL.Aliased<T>, right: T | native.SQLWrapper): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable>, right: unknown): SQL;
     };
     lt: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.js").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends Column>(left: TColumn, right: native.GetColumnData<TColumn, "raw"> | native.SQLWrapper): SQL;
         <T>(left: SQL.Aliased<T>, right: T | native.SQLWrapper): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable>, right: unknown): SQL;
     };
     lte: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.js").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends Column>(left: TColumn, right: native.GetColumnData<TColumn, "raw"> | native.SQLWrapper): SQL;
         <T>(left: SQL.Aliased<T>, right: T | native.SQLWrapper): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable>, right: unknown): SQL;
     };
     inArray: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlArrayCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlArrayCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.js").MySqlArrayCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.js").MySqlArrayCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.inArray;
     notInArray: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlArrayCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlArrayCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.js").MySqlArrayCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.js").MySqlArrayCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.notInArray;
     between: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlRangeCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlRangeCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.js").MySqlRangeCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.js").MySqlRangeCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.between;
     notBetween: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlRangeCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlRangeCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.js").MySqlRangeCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.js").MySqlRangeCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.notBetween;
     like: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.js").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.js").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.like;
     notLike: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.js").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.js").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.notLike;
     ilike: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.js").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.js").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.ilike;
     notIlike: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./index.js").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./index.js").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.notIlike;
     isNull: {
         <T extends MySqlTable>(table: T, name: MySqlColumnName<T>): SQL;

package/dist/drizzleMySql.d.cts

@@ -7,17 +7,19 @@ import { MySqlQuery } from './MySqlQuery.cjs';
 export declare function drizzleMySql<TSchema extends Record<string, MySqlTable>>(options: {
     url: string;
     schema: TSchema;
-    timestamp?: () => unknown;
+    getTimestamp: () => unknown;
 }): {
     columns: typeof TableColumns;
     sql: typeof sql;
     sqlNumber: (value: SQL | number) => SQL<number>;
     sqlString: (value: SQL | string) => SQL<string>;
     sqlBoolean: (value: SQL | boolean) => SQL<boolean>;
-    current: () => (import("drizzle-orm/mysql2").MySql2Database<native.ExtractTablesWithRelations<{}, native.ExtractTablesFromSchema<TSchema>>> & {
+    current: (() => (import("drizzle-orm/mysql2").MySql2Database<native.ExtractTablesWithRelations<{}, native.ExtractTablesFromSchema<TSchema>>> & {
         $client: mysql.Pool;
-    }) | import("drizzle-orm/mysql-core").MySqlAsyncTransaction<import("drizzle-orm/mysql2").MySql2QueryResultHKT, native.ExtractTablesWithRelations<{}, native.ExtractTablesFromSchema<TSchema>>>;
-    query: <TTable extends TSchema[keyof TSchema]>(table: TTable) => MySqlQuery<TTable, import("./@types.cjs").MySqlInsertValues<TTable>, import("./@types.cjs").MySqlUpdateValues<TTable>, ([{ [P in keyof TTable["_"]["columns"]]: TTable["_"]["columns"][P]["_"] extends {
+    }) | import("drizzle-orm/mysql-core").MySqlAsyncTransaction<import("drizzle-orm/mysql2").MySql2QueryResultHKT, native.ExtractTablesWithRelations<{}, native.ExtractTablesFromSchema<TSchema>>>) & {
+        getTimestamp: () => unknown;
+    };
+    query: <TTable extends TSchema[keyof TSchema]>(table: TTable) => MySqlQuery<TTable, import("./@types/index.cjs").MySqlInsertValues<TTable>, import("./@types/index.cjs").MySqlUpdateValues<TTable>, ([{ [P in keyof TTable["_"]["columns"]]: TTable["_"]["columns"][P]["_"] extends {
         isAutoincrement: true;
     } ? P : never; }[keyof TTable["_"]["columns"]]] extends [never] ? false : true) extends true ? number : undefined>;
     trans: <T>(callback: () => Promise<T>) => Promise<T>;
@@ -39,104 +41,104 @@ export declare function drizzleMySql<TSchema extends Record<string, MySqlTable>>
     }>;
     close: () => Promise<void>;
     eq: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends native.Column>(left: TColumn, right: native.SQLWrapper<unknown> | TColumn["_"]["data"]): SQL;
         <T>(left: SQL.Aliased<T>, right: native.SQLWrapper<unknown> | T): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>, right: unknown): SQL;
     };
     ne: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends native.Column>(left: TColumn, right: native.SQLWrapper<unknown> | TColumn["_"]["data"]): SQL;
         <T>(left: SQL.Aliased<T>, right: native.SQLWrapper<unknown> | T): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>, right: unknown): SQL;
     };
     gt: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends native.Column>(left: TColumn, right: native.SQLWrapper<unknown> | TColumn["_"]["data"]): SQL;
         <T>(left: SQL.Aliased<T>, right: native.SQLWrapper<unknown> | T): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>, right: unknown): SQL;
     };
     gte: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends native.Column>(left: TColumn, right: native.SQLWrapper<unknown> | TColumn["_"]["data"]): SQL;
         <T>(left: SQL.Aliased<T>, right: native.SQLWrapper<unknown> | T): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>, right: unknown): SQL;
     };
     lt: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends native.Column>(left: TColumn, right: native.SQLWrapper<unknown> | TColumn["_"]["data"]): SQL;
         <T>(left: SQL.Aliased<T>, right: native.SQLWrapper<unknown> | T): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>, right: unknown): SQL;
     };
     lte: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.cjs").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.cjs").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends native.Column>(left: TColumn, right: native.SQLWrapper<unknown> | TColumn["_"]["data"]): SQL;
         <T>(left: SQL.Aliased<T>, right: native.SQLWrapper<unknown> | T): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>, right: unknown): SQL;
     };
     inArray: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlArrayCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlArrayCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.cjs").MySqlArrayCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.cjs").MySqlArrayCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.inArray;
     notInArray: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlArrayCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlArrayCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.cjs").MySqlArrayCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.cjs").MySqlArrayCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.notInArray;
     between: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlRangeCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlRangeCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.cjs").MySqlRangeCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.cjs").MySqlRangeCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.between;
     notBetween: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlRangeCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlRangeCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.cjs").MySqlRangeCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.cjs").MySqlRangeCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.notBetween;
     like: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.cjs").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.cjs").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.like;
     notLike: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.cjs").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.cjs").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.notLike;
     ilike: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.cjs").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.cjs").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.ilike;
     notIlike: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.cjs").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.cjs").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.cjs").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.cjs").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.notIlike;
     isNull: {
-        <T extends MySqlTable>(table: T, name: import("./@types.cjs").MySqlColumnName<T>): SQL;
-        <T extends MySqlTable>(table: T, names: import("./@types.cjs").MySqlNullConditionInput<T>): SQL | undefined;
-        <K extends keyof TSchema & string>(table: K, name: import("./@types.cjs").MySqlColumnName<TSchema[K]>): SQL;
-        <K extends keyof TSchema & string>(table: K, names: import("./@types.cjs").MySqlNullConditionInput<TSchema[K]>): SQL | undefined;
+        <T extends MySqlTable>(table: T, name: import("./@types/index.cjs").MySqlColumnName<T>): SQL;
+        <T extends MySqlTable>(table: T, names: import("./@types/index.cjs").MySqlNullConditionInput<T>): SQL | undefined;
+        <K extends keyof TSchema & string>(table: K, name: import("./@types/index.cjs").MySqlColumnName<TSchema[K]>): SQL;
+        <K extends keyof TSchema & string>(table: K, names: import("./@types/index.cjs").MySqlNullConditionInput<TSchema[K]>): SQL | undefined;
     } & typeof native.isNull;
     isNotNull: {
-        <T extends MySqlTable>(table: T, name: import("./@types.cjs").MySqlColumnName<T>): SQL;
-        <T extends MySqlTable>(table: T, names: import("./@types.cjs").MySqlNullConditionInput<T>): SQL | undefined;
-        <K extends keyof TSchema & string>(table: K, name: import("./@types.cjs").MySqlColumnName<TSchema[K]>): SQL;
-        <K extends keyof TSchema & string>(table: K, names: import("./@types.cjs").MySqlNullConditionInput<TSchema[K]>): SQL | undefined;
+        <T extends MySqlTable>(table: T, name: import("./@types/index.cjs").MySqlColumnName<T>): SQL;
+        <T extends MySqlTable>(table: T, names: import("./@types/index.cjs").MySqlNullConditionInput<T>): SQL | undefined;
+        <K extends keyof TSchema & string>(table: K, name: import("./@types/index.cjs").MySqlColumnName<TSchema[K]>): SQL;
+        <K extends keyof TSchema & string>(table: K, names: import("./@types/index.cjs").MySqlNullConditionInput<TSchema[K]>): SQL | undefined;
     } & typeof native.isNotNull;
     and: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, options: import("./@types.cjs").MySqlConditions<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>>): SQL | undefined;
-        <T extends MySqlTable>(table: T, options: import("./@types.cjs").MySqlConditions<T>): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, options: import("./@types/index.cjs").MySqlConditions<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>>): SQL | undefined;
+        <T extends MySqlTable>(table: T, options: import("./@types/index.cjs").MySqlConditions<T>): SQL | undefined;
     } & ((...conditions: (native.SQLWrapper | false | undefined)[]) => SQL | undefined);
     or: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, options: import("./@types.cjs").MySqlConditions<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>>): SQL | undefined;
-        <T extends MySqlTable>(table: T, options: import("./@types.cjs").MySqlConditions<T>): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, options: import("./@types/index.cjs").MySqlConditions<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>>): SQL | undefined;
+        <T extends MySqlTable>(table: T, options: import("./@types/index.cjs").MySqlConditions<T>): SQL | undefined;
     } & ((...conditions: (native.SQLWrapper | false | undefined)[]) => SQL | undefined);
     asc: typeof native.asc;
     desc: typeof native.desc;

package/dist/drizzleMySql.d.ts

@@ -7,17 +7,19 @@ import { MySqlQuery } from './MySqlQuery.js';
 export declare function drizzleMySql<TSchema extends Record<string, MySqlTable>>(options: {
     url: string;
     schema: TSchema;
-    timestamp?: () => unknown;
+    getTimestamp: () => unknown;
 }): {
     columns: typeof TableColumns;
     sql: typeof sql;
     sqlNumber: (value: SQL | number) => SQL<number>;
     sqlString: (value: SQL | string) => SQL<string>;
     sqlBoolean: (value: SQL | boolean) => SQL<boolean>;
-    current: () => (import("drizzle-orm/mysql2").MySql2Database<native.ExtractTablesWithRelations<{}, native.ExtractTablesFromSchema<TSchema>>> & {
+    current: (() => (import("drizzle-orm/mysql2").MySql2Database<native.ExtractTablesWithRelations<{}, native.ExtractTablesFromSchema<TSchema>>> & {
         $client: mysql.Pool;
-    }) | import("drizzle-orm/mysql-core").MySqlAsyncTransaction<import("drizzle-orm/mysql2").MySql2QueryResultHKT, native.ExtractTablesWithRelations<{}, native.ExtractTablesFromSchema<TSchema>>>;
-    query: <TTable extends TSchema[keyof TSchema]>(table: TTable) => MySqlQuery<TTable, import("./@types.js").MySqlInsertValues<TTable>, import("./@types.js").MySqlUpdateValues<TTable>, ([{ [P in keyof TTable["_"]["columns"]]: TTable["_"]["columns"][P]["_"] extends {
+    }) | import("drizzle-orm/mysql-core").MySqlAsyncTransaction<import("drizzle-orm/mysql2").MySql2QueryResultHKT, native.ExtractTablesWithRelations<{}, native.ExtractTablesFromSchema<TSchema>>>) & {
+        getTimestamp: () => unknown;
+    };
+    query: <TTable extends TSchema[keyof TSchema]>(table: TTable) => MySqlQuery<TTable, import("./@types/index.js").MySqlInsertValues<TTable>, import("./@types/index.js").MySqlUpdateValues<TTable>, ([{ [P in keyof TTable["_"]["columns"]]: TTable["_"]["columns"][P]["_"] extends {
         isAutoincrement: true;
     } ? P : never; }[keyof TTable["_"]["columns"]]] extends [never] ? false : true) extends true ? number : undefined>;
     trans: <T>(callback: () => Promise<T>) => Promise<T>;
@@ -39,104 +41,104 @@ export declare function drizzleMySql<TSchema extends Record<string, MySqlTable>>
     }>;
     close: () => Promise<void>;
     eq: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.js").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends native.Column>(left: TColumn, right: native.SQLWrapper<unknown> | TColumn["_"]["data"]): SQL;
         <T>(left: SQL.Aliased<T>, right: native.SQLWrapper<unknown> | T): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>, right: unknown): SQL;
     };
     ne: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.js").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends native.Column>(left: TColumn, right: native.SQLWrapper<unknown> | TColumn["_"]["data"]): SQL;
         <T>(left: SQL.Aliased<T>, right: native.SQLWrapper<unknown> | T): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>, right: unknown): SQL;
     };
     gt: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.js").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends native.Column>(left: TColumn, right: native.SQLWrapper<unknown> | TColumn["_"]["data"]): SQL;
         <T>(left: SQL.Aliased<T>, right: native.SQLWrapper<unknown> | T): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>, right: unknown): SQL;
     };
     gte: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.js").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends native.Column>(left: TColumn, right: native.SQLWrapper<unknown> | TColumn["_"]["data"]): SQL;
         <T>(left: SQL.Aliased<T>, right: native.SQLWrapper<unknown> | T): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>, right: unknown): SQL;
     };
     lt: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.js").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends native.Column>(left: TColumn, right: native.SQLWrapper<unknown> | TColumn["_"]["data"]): SQL;
         <T>(left: SQL.Aliased<T>, right: native.SQLWrapper<unknown> | T): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>, right: unknown): SQL;
     };
     lte: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.js").MySqlCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.js").MySqlCompareValues<T> | undefined): SQL | undefined;
     } & {
         <TColumn extends native.Column>(left: TColumn, right: native.SQLWrapper<unknown> | TColumn["_"]["data"]): SQL;
         <T>(left: SQL.Aliased<T>, right: native.SQLWrapper<unknown> | T): SQL;
         <T extends native.SQLWrapper>(left: Exclude<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>, right: unknown): SQL;
     };
     inArray: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlArrayCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlArrayCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.js").MySqlArrayCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.js").MySqlArrayCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.inArray;
     notInArray: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlArrayCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlArrayCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.js").MySqlArrayCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.js").MySqlArrayCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.notInArray;
     between: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlRangeCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlRangeCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.js").MySqlRangeCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.js").MySqlRangeCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.between;
     notBetween: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlRangeCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlRangeCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.js").MySqlRangeCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.js").MySqlRangeCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.notBetween;
     like: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.js").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.js").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.like;
     notLike: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.js").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.js").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.notLike;
     ilike: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.js").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.js").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.ilike;
     notIlike: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types.js").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
-        <T extends MySqlTable>(table: T, values: import("./@types.js").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, values: import("./@types/index.js").MySqlPatternCompareValues<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>> | undefined): SQL | undefined;
+        <T extends MySqlTable>(table: T, values: import("./@types/index.js").MySqlPatternCompareValues<T> | undefined): SQL | undefined;
     } & typeof native.notIlike;
     isNull: {
-        <T extends MySqlTable>(table: T, name: import("./@types.js").MySqlColumnName<T>): SQL;
-        <T extends MySqlTable>(table: T, names: import("./@types.js").MySqlNullConditionInput<T>): SQL | undefined;
-        <K extends keyof TSchema & string>(table: K, name: import("./@types.js").MySqlColumnName<TSchema[K]>): SQL;
-        <K extends keyof TSchema & string>(table: K, names: import("./@types.js").MySqlNullConditionInput<TSchema[K]>): SQL | undefined;
+        <T extends MySqlTable>(table: T, name: import("./@types/index.js").MySqlColumnName<T>): SQL;
+        <T extends MySqlTable>(table: T, names: import("./@types/index.js").MySqlNullConditionInput<T>): SQL | undefined;
+        <K extends keyof TSchema & string>(table: K, name: import("./@types/index.js").MySqlColumnName<TSchema[K]>): SQL;
+        <K extends keyof TSchema & string>(table: K, names: import("./@types/index.js").MySqlNullConditionInput<TSchema[K]>): SQL | undefined;
     } & typeof native.isNull;
     isNotNull: {
-        <T extends MySqlTable>(table: T, name: import("./@types.js").MySqlColumnName<T>): SQL;
-        <T extends MySqlTable>(table: T, names: import("./@types.js").MySqlNullConditionInput<T>): SQL | undefined;
-        <K extends keyof TSchema & string>(table: K, name: import("./@types.js").MySqlColumnName<TSchema[K]>): SQL;
-        <K extends keyof TSchema & string>(table: K, names: import("./@types.js").MySqlNullConditionInput<TSchema[K]>): SQL | undefined;
+        <T extends MySqlTable>(table: T, name: import("./@types/index.js").MySqlColumnName<T>): SQL;
+        <T extends MySqlTable>(table: T, names: import("./@types/index.js").MySqlNullConditionInput<T>): SQL | undefined;
+        <K extends keyof TSchema & string>(table: K, name: import("./@types/index.js").MySqlColumnName<TSchema[K]>): SQL;
+        <K extends keyof TSchema & string>(table: K, names: import("./@types/index.js").MySqlNullConditionInput<TSchema[K]>): SQL | undefined;
     } & typeof native.isNotNull;
     and: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, options: import("./@types.js").MySqlConditions<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>>): SQL | undefined;
-        <T extends MySqlTable>(table: T, options: import("./@types.js").MySqlConditions<T>): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, options: import("./@types/index.js").MySqlConditions<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>>): SQL | undefined;
+        <T extends MySqlTable>(table: T, options: import("./@types/index.js").MySqlConditions<T>): SQL | undefined;
     } & ((...conditions: (native.SQLWrapper | false | undefined)[]) => SQL | undefined);
     or: {
-        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, options: import("./@types.js").MySqlConditions<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>>): SQL | undefined;
-        <T extends MySqlTable>(table: T, options: import("./@types.js").MySqlConditions<T>): SQL | undefined;
+        <T extends (keyof TSchema & string) | MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>(table: T, options: import("./@types/index.js").MySqlConditions<T extends keyof TSchema & string ? TSchema[T] : Extract<T, MySqlTable<import("drizzle-orm/mysql-core").TableConfig>>>): SQL | undefined;
+        <T extends MySqlTable>(table: T, options: import("./@types/index.js").MySqlConditions<T>): SQL | undefined;
     } & ((...conditions: (native.SQLWrapper | false | undefined)[]) => SQL | undefined);
     asc: typeof native.asc;
     desc: typeof native.desc;

package/dist/index.cjs

@@ -405,15 +405,28 @@ class MySqlQuery {
             const policy = policies[key] ?? {};
             const auto = 'autoIncrement' in column && column.autoIncrement === true;
             const rule = operation === 'insert' ? policy.insert : policy.update;
-            const blocked = !!policy.timestamp || rule === 'blocked' || (auto && rule !== 'allowed' && rule !== 'required');
+            const primary = column.primary;
+            const blocked = (operation === 'update' && policy.timestamp === 'created') ||
+                rule === 'blocked' ||
+                (operation === 'update' && primary && rule !== 'allowed') ||
+                (auto && rule !== 'allowed' && rule !== 'required');
             if (blocked && Object.hasOwn(values, key))
                 throw new Error(`${operation}: column "${key}" is blocked.`);
-            if (operation === 'update' && rule === 'required' && values[key] === undefined) {
+            if (operation === 'update' &&
+                !blocked &&
+                rule === 'required' &&
+                policy.timestamp !== 'updated' &&
+                values[key] === undefined) {
                 throw new Error(`update: column "${key}" is required.`);
             }
-            if (policy.timestamp && (operation === 'insert' || policy.timestamp === 'updated')) {
+            if (policy.timestamp &&
+                values[key] === undefined &&
+                (operation === 'insert' || policy.timestamp === 'updated')) {
                 if (!generated) {
-                    timestamp = this.getTimestamp();
+                    const getTimestamp = this.getTimestamp ?? this.current.getTimestamp;
+                    if (!getTimestamp)
+                        throw new Error('timestamp generator is not configured');
+                    timestamp = getTimestamp();
                     generated = true;
                 }
                 values[key] = timestamp;
@@ -422,9 +435,9 @@ class MySqlQuery {
         return values;
     }
     /********************************************************************************************************************
-     * (PRIVATE) insertValues
+     * (PRIVATE) executeInsert
      * ******************************************************************************************************************/
-    async insertValues(value) {
+    async executeInsert(value) {
         const tx = this.getTx();
         const autoIncrementColumn = mysqlCore.getTableConfig(this.t).columns.find((column) => 'autoIncrement' in column && column.autoIncrement === true);
         const hasAutoIncrement = !!autoIncrementColumn;
@@ -451,10 +464,19 @@ class MySqlQuery {
             }
         }
     }
+    insertValues(values) {
+        return values;
+    }
+    /********************************************************************************************************************
+     * updateValues
+     * ******************************************************************************************************************/
+    updateValues(values) {
+        return values;
+    }
     add(value) {
         const items = Array.isArray(value) ? value : [value];
         const values = items.map((item) => this.prepareValues(item, 'insert'));
-        return this.insertValues((Array.isArray(value) ? values : values[0]));
+        return this.executeInsert((Array.isArray(value) ? values : values[0]));
     }
     /********************************************************************************************************************
      * edit
@@ -619,7 +641,7 @@ const normalizeFields = (fields) => {
     const pool = mysql.createPool({ uri: options.url });
     const raw = mysql2.drizzle({ client: pool, relations: native.defineRelations(options.schema) });
     const context = new node_async_hooks.AsyncLocalStorage();
-    const current = () => context.getStore() ?? raw;
+    const current = Object.assign(() => context.getStore() ?? raw, { getTimestamp: options.getTimestamp });
     const trans = (callback) => {
         const parent = context.getStore();
         const execute = (tx) => context.run(tx, callback);
@@ -672,11 +694,7 @@ const normalizeFields = (fields) => {
         sqlString: (value) => (native.is(value, native.SQL) ? value : native.sql `${value}`).mapWith(String),
         sqlBoolean: (value) => (native.is(value, native.SQL) ? value : native.sql `${value}`).mapWith((v) => v === true || v === 1),
         current,
-        query: (table) => new MySqlQuery(table, current, () => {
-            if (!options.timestamp)
-                throw new Error('timestamp generator is not configured');
-            return options.timestamp();
-        }),
+        query: (table) => new MySqlQuery(table, current),
         trans,
         paginate,
         close: () => pool.end(),

package/dist/index.esm.js

@@ -405,15 +405,28 @@ class MySqlQuery {
             const policy = policies[key] ?? {};
             const auto = 'autoIncrement' in column && column.autoIncrement === true;
             const rule = operation === 'insert' ? policy.insert : policy.update;
-            const blocked = !!policy.timestamp || rule === 'blocked' || (auto && rule !== 'allowed' && rule !== 'required');
+            const primary = column.primary;
+            const blocked = (operation === 'update' && policy.timestamp === 'created') ||
+                rule === 'blocked' ||
+                (operation === 'update' && primary && rule !== 'allowed') ||
+                (auto && rule !== 'allowed' && rule !== 'required');
             if (blocked && Object.hasOwn(values, key))
                 throw new Error(`${operation}: column "${key}" is blocked.`);
-            if (operation === 'update' && rule === 'required' && values[key] === undefined) {
+            if (operation === 'update' &&
+                !blocked &&
+                rule === 'required' &&
+                policy.timestamp !== 'updated' &&
+                values[key] === undefined) {
                 throw new Error(`update: column "${key}" is required.`);
             }
-            if (policy.timestamp && (operation === 'insert' || policy.timestamp === 'updated')) {
+            if (policy.timestamp &&
+                values[key] === undefined &&
+                (operation === 'insert' || policy.timestamp === 'updated')) {
                 if (!generated) {
-                    timestamp = this.getTimestamp();
+                    const getTimestamp = this.getTimestamp ?? this.current.getTimestamp;
+                    if (!getTimestamp)
+                        throw new Error('timestamp generator is not configured');
+                    timestamp = getTimestamp();
                     generated = true;
                 }
                 values[key] = timestamp;
@@ -422,9 +435,9 @@ class MySqlQuery {
         return values;
     }
     /********************************************************************************************************************
-     * (PRIVATE) insertValues
+     * (PRIVATE) executeInsert
      * ******************************************************************************************************************/
-    async insertValues(value) {
+    async executeInsert(value) {
         const tx = this.getTx();
         const autoIncrementColumn = getTableConfig(this.t).columns.find((column) => 'autoIncrement' in column && column.autoIncrement === true);
         const hasAutoIncrement = !!autoIncrementColumn;
@@ -451,10 +464,19 @@ class MySqlQuery {
             }
         }
     }
+    insertValues(values) {
+        return values;
+    }
+    /********************************************************************************************************************
+     * updateValues
+     * ******************************************************************************************************************/
+    updateValues(values) {
+        return values;
+    }
     add(value) {
         const items = Array.isArray(value) ? value : [value];
         const values = items.map((item) => this.prepareValues(item, 'insert'));
-        return this.insertValues((Array.isArray(value) ? values : values[0]));
+        return this.executeInsert((Array.isArray(value) ? values : values[0]));
     }
     /********************************************************************************************************************
      * edit
@@ -619,7 +641,7 @@ const normalizeFields = (fields) => {
     const pool = mysql.createPool({ uri: options.url });
     const raw = drizzle({ client: pool, relations: defineRelations(options.schema) });
     const context = new AsyncLocalStorage();
-    const current = () => context.getStore() ?? raw;
+    const current = Object.assign(() => context.getStore() ?? raw, { getTimestamp: options.getTimestamp });
     const trans = (callback) => {
         const parent = context.getStore();
         const execute = (tx) => context.run(tx, callback);
@@ -672,11 +694,7 @@ const normalizeFields = (fields) => {
         sqlString: (value) => (is(value, SQL) ? value : sql `${value}`).mapWith(String),
         sqlBoolean: (value) => (is(value, SQL) ? value : sql `${value}`).mapWith((v) => v === true || v === 1),
         current,
-        query: (table) => new MySqlQuery(table, current, () => {
-            if (!options.timestamp)
-                throw new Error('timestamp generator is not configured');
-            return options.timestamp();
-        }),
+        query: (table) => new MySqlQuery(table, current),
         trans,
         paginate,
         close: () => pool.end(),

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pdg/drizzle-mysql",
   "title": "Drizzle for MySql",
   "description": "Drizzle for MySql",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.esm.js",