flint-orm 0.4.5 → 0.6.0

package/API.md

@@ -30,7 +30,7 @@ const users = table('users', {
 const db = flint({ url: './app.db' });
 
 // Query
-const user = await db.select().from(users).where(eq(users.id, 'u1')).single().execute();
+const user = await db.selectFrom(users).where(eq(users.id, 'u1')).single().execute();
 // { id: "u1", name: "Alice", email: "alice@example.com", age: 30, createdAt: Date }
 ```
 
@@ -177,12 +177,12 @@ const users = table(
 
 All `execute()` methods return `Promise<T>` — always `await` regardless of driver.
 
-### `db.select().from(table)`
+### `db.selectFrom(table)`
 
-Start a SELECT query. Two-phase: `.from()` is required before anything else.
+Start a SELECT query. Call `.columns()` to narrow, `.where()` to filter, `.execute()` to run.
 
 ```ts
-await db.select().from(users).execute();
+await db.selectFrom(users).execute();
 // SELECT * FROM users
 ```
 
@@ -191,7 +191,7 @@ await db.select().from(users).execute();
 Narrow which columns appear in the result.
 
 ```ts
-await db.select().from(users).columns(['id', 'name']).execute();
+await db.selectFrom(users).columns(['id', 'name']).execute();
 // SELECT id, name FROM users
 // Returns: { id: string; name: string }[]
 ```
@@ -201,7 +201,7 @@ await db.select().from(users).columns(['id', 'name']).execute();
 Filter rows.
 
 ```ts
-await db.select().from(users).where(eq(users.active, true)).execute();
+await db.selectFrom(users).where(eq(users.active, true)).execute();
 // SELECT * FROM users WHERE active = 1
 ```
 
@@ -210,7 +210,7 @@ await db.select().from(users).where(eq(users.active, true)).execute();
 Return one row or null instead of an array. Adds `LIMIT 1`.
 
 ```ts
-await db.select().from(users).where(eq(users.id, 'u1')).single().execute();
+await db.selectFrom(users).where(eq(users.id, 'u1')).single().execute();
 // SELECT * FROM users WHERE id = ? LIMIT 1
 // Returns: UserRow | null
 ```
@@ -220,7 +220,7 @@ await db.select().from(users).where(eq(users.id, 'u1')).single().execute();
 Sort results. Default direction is `"asc"`.
 
 ```ts
-await db.select().from(users).orderBy('name', 'desc').execute();
+await db.selectFrom(users).orderBy('name', 'desc').execute();
 // SELECT * FROM users ORDER BY name DESC
 ```
 
@@ -229,7 +229,7 @@ await db.select().from(users).orderBy('name', 'desc').execute();
 Limit the number of results.
 
 ```ts
-await db.select().from(users).limit(10).execute();
+await db.selectFrom(users).limit(10).execute();
 // SELECT * FROM users LIMIT 10
 ```
 
@@ -238,7 +238,7 @@ await db.select().from(users).limit(10).execute();
 Skip N rows.
 
 ```ts
-await db.select().from(users).limit(10).offset(20).execute();
+await db.selectFrom(users).limit(10).offset(20).execute();
 // SELECT * FROM users LIMIT 10 OFFSET 20
 ```
 
@@ -247,7 +247,7 @@ await db.select().from(users).limit(10).offset(20).execute();
 Return unique rows.
 
 ```ts
-await db.select().from(users).columns(['name']).distinct().execute();
+await db.selectFrom(users).columns(['name']).distinct().execute();
 // SELECT DISTINCT name FROM users
 ```
 
@@ -536,7 +536,7 @@ import { sql } from 'flint-orm';
 const expr = sql`name = ${'Alice'} AND age > ${18}`;
 // { sql: "name = ? AND age > ?", params: ["Alice", 18] }
 
-const result = await db.select().from(users).where(expr).execute();
+const result = await db.selectFrom(users).where(expr).execute();
 ```
 
 ---
@@ -595,7 +595,7 @@ import { addTable, dropTable, renameTable, addColumn, dropColumn, renameColumn,
 | `dropIndex`    | `DROP INDEX ...`                       |
 | `modifyColumn` | `ALTER TABLE ... ALTER COLUMN ...`     |
 | `modifyIndex`  | `DROP INDEX IF EXISTS ...; CREATE ...` |
-| `rebuildTable` | Temp table → copy → drop → rename     |
+| `rebuildTable` | Temp table → copy → drop → rename      |
 
 ---
 

package/README.md

@@ -42,11 +42,11 @@ const db = flint({ url: './app.db' });
 await db.insert(users).values({ id: 'u1', name: 'Alice', email: 'alice@example.com' }).execute();
 
 // Query
-const adults = await db.select().from(users).where(eq(users.age, 18)).execute();
+const adults = await db.selectFrom(users).where(eq(users.age, 18)).execute();
 //    ^? { id: string; name: string; email: string; age: number; createdAt: Date }[]
 
 // Single row
-const alice = await db.select().from(users).where(eq(users.id, 'u1')).single().execute();
+const alice = await db.selectFrom(users).where(eq(users.id, 'u1')).single().execute();
 //    ^? { id: string; name: string; email: string; age: number; createdAt: Date } | null
 ```
 
@@ -118,24 +118,24 @@ type NewUser = InsertRow<typeof users>;
 
 ```ts
 // All rows
-const all = await db.select().from(users).execute();
+const all = await db.selectFrom(users).execute();
 
 // With conditions
-const active = await db.select().from(users).where(eq(users.active, true)).execute();
+const active = await db.selectFrom(users).where(eq(users.active, true)).execute();
 
 // Narrow columns
-const names = await db.select().from(users).columns(['id', 'name']).execute();
+const names = await db.selectFrom(users).columns(['id', 'name']).execute();
 //    ^? { id: string; name: string }[]
 
 // Single row
-const user = await db.select().from(users).where(eq(users.id, 'u1')).single().execute();
+const user = await db.selectFrom(users).where(eq(users.id, 'u1')).single().execute();
 //    ^? { ... } | null
 
 // Ordering and pagination
-const page = await db.select().from(users).orderBy('name', 'asc').limit(10).offset(20).execute();
+const page = await db.selectFrom(users).orderBy('name', 'asc').limit(10).offset(20).execute();
 
 // Distinct
-const unique = await db.select().from(users).columns(['email']).distinct().execute();
+const unique = await db.selectFrom(users).columns(['email']).distinct().execute();
 ```
 
 ### INSERT
@@ -236,7 +236,7 @@ await db.batch([db.insert(users).values({ id: 'u1', name: 'Alice' }), db.insert(
 import { sql } from 'flint-orm';
 
 const expr = sql`name = ${'Alice'} AND age > ${18}`;
-const result = await db.select().from(users).where(expr).execute();
+const result = await db.selectFrom(users).where(expr).execute();
 
 // Direct execution
 await db.$run('CREATE TABLE test (id INTEGER PRIMARY KEY, name TEXT)');

package/dist/drivers/better-sqlite3.d.ts

@@ -17,10 +17,10 @@ export declare class BetterSqlite3Executor implements Executor {
  * import { flint } from 'flint-orm/better-sqlite3'
  * const db = flint({ url: './app.db' })
  */
-export declare function flint(details: {
+export declare function flint(options: {
     url: string;
-}): {
-    select: () => import("..").SelectStage1;
+} & Database.Options): {
+    selectFrom: <T extends import("..").AnyTable>(table: T) => import("..").SelectBuilder<T>;
     insert: <T extends import("..").AnyTable>(table: T) => import("..").InsertStage1<T>;
     update: <T extends import("..").AnyTable>(table: T) => import("..").UpdateStage1<T>;
     delete: <T extends import("..").AnyTable>(table: T) => import("../query/builder").DeleteBuilder<T, false, keyof import("..").InferRow<T>>;

package/dist/drivers/bun-sqlite.d.ts

@@ -1,4 +1,5 @@
 import { Database } from 'bun:sqlite';
+import type { DatabaseOptions } from 'bun:sqlite';
 import type { Executor } from '../executor';
 /** Synchronous executor backed by bun:sqlite, wrapped in Promises for uniform API. */
 export declare class BunSqliteExecutor implements Executor {
@@ -17,10 +18,10 @@ export declare class BunSqliteExecutor implements Executor {
  * import { flint } from 'flint-orm/bun-sqlite'
  * const db = flint({ url: './app.db' })
  */
-export declare function flint(details: {
+export declare function flint(options: {
     url: string;
-}): {
-    select: () => import("..").SelectStage1;
+} & DatabaseOptions): {
+    selectFrom: <T extends import("..").AnyTable>(table: T) => import("..").SelectBuilder<T>;
     insert: <T extends import("..").AnyTable>(table: T) => import("..").InsertStage1<T>;
     update: <T extends import("..").AnyTable>(table: T) => import("..").UpdateStage1<T>;
     delete: <T extends import("..").AnyTable>(table: T) => import("../query/builder").DeleteBuilder<T, false, keyof import("..").InferRow<T>>;

package/dist/drivers/lazy-executor.d.ts

@@ -0,0 +1,14 @@
+import type { Executor } from '../executor';
+/**
+ * Wraps an async executor factory, deferring connection until first use.
+ * This lets flint() be synchronous even for async drivers.
+ */
+export declare class LazyExecutor implements Executor {
+    #private;
+    constructor(factory: () => Promise<Executor>);
+    all(sql: string, params: unknown[]): Promise<unknown[]>;
+    get(sql: string, params: unknown[]): Promise<unknown>;
+    run(sql: string, params: unknown[]): Promise<void>;
+    transaction(fn: () => void | Promise<void>): Promise<void>;
+    close(): void;
+}

package/dist/drivers/libsql-web.d.ts

@@ -1,4 +1,4 @@
-import type { Client } from '@libsql/client';
+import type { Client, Config } from '@libsql/client';
 import type { Executor } from '../executor';
 /** Async executor backed by @libsql/client/web. */
 export declare class LibsqlWebExecutor implements Executor {
@@ -10,11 +10,6 @@ export declare class LibsqlWebExecutor implements Executor {
     transaction(fn: () => void | Promise<void>): Promise<void>;
     close(): void;
 }
-export interface LibSQLWebConnectionDetails {
-    /** Database URL — must use ws:, wss:, http:, or https: scheme. */
-    url: string;
-    authToken?: string;
-}
 /**
  * Create a flint database client using @libsql/client/web.
  *
@@ -25,8 +20,8 @@ export interface LibSQLWebConnectionDetails {
  * import { flint } from 'flint-orm/libsql-web'
  * const db = flint({ url: 'libsql://your-db.turso.io', authToken: '...' })
  */
-export declare function flint(details: LibSQLWebConnectionDetails): {
-    select: () => import("..").SelectStage1;
+export declare function flint(options: Config): {
+    selectFrom: <T extends import("..").AnyTable>(table: T) => import("..").SelectBuilder<T>;
     insert: <T extends import("..").AnyTable>(table: T) => import("..").InsertStage1<T>;
     update: <T extends import("..").AnyTable>(table: T) => import("..").UpdateStage1<T>;
     delete: <T extends import("..").AnyTable>(table: T) => import("../query/builder").DeleteBuilder<T, false, keyof import("..").InferRow<T>>;

package/dist/drivers/libsql.d.ts

@@ -1,4 +1,4 @@
-import type { Client } from '@libsql/client';
+import type { Client, Config } from '@libsql/client';
 import type { Executor } from '../executor';
 /** Async executor backed by `@libsql/client`. */
 export declare class LibsqlExecutor implements Executor {
@@ -10,10 +10,6 @@ export declare class LibsqlExecutor implements Executor {
     transaction(fn: () => void | Promise<void>): Promise<void>;
     close(): void;
 }
-export interface LibSQLConnectionDetails {
-    url: string;
-    authToken?: string;
-}
 /**
  * Create a flint database client using @libsql/client.
  *
@@ -21,8 +17,8 @@ export interface LibSQLConnectionDetails {
  * import { flint } from 'flint-orm/libsql'
  * const db = flint({ url: 'libsql://your-db.turso.io', authToken: '...' })
  */
-export declare function flint(details: LibSQLConnectionDetails): {
-    select: () => import("..").SelectStage1;
+export declare function flint(options: Config): {
+    selectFrom: <T extends import("..").AnyTable>(table: T) => import("..").SelectBuilder<T>;
     insert: <T extends import("..").AnyTable>(table: T) => import("..").InsertStage1<T>;
     update: <T extends import("..").AnyTable>(table: T) => import("..").UpdateStage1<T>;
     delete: <T extends import("..").AnyTable>(table: T) => import("../query/builder").DeleteBuilder<T, false, keyof import("..").InferRow<T>>;

package/dist/drivers/turso-sync.d.ts

@@ -1,4 +1,4 @@
-import type { Database } from '@tursodatabase/sync';
+import type { Database, DatabaseOpts } from '@tursodatabase/sync';
 import type { Executor } from '../executor';
 /** Async executor backed by @tursodatabase/sync. */
 export declare class TursoSyncExecutor implements Executor {
@@ -10,23 +10,25 @@ export declare class TursoSyncExecutor implements Executor {
     transaction(fn: () => void | Promise<void>): Promise<void>;
     close(): void;
 }
-export interface TursoSyncConnectionDetails {
-    /** Local path for the synced database files. */
+export interface TursoSyncOptions extends Omit<DatabaseOpts, 'path' | 'url' | 'authToken'> {
+    /** Local path for the synced database files (maps to `path` in `@tursodatabase/sync`). */
     url: string;
-    /** Remote Turso database URL (libsql://...). */
+    /** Remote Turso database URL (maps to `url` in `@tursodatabase/sync`). */
     syncUrl?: string;
     /** Auth token for the remote database. */
-    authToken?: string;
+    authToken?: DatabaseOpts['authToken'];
 }
 /**
  * Create a flint database client using @tursodatabase/sync.
  *
+ * Connection is established lazily on first query.
+ *
  * @example
  * import { flint } from 'flint-orm/turso-sync'
  * const db = flint({ url: './local.db', syncUrl: 'libsql://db.turso.io', authToken: '...' })
  */
-export declare function flint(details: TursoSyncConnectionDetails): Promise<{
-    select: () => import("..").SelectStage1;
+export declare function flint(options: TursoSyncOptions): {
+    selectFrom: <T extends import("..").AnyTable>(table: T) => import("..").SelectBuilder<T>;
     insert: <T extends import("..").AnyTable>(table: T) => import("..").InsertStage1<T>;
     update: <T extends import("..").AnyTable>(table: T) => import("..").UpdateStage1<T>;
     delete: <T extends import("..").AnyTable>(table: T) => import("../query/builder").DeleteBuilder<T, false, keyof import("..").InferRow<T>>;
@@ -41,4 +43,4 @@ export declare function flint(details: TursoSyncConnectionDetails): Promise<{
     max: <T extends import("..").AnyTable, C extends import("..").ColumnDef<any, any>>(table: T, column: C, condition?: import("..").Condition) => Promise<number | null>;
     $run(query: string, ...params: unknown[]): Promise<void>;
     $executor: Executor;
-}>;
+};

package/dist/drivers/turso.d.ts

@@ -1,3 +1,4 @@
+import { connect } from '@tursodatabase/database';
 import type { Database } from '@tursodatabase/database';
 import type { Executor } from '../executor';
 /** Async executor backed by @tursodatabase/database. */
@@ -13,14 +14,16 @@ export declare class TursoExecutor implements Executor {
 /**
  * Create a flint database client using @tursodatabase/database.
  *
+ * Connection is established lazily on first query.
+ *
  * @example
  * import { flint } from 'flint-orm/turso'
- * const db = await flint({ url: './app.db' })
+ * const db = flint({ url: './app.db' })
  */
-export declare function flint(details: {
+export declare function flint(options: {
     url: string;
-}): Promise<{
-    select: () => import("..").SelectStage1;
+} & Parameters<typeof connect>[1]): {
+    selectFrom: <T extends import("..").AnyTable>(table: T) => import("..").SelectBuilder<T>;
     insert: <T extends import("..").AnyTable>(table: T) => import("..").InsertStage1<T>;
     update: <T extends import("..").AnyTable>(table: T) => import("..").UpdateStage1<T>;
     delete: <T extends import("..").AnyTable>(table: T) => import("../query/builder").DeleteBuilder<T, false, keyof import("..").InferRow<T>>;
@@ -35,4 +38,4 @@ export declare function flint(details: {
     max: <T extends import("..").AnyTable, C extends import("..").ColumnDef<any, any>>(table: T, column: C, condition?: import("..").Condition) => Promise<number | null>;
     $run(query: string, ...params: unknown[]): Promise<void>;
     $executor: Executor;
-}>;
+};

package/dist/entries/libsql-web.d.ts

@@ -1,2 +1,2 @@
 export { flint } from '../drivers/libsql-web';
-export type { LibSQLWebConnectionDetails } from '../drivers/libsql-web';
+export type { Config as LibSQLWebConfig } from '@libsql/client/web';

package/dist/entries/libsql.d.ts

@@ -1,2 +1,2 @@
 export { flint } from '../drivers/libsql';
-export type { LibSQLConnectionDetails } from '../drivers/libsql';
+export type { Config as LibSQLConfig } from '@libsql/client';

package/dist/entries/turso-sync.d.ts

@@ -1,2 +1,2 @@
 export { flint } from '../drivers/turso-sync';
-export type { TursoSyncConnectionDetails } from '../drivers/turso-sync';
+export type { TursoSyncOptions } from '../drivers/turso-sync';

package/dist/flint.d.ts

@@ -1,10 +1,10 @@
 import type { Executor } from './executor';
-import { DeleteBuilder } from './query/builder';
-import type { Executable, SelectStage1, InsertStage1, UpdateStage1, JoinSelectStage1 } from './query/builder';
+import { SelectBuilder, DeleteBuilder } from './query/builder';
+import type { Executable, InsertStage1, UpdateStage1, JoinSelectStage1 } from './query/builder';
 import type { AnyTable } from './schema/table';
 import type { Condition } from './query/conditions';
 import type { ColumnDef } from './schema/columns';
-export type { Executable, SelectStage1, InsertStage1, UpdateStage1, JoinSelectStage1, JoinBuilder, SingleJoinBuilder } from './query/builder';
+export type { Executable, SelectBuilder, InsertStage1, UpdateStage1, JoinSelectStage1, JoinBuilder, SingleJoinBuilder } from './query/builder';
 export type { JoinResult } from './query/builder';
 /**
  * A raw SQL expression with parameters.
@@ -29,12 +29,12 @@ export interface SQLExpression {
  */
 export declare function createClient(executor: Executor): {
     /**
-     * Start a SELECT query — call `.from(table)` next.
+     * Start a SELECT query — pass a table definition.
      *
      * @example
-     * const rows = db.select().from(users).execute()
+     * const rows = db.selectFrom(users).execute()
      */
-    select: () => SelectStage1;
+    selectFrom: <T extends AnyTable>(table: T) => SelectBuilder<T>;
     /**
      * Start an INSERT — call `.values(row)` next.
      *

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { sql, createClient } from './flint';
-export type { SQLExpression, Executable, SelectStage1, InsertStage1, UpdateStage1 } from './flint';
+export type { SQLExpression, Executable, SelectBuilder, InsertStage1, UpdateStage1 } from './flint';
 export type { Executor } from './executor';
 export { text, integer, boolean, json, date, real } from './schema/columns';
 export type { ColumnDef, IntegerColumnDef, DateColumnDef, DateColumnDefWithDefault } from './schema/columns';

package/dist/query/builder.d.ts

@@ -24,12 +24,9 @@ export interface Executable {
         params: unknown[];
     };
 }
-/** Phase 1 of a SELECT — only `.from()` is available. */
-export interface SelectStage1 {
-    from<U extends AnyTable>(table: U): SelectBuilder<U>;
-}
 /**
- * Full SELECT builder — available after `.from()`.
+ * Full SELECT builder — created directly via `db.selectFrom(table)`.
+ * Entry point: `db.selectFrom(table)`.
  * Returns `InferRow<T>[]` (all columns) from `execute()`.
  * Call `.columns()` to narrow — returns a `NarrowedSelectBuilder`.
  */
@@ -46,7 +43,7 @@ export declare class SelectBuilder<T extends AnyTable> implements Executable {
      * Returns a `NarrowedSelectBuilder` with a clean `{ id: string; name: string }` return type.
      *
      * @example
-     * db.select().from(users).columns(["id", "name"]).execute()
+     * db.selectFrom(users).columns(["id", "name"]).execute()
      * // ^? { id: string; name: string }[]
      */
     columns<K extends keyof InferRow<T>>(keys: K[]): NarrowedSelectBuilder<T, K>;

package/dist/src/cli.js

@@ -275,7 +275,7 @@ function diffColumns(tableName, prevCols, currCols) {
     if (prevCol.isPrimaryKey !== currCol.isPrimaryKey) {
       unsafe = true;
     }
-    if ((prevCol.isAutoIncrement ?? false) !== (currCol.isAutoIncrement ?? false)) {
+    if (prevCol.isAutoIncrement !== undefined && (prevCol.isAutoIncrement ?? false) !== (currCol.isAutoIncrement ?? false)) {
       unsafe = true;
     }
     if (prevCol.isNotNull !== currCol.isNotNull) {
@@ -538,6 +538,9 @@ function serializeColumn(col) {
     hasDefault: internal.hasDefault,
     defaultValue: internal.defaultValue
   };
+  if (result.isAutoIncrement && !result.isPrimaryKey) {
+    throw new Error(`Column "${col.name}": autoIncrement() requires primaryKey()`);
+  }
   if (internal.referencesTable && internal.referencesColumn) {
     result.referencesTable = internal.referencesTable;
     result.referencesColumn = internal.referencesColumn;
@@ -1373,18 +1376,6 @@ function resolveColumns(table, selectedColumns, prefix) {
   return entries.map(([, c3]) => prefix ? `${prefix}.${c3.name}` : c3.name).join(", ");
 }
 
-class SelectFromBuilder {
-  #executor;
-  #conditions;
-  constructor(executor, conditions = []) {
-    this.#executor = executor;
-    this.#conditions = conditions;
-  }
-  from(table) {
-    return new SelectBuilder(this.#executor, table._.name, table, this.#conditions);
-  }
-}
-
 class SelectBuilder {
   #executor;
   #tableName;
@@ -2281,7 +2272,7 @@ var init_aggregates = () => {};
 // src/flint.ts
 function createClient(executor) {
   return {
-    select: () => new SelectFromBuilder(executor),
+    selectFrom: (table) => new SelectBuilder(executor, table._.name, table),
     insert: (table) => new InsertValuesBuilder(executor, table._.name, table),
     update: (table) => new UpdateSetBuilder(executor, table._.name, table),
     delete: (table) => new DeleteBuilder(executor, table._.name, table),
@@ -2370,8 +2361,9 @@ class BunSqliteExecutor {
     this.#client.close();
   }
 }
-function flint(details) {
-  const client = new Database(details.url);
+function flint(options) {
+  const { url, ...opts } = options;
+  const client = new Database(url, Object.keys(opts).length ? opts : undefined);
   return createClient(new BunSqliteExecutor(client));
 }
 var init_bun_sqlite = __esm(() => {
@@ -3188,8 +3180,9 @@ class BetterSqlite3Executor {
     this.#client.close();
   }
 }
-function flint2(details) {
-  const client = new import_better_sqlite3.default(details.url);
+function flint2(options) {
+  const { url, ...opts } = options;
+  const client = new import_better_sqlite3.default(url, Object.keys(opts).length ? opts : undefined);
   return createClient(new BetterSqlite3Executor(client));
 }
 var import_better_sqlite3;
@@ -9164,11 +9157,8 @@ class LibsqlExecutor {
     this.#client.close();
   }
 }
-function flint3(details) {
-  const client = createClient2({
-    url: normalizeUrl(details.url),
-    authToken: details.authToken
-  });
+function flint3(options) {
+  const client = createClient2({ ...options, url: normalizeUrl(options.url) });
   return createClient(new LibsqlExecutor(client));
 }
 var init_libsql = __esm(() => {
@@ -9245,8 +9235,8 @@ class LibsqlWebExecutor {
     this.#client.close();
   }
 }
-function flint4(details) {
-  const client = createClient3({ url: details.url, authToken: details.authToken });
+function flint4(options) {
+  const client = createClient3(options);
   return createClient(new LibsqlWebExecutor(client));
 }
 var init_libsql_web = __esm(() => {
@@ -11475,6 +11465,46 @@ var init_promise2 = __esm(() => {
   };
 });
 
+// src/drivers/lazy-executor.ts
+class LazyExecutor {
+  #factory;
+  #executor;
+  #promise;
+  constructor(factory) {
+    this.#factory = factory;
+  }
+  async#resolve() {
+    if (this.#executor)
+      return this.#executor;
+    if (!this.#promise) {
+      this.#promise = this.#factory().then((exec2) => {
+        this.#executor = exec2;
+        return exec2;
+      });
+    }
+    return this.#promise;
+  }
+  async all(sql2, params) {
+    const exec2 = await this.#resolve();
+    return exec2.all(sql2, params);
+  }
+  async get(sql2, params) {
+    const exec2 = await this.#resolve();
+    return exec2.get(sql2, params);
+  }
+  async run(sql2, params) {
+    const exec2 = await this.#resolve();
+    return exec2.run(sql2, params);
+  }
+  async transaction(fn) {
+    const exec2 = await this.#resolve();
+    return exec2.transaction(fn);
+  }
+  close() {
+    this.#executor?.close();
+  }
+}
+
 // src/drivers/turso-sync.ts
 var exports_turso_sync = {};
 __export(exports_turso_sync, {
@@ -11514,14 +11544,19 @@ class TursoSyncExecutor {
     this.#db.close();
   }
 }
-async function flint5(details) {
-  const localPath = details.url.includes("://") ? details.url : resolve2(details.url);
-  const db = await connect2({
-    path: localPath,
-    url: details.syncUrl,
-    authToken: details.authToken
+function flint5(options) {
+  const { url, syncUrl, authToken, ...rest } = options;
+  const localPath = url.includes("://") ? url : resolve2(url);
+  const executor = new LazyExecutor(async () => {
+    const db = await connect2({
+      path: localPath,
+      url: syncUrl,
+      authToken,
+      ...rest
+    });
+    return new TursoSyncExecutor(db);
   });
-  return createClient(new TursoSyncExecutor(db));
+  return createClient(executor);
 }
 var init_turso_sync = __esm(() => {
   init_promise2();
@@ -12099,9 +12134,13 @@ class TursoExecutor {
     this.#db.close();
   }
 }
-async function flint6(details) {
-  const db = await connect3(details.url);
-  return createClient(new TursoExecutor(db));
+function flint6(options) {
+  const { url, ...opts } = options;
+  const executor = new LazyExecutor(async () => {
+    const db = await connect3(url, Object.keys(opts).length ? opts : undefined);
+    return new TursoExecutor(db);
+  });
+  return createClient(executor);
 }
 var init_turso = __esm(() => {
   init_promise3();

package/dist/src/entries/better-sqlite3.js

@@ -1037,18 +1037,6 @@ function resolveColumns(table, selectedColumns, prefix) {
   return entries.map(([, c]) => prefix ? `${prefix}.${c.name}` : c.name).join(", ");
 }
 
-class SelectFromBuilder {
-  #executor;
-  #conditions;
-  constructor(executor, conditions = []) {
-    this.#executor = executor;
-    this.#conditions = conditions;
-  }
-  from(table) {
-    return new SelectBuilder(this.#executor, table._.name, table, this.#conditions);
-  }
-}
-
 class SelectBuilder {
   #executor;
   #tableName;
@@ -1945,7 +1933,7 @@ var init_aggregates = () => {};
 // src/flint.ts
 function createClient(executor) {
   return {
-    select: () => new SelectFromBuilder(executor),
+    selectFrom: (table) => new SelectBuilder(executor, table._.name, table),
     insert: (table) => new InsertValuesBuilder(executor, table._.name, table),
     update: (table) => new UpdateSetBuilder(executor, table._.name, table),
     delete: (table) => new DeleteBuilder(executor, table._.name, table),
@@ -2033,8 +2021,9 @@ class BetterSqlite3Executor {
     this.#client.close();
   }
 }
-function flint(details) {
-  const client = new import_better_sqlite3.default(details.url);
+function flint(options) {
+  const { url, ...opts } = options;
+  const client = new import_better_sqlite3.default(url, Object.keys(opts).length ? opts : undefined);
   return createClient(new BetterSqlite3Executor(client));
 }
 var import_better_sqlite3;

package/dist/src/entries/bun-sqlite.js

@@ -272,18 +272,6 @@ function resolveColumns(table, selectedColumns, prefix) {
   return entries.map(([, c]) => prefix ? `${prefix}.${c.name}` : c.name).join(", ");
 }
 
-class SelectFromBuilder {
-  #executor;
-  #conditions;
-  constructor(executor, conditions = []) {
-    this.#executor = executor;
-    this.#conditions = conditions;
-  }
-  from(table) {
-    return new SelectBuilder(this.#executor, table._.name, table, this.#conditions);
-  }
-}
-
 class SelectBuilder {
   #executor;
   #tableName;
@@ -1180,7 +1168,7 @@ var init_aggregates = () => {};
 // src/flint.ts
 function createClient(executor) {
   return {
-    select: () => new SelectFromBuilder(executor),
+    selectFrom: (table) => new SelectBuilder(executor, table._.name, table),
     insert: (table) => new InsertValuesBuilder(executor, table._.name, table),
     update: (table) => new UpdateSetBuilder(executor, table._.name, table),
     delete: (table) => new DeleteBuilder(executor, table._.name, table),
@@ -1269,8 +1257,9 @@ class BunSqliteExecutor {
     this.#client.close();
   }
 }
-function flint(details) {
-  const client = new Database(details.url);
+function flint(options) {
+  const { url, ...opts } = options;
+  const client = new Database(url, Object.keys(opts).length ? opts : undefined);
   return createClient(new BunSqliteExecutor(client));
 }
 var init_bun_sqlite = __esm(() => {

package/dist/src/entries/expressions.js

@@ -272,18 +272,6 @@ function resolveColumns(table, selectedColumns, prefix) {
   return entries.map(([, c]) => prefix ? `${prefix}.${c.name}` : c.name).join(", ");
 }
 
-class SelectFromBuilder {
-  #executor;
-  #conditions;
-  constructor(executor, conditions = []) {
-    this.#executor = executor;
-    this.#conditions = conditions;
-  }
-  from(table) {
-    return new SelectBuilder(this.#executor, table._.name, table, this.#conditions);
-  }
-}
-
 class SelectBuilder {
   #executor;
   #tableName;
@@ -1180,7 +1168,7 @@ var init_aggregates = () => {};
 // src/flint.ts
 function createClient(executor) {
   return {
-    select: () => new SelectFromBuilder(executor),
+    selectFrom: (table) => new SelectBuilder(executor, table._.name, table),
     insert: (table) => new InsertValuesBuilder(executor, table._.name, table),
     update: (table) => new UpdateSetBuilder(executor, table._.name, table),
     delete: (table) => new DeleteBuilder(executor, table._.name, table),

package/dist/src/entries/libsql-web.js

@@ -5058,18 +5058,6 @@ function resolveColumns(table, selectedColumns, prefix) {
   return entries.map(([, c]) => prefix ? `${prefix}.${c.name}` : c.name).join(", ");
 }
 
-class SelectFromBuilder {
-  #executor;
-  #conditions;
-  constructor(executor, conditions = []) {
-    this.#executor = executor;
-    this.#conditions = conditions;
-  }
-  from(table) {
-    return new SelectBuilder(this.#executor, table._.name, table, this.#conditions);
-  }
-}
-
 class SelectBuilder {
   #executor;
   #tableName;
@@ -5966,7 +5954,7 @@ var init_aggregates = () => {};
 // src/flint.ts
 function createClient2(executor) {
   return {
-    select: () => new SelectFromBuilder(executor),
+    selectFrom: (table) => new SelectBuilder(executor, table._.name, table),
     insert: (table) => new InsertValuesBuilder(executor, table._.name, table),
     update: (table) => new UpdateSetBuilder(executor, table._.name, table),
     delete: (table) => new DeleteBuilder(executor, table._.name, table),
@@ -6049,8 +6037,8 @@ class LibsqlWebExecutor {
     this.#client.close();
   }
 }
-function flint(details) {
-  const client = createClient({ url: details.url, authToken: details.authToken });
+function flint(options) {
+  const client = createClient(options);
   return createClient2(new LibsqlWebExecutor(client));
 }
 var init_libsql_web = __esm(() => {

package/dist/src/entries/libsql.js

@@ -6192,18 +6192,6 @@ function resolveColumns(table, selectedColumns, prefix) {
   return entries.map(([, c]) => prefix ? `${prefix}.${c.name}` : c.name).join(", ");
 }
 
-class SelectFromBuilder {
-  #executor;
-  #conditions;
-  constructor(executor, conditions = []) {
-    this.#executor = executor;
-    this.#conditions = conditions;
-  }
-  from(table) {
-    return new SelectBuilder(this.#executor, table._.name, table, this.#conditions);
-  }
-}
-
 class SelectBuilder {
   #executor;
   #tableName;
@@ -7100,7 +7088,7 @@ var init_aggregates = () => {};
 // src/flint.ts
 function createClient2(executor) {
   return {
-    select: () => new SelectFromBuilder(executor),
+    selectFrom: (table) => new SelectBuilder(executor, table._.name, table),
     insert: (table) => new InsertValuesBuilder(executor, table._.name, table),
     update: (table) => new UpdateSetBuilder(executor, table._.name, table),
     delete: (table) => new DeleteBuilder(executor, table._.name, table),
@@ -7189,11 +7177,8 @@ class LibsqlExecutor {
     this.#client.close();
   }
 }
-function flint(details) {
-  const client = createClient({
-    url: normalizeUrl(details.url),
-    authToken: details.authToken
-  });
+function flint(options) {
+  const client = createClient({ ...options, url: normalizeUrl(options.url) });
   return createClient2(new LibsqlExecutor(client));
 }
 var init_libsql = __esm(() => {

package/dist/src/entries/turso-sync.js

@@ -2493,18 +2493,6 @@ function resolveColumns(table, selectedColumns, prefix) {
   return entries.map(([, c]) => prefix ? `${prefix}.${c.name}` : c.name).join(", ");
 }
 
-class SelectFromBuilder {
-  #executor;
-  #conditions;
-  constructor(executor, conditions = []) {
-    this.#executor = executor;
-    this.#conditions = conditions;
-  }
-  from(table) {
-    return new SelectBuilder(this.#executor, table._.name, table, this.#conditions);
-  }
-}
-
 class SelectBuilder {
   #executor;
   #tableName;
@@ -3401,7 +3389,7 @@ var init_aggregates = () => {};
 // src/flint.ts
 function createClient(executor) {
   return {
-    select: () => new SelectFromBuilder(executor),
+    selectFrom: (table) => new SelectBuilder(executor, table._.name, table),
     insert: (table) => new InsertValuesBuilder(executor, table._.name, table),
     update: (table) => new UpdateSetBuilder(executor, table._.name, table),
     delete: (table) => new DeleteBuilder(executor, table._.name, table),
@@ -3444,6 +3432,46 @@ var init_flint = __esm(() => {
   init_aggregates();
 });
 
+// src/drivers/lazy-executor.ts
+class LazyExecutor {
+  #factory;
+  #executor;
+  #promise;
+  constructor(factory) {
+    this.#factory = factory;
+  }
+  async#resolve() {
+    if (this.#executor)
+      return this.#executor;
+    if (!this.#promise) {
+      this.#promise = this.#factory().then((exec) => {
+        this.#executor = exec;
+        return exec;
+      });
+    }
+    return this.#promise;
+  }
+  async all(sql2, params) {
+    const exec = await this.#resolve();
+    return exec.all(sql2, params);
+  }
+  async get(sql2, params) {
+    const exec = await this.#resolve();
+    return exec.get(sql2, params);
+  }
+  async run(sql2, params) {
+    const exec = await this.#resolve();
+    return exec.run(sql2, params);
+  }
+  async transaction(fn) {
+    const exec = await this.#resolve();
+    return exec.transaction(fn);
+  }
+  close() {
+    this.#executor?.close();
+  }
+}
+
 // src/drivers/turso-sync.ts
 var exports_turso_sync = {};
 __export(exports_turso_sync, {
@@ -3483,14 +3511,19 @@ class TursoSyncExecutor {
     this.#db.close();
   }
 }
-async function flint(details) {
-  const localPath = details.url.includes("://") ? details.url : resolve(details.url);
-  const db = await connect2({
-    path: localPath,
-    url: details.syncUrl,
-    authToken: details.authToken
+function flint(options) {
+  const { url, syncUrl, authToken, ...rest } = options;
+  const localPath = url.includes("://") ? url : resolve(url);
+  const executor = new LazyExecutor(async () => {
+    const db = await connect2({
+      path: localPath,
+      url: syncUrl,
+      authToken,
+      ...rest
+    });
+    return new TursoSyncExecutor(db);
   });
-  return createClient(new TursoSyncExecutor(db));
+  return createClient(executor);
 }
 var init_turso_sync = __esm(() => {
   init_promise2();

package/dist/src/entries/turso.js

@@ -1374,18 +1374,6 @@ function resolveColumns(table, selectedColumns, prefix) {
   return entries.map(([, c]) => prefix ? `${prefix}.${c.name}` : c.name).join(", ");
 }
 
-class SelectFromBuilder {
-  #executor;
-  #conditions;
-  constructor(executor, conditions = []) {
-    this.#executor = executor;
-    this.#conditions = conditions;
-  }
-  from(table) {
-    return new SelectBuilder(this.#executor, table._.name, table, this.#conditions);
-  }
-}
-
 class SelectBuilder {
   #executor;
   #tableName;
@@ -2282,7 +2270,7 @@ var init_aggregates = () => {};
 // src/flint.ts
 function createClient(executor) {
   return {
-    select: () => new SelectFromBuilder(executor),
+    selectFrom: (table) => new SelectBuilder(executor, table._.name, table),
     insert: (table) => new InsertValuesBuilder(executor, table._.name, table),
     update: (table) => new UpdateSetBuilder(executor, table._.name, table),
     delete: (table) => new DeleteBuilder(executor, table._.name, table),
@@ -2325,6 +2313,46 @@ var init_flint = __esm(() => {
   init_aggregates();
 });
 
+// src/drivers/lazy-executor.ts
+class LazyExecutor {
+  #factory;
+  #executor;
+  #promise;
+  constructor(factory) {
+    this.#factory = factory;
+  }
+  async#resolve() {
+    if (this.#executor)
+      return this.#executor;
+    if (!this.#promise) {
+      this.#promise = this.#factory().then((exec) => {
+        this.#executor = exec;
+        return exec;
+      });
+    }
+    return this.#promise;
+  }
+  async all(sql2, params) {
+    const exec = await this.#resolve();
+    return exec.all(sql2, params);
+  }
+  async get(sql2, params) {
+    const exec = await this.#resolve();
+    return exec.get(sql2, params);
+  }
+  async run(sql2, params) {
+    const exec = await this.#resolve();
+    return exec.run(sql2, params);
+  }
+  async transaction(fn) {
+    const exec = await this.#resolve();
+    return exec.transaction(fn);
+  }
+  close() {
+    this.#executor?.close();
+  }
+}
+
 // src/drivers/turso.ts
 var exports_turso = {};
 __export(exports_turso, {
@@ -2363,9 +2391,13 @@ class TursoExecutor {
     this.#db.close();
   }
 }
-async function flint(details) {
-  const db = await connect(details.url);
-  return createClient(new TursoExecutor(db));
+function flint(options) {
+  const { url, ...opts } = options;
+  const executor = new LazyExecutor(async () => {
+    const db = await connect(url, Object.keys(opts).length ? opts : undefined);
+    return new TursoExecutor(db);
+  });
+  return createClient(executor);
 }
 var init_turso = __esm(() => {
   init_promise2();

package/dist/src/index.js

@@ -272,18 +272,6 @@ function resolveColumns(table, selectedColumns, prefix) {
   return entries.map(([, c]) => prefix ? `${prefix}.${c.name}` : c.name).join(", ");
 }
 
-class SelectFromBuilder {
-  #executor;
-  #conditions;
-  constructor(executor, conditions = []) {
-    this.#executor = executor;
-    this.#conditions = conditions;
-  }
-  from(table) {
-    return new SelectBuilder(this.#executor, table._.name, table, this.#conditions);
-  }
-}
-
 class SelectBuilder {
   #executor;
   #tableName;
@@ -1180,7 +1168,7 @@ var init_aggregates = () => {};
 // src/flint.ts
 function createClient(executor) {
   return {
-    select: () => new SelectFromBuilder(executor),
+    selectFrom: (table) => new SelectBuilder(executor, table._.name, table),
     insert: (table) => new InsertValuesBuilder(executor, table._.name, table),
     update: (table) => new UpdateSetBuilder(executor, table._.name, table),
     delete: (table) => new DeleteBuilder(executor, table._.name, table),

package/dist/src/migration/index.js

@@ -63,6 +63,9 @@ function serializeColumn(col) {
     hasDefault: internal.hasDefault,
     defaultValue: internal.defaultValue
   };
+  if (result.isAutoIncrement && !result.isPrimaryKey) {
+    throw new Error(`Column "${col.name}": autoIncrement() requires primaryKey()`);
+  }
   if (internal.referencesTable && internal.referencesColumn) {
     result.referencesTable = internal.referencesTable;
     result.referencesColumn = internal.referencesColumn;
@@ -208,7 +211,7 @@ function diffColumns(tableName, prevCols, currCols) {
     if (prevCol.isPrimaryKey !== currCol.isPrimaryKey) {
       unsafe = true;
     }
-    if ((prevCol.isAutoIncrement ?? false) !== (currCol.isAutoIncrement ?? false)) {
+    if (prevCol.isAutoIncrement !== undefined && (prevCol.isAutoIncrement ?? false) !== (currCol.isAutoIncrement ?? false)) {
       unsafe = true;
     }
     if (prevCol.isNotNull !== currCol.isNotNull) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flint-orm",
-  "version": "0.4.5",
+  "version": "0.6.0",
   "bin": {
     "flint": "./dist/src/cli.js"
   },
@@ -87,9 +87,17 @@
     "typescript": ">=5.0.0"
   },
   "peerDependenciesMeta": {
-    "@libsql/client": { "optional": true },
-    "@tursodatabase/database": { "optional": true },
-    "@tursodatabase/sync": { "optional": true },
-    "better-sqlite3": { "optional": true }
+    "@libsql/client": {
+      "optional": true
+    },
+    "@tursodatabase/database": {
+      "optional": true
+    },
+    "@tursodatabase/sync": {
+      "optional": true
+    },
+    "better-sqlite3": {
+      "optional": true
+    }
   }
 }