imodel 0.16.2 → 0.17.1

package/index.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.16.2
+ * imodel v0.17.1
  * (c) 2019-2026 undefined
  * @license undefined
  */
@@ -13,6 +13,15 @@ function setDevelopment(d) {
   isDevelopment = Boolean(d);
 }
 
+/** @import { SelectItem } from './types' */
+class Subquery {
+  /** @returns {SelectItem[]} */
+  toSubquery() {
+    throw new Error('toSubquery 方法未在子类中实现');
+  }
+}
+
+/** @import { SelectItem } from './types' */
 /** @typedef {{toWhereValue(): WhereValue[][]}} WhereLike */
 /** @typedef {WhereLike | Record<string, any> | (WhereLike | Record<string, any>)[]} Wheres */
 /**
@@ -21,6 +30,7 @@ function setDevelopment(d) {
  * @prop {null} [or]
  * @prop {string | {table?: string; field: string} | (string | {table?: string; field: string})[]} field
  * @prop {any} value
+ * @prop {SelectItem[]?} [subquery]
  * @prop {boolean} [not]
  * @prop {string?} [operator]
  */
@@ -111,12 +121,14 @@ function parse(items) {
     return null;
   }
   const [field, operator, value, not] = items;
+  const subquery = value instanceof Subquery ? value.toSubquery() : null;
   // @ts-ignore
   return [{
     field,
     operator,
     value,
-    not: Boolean(not)
+    not: Boolean(not),
+    subquery
   }];
 }
 /**
@@ -658,9 +670,9 @@ function isPseudo(model) {
 }
 
 const now = Symbol();
-/** @type {typeof now} now */
+/** @typeof {typeof now} now */
 const uuid = Symbol();
-/** @type {typeof uuid} uuid */
+/** @typeof {typeof uuid} uuid */
 const increment$1 = Symbol();
 const decrement$1 = Symbol();
 const multiply$1 = Symbol();
@@ -929,7 +941,7 @@ function toFieldList(list, fieldColumns) {
   return list.map(it => Object.fromEntries(map.map(([k, v]) => [k, it[v]])));
 }
 
-/** @import { Environment, FieldDefine, Fields, IConnection, Skip, TableDefine } from '../types' */
+/** @import { Environment, FieldDefine, Fields, Skip, TableConnection, TableDefine } from '../types' */
 /**
  *
  * @param {any} p
@@ -960,7 +972,7 @@ function defaultMap(value, others) {
 }
 /**
  *
- * @param {IConnection} conn
+ * @param {TableConnection} conn
  * @param {Environment} env
  * @param {[string, FieldDefine<TableDefine>][]} fields
  * @param {Record<string, any>[]} newList
@@ -1062,7 +1074,7 @@ async function createSub(conn, env, fields, newList, list, skip) {
 // TODO: 嵌套
 /**
  *
- * @param {IConnection} conn
+ * @param {TableConnection} conn
  * @param {Environment} env
  * @param {TableDefine} model
  * @param {any} p
@@ -1320,10 +1332,10 @@ function* getFixedValueWhere(columns, ignore) {
   }
 }
 
-/** @import { Environment, FieldDefine, IConnection, Queryable, TableDefine } from '../types' */
+/** @import { Environment, FieldDefine, Queryable, TableConnection, TableDefine } from '../types' */
 /**
  *
- * @param {IConnection} conn
+ * @param {TableConnection} conn
  * @param {any[]} list
  * @param {[string, FieldDefine<TableDefine>][]} fields
  * @param {Set<string>} baseFieldSet
@@ -1381,7 +1393,7 @@ async function deleteSub(conn, list, fields, baseFieldSet, env, hasResult) {
 }
 // TODO: 嵌套
 /**
- * @param {IConnection} conn
+ * @param {TableConnection} conn
  * @param {Queryable} queryable
  * @param {Environment} env
  * @returns {Promise<number>}
@@ -1486,7 +1498,7 @@ async function getSetValue$1(columns, fieldColumns, update, skip) {
 
 /* eslint-disable max-lines */
 /* eslint-disable no-labels */
-/** @import { Constraint, Environment, FieldDefine, IConnection, Skip, TableDefine } from '../types' */
+/** @import { Constraint, Environment, FieldDefine, Skip, TableConnection, TableDefine } from '../types' */
 /** @import { WhereValue } from '../Where.mjs' */
 /**
  *
@@ -1604,7 +1616,7 @@ function separation(newList, oldList, primaryKeys, commonFilterKeys, noField) {
 }
 /**
  *
- * @param {IConnection} conn
+ * @param {TableConnection} conn
  * @param {Environment} env
  * @param {[Record<string, any>, Record<string, any>, Record<string, any>][]} updatedOldNewList
  * @param {string} key
@@ -1810,7 +1822,7 @@ async function updateItem(conn, env, updatedOldNewList, key, type, array, constr
 }
 /**
  *
- * @param {IConnection} conn
+ * @param {TableConnection} conn
  * @param {[string, FieldDefine<TableDefine>][]} fields
  * @param {[Record<string, any>, Record<string, any>, Record<string, any>][]} list
  * @param {Environment} env
@@ -1838,7 +1850,7 @@ async function updateSub(conn, fields, list, env, skip) {
 }
 /**
  *
- * @param {IConnection} conn
+ * @param {TableConnection} conn
  * @param {TableDefine} model
  * @param {Record<string, any>} data
  * @param {Record<string, any>} newData
@@ -1920,10 +1932,10 @@ async function setDeleteTimestamp(columns, update) {
 
 /** @import { WhereValue } from '../Where.mjs' */
 /** @import { SetValue } from '../set.mjs' */
-/** @import { Environment, IConnection, TableDefine } from '../types' */
+/** @import { Environment, TableDefine, TableConnection } from '../types' */
 /**
  *
- * @param {IConnection} conn
+ * @param {TableConnection} conn
  * @param {TableDefine} tableDef
  * @param {any} data
  * @param {Record<string, SetValue>} update
@@ -1961,10 +1973,10 @@ async function pseudoDestroy (conn, tableDef, data, update, env) {
   return toFieldList(dataUpdated, fieldColumns)[0] || null;
 }
 
-/** @import { IConnection, TableDefine, Environment } from '../types' */
+/** @import { TableDefine, Environment, TableConnection } from '../types' */
 /**
  *
- * @param {IConnection} conn
+ * @param {TableConnection} conn
  * @param {TableDefine} tableDef
  * @param {any} data
  * @param {Environment} env
@@ -2068,7 +2080,7 @@ function sort2column(sort, fieldColumns) {
 }
 
 /** @import Connection from './index.mjs' */
-/** @import { Environment, FieldDefine, Fields, IConnection, Skip, TableDefine, FieldType } from '../types' */
+/** @import { Environment, FieldDefine, Fields, Skip, TableDefine, FieldType, TableConnection, SelectItem } from '../types' */
 /**
  * @param {string[] | boolean | null} [items]
  */
@@ -2121,15 +2133,15 @@ function getSelectFields(select, columns, tableFields, baseFieldSet) {
 }
 /**
  *
- * @param {IConnection} conn
+ * @param {TableConnection} conn
  * @param {any[]} list
  * @param {[string, FieldDefine<TableDefine>][]} fields
- * @param {Set<string>} baseFieldSet
+ * @param {Set<string>} baseParentFieldSet
  * @param {Environment} env
  * @param {Record<string, string[] | undefined>?} [returnFields]
  * @returns {Promise<any[]>}
  */
-async function findSub(conn, list, fields, baseFieldSet, env, returnFields) {
+async function findSub(conn, list, fields, baseParentFieldSet, env, returnFields) {
   if (!list.length) {
     return list;
   }
@@ -2151,7 +2163,7 @@ async function findSub(conn, list, fields, baseFieldSet, env, returnFields) {
     if (returnFields && !fieldMap) {
       continue;
     }
-    const mapList = getMapList(fields, baseFieldSet, constraints);
+    const mapList = getMapList(fields, baseParentFieldSet, constraints);
     if (!mapList) {
       continue;
     }
@@ -2160,19 +2172,22 @@ async function findSub(conn, list, fields, baseFieldSet, env, returnFields) {
     const [columns, fieldColumns, tableFields] = toColumns(fields);
     const noColumn = noField && fieldColumns ? fieldColumns[noField] : noField;
     const where = [subList2where(list, mapList, fieldColumns), ...getValueWhere(constraints, columns, fieldColumns)];
+    const baseFieldSet = new Set(Object.keys(fieldColumns || columns));
     const selected = fieldMap && getSelectFields(fieldMap[''] || [], columns, tableFields, baseFieldSet) || null;
     const select = select2column(columns, fieldColumns, selected && [...selected, ...mapList.map(v => v[0])]);
-    /** @type {PromiseLike<object[]>} */
-    const result = table && typeof table === 'object' ? table.find(env, conn, columns, {
-      where,
-      sort: getDefaultSort(columns, noColumn),
-      select
-    }) : conn.find(env, table, columns, {
+    /** @type {SelectItem[]} */
+    const selects = [{
+      table: typeof table === 'string' ? table : '',
+      columns,
+      select,
       where,
-      sort: getDefaultSort(columns, noColumn),
-      select
-    });
-    let promise = result.then(list => findSub(conn, list, tableFields, new Set(Object.keys(fieldColumns || columns)), env, fieldMap));
+      sort: getDefaultSort(columns, noColumn) || [],
+      group: [],
+      having: []
+    }];
+    /** @type {PromiseLike<object[]>} */
+    const result = table && typeof table === 'object' ? table.select(env, conn, selects) : conn.select(env, selects);
+    let promise = result.then(list => findSub(conn, list, tableFields, baseFieldSet, env, fieldMap));
     promises.push(array ? promise.then(subList => {
       for (const item of list) {
         item[key] = subList.filter(createFilter(item, mapList));
@@ -2188,7 +2203,7 @@ async function findSub(conn, list, fields, baseFieldSet, env, returnFields) {
 /**
  *
  * @template {TableDefine} T
- * @param {IConnection} conn
+ * @param {TableConnection} conn
  * @param {Connection} that
  * @param {T} p
  * @param {Environment} env
@@ -2220,19 +2235,19 @@ async function search(conn, that, p, env, returnFields, skip) {
   const selected = fieldMap && getSelectFields(fieldMap[''] || [], columns, tableFields, baseFieldSet) || null;
   const select = select2column(columns, fieldColumns, selected);
   const sorted = sort?.length ? sort2column(sort, fieldColumns) : getDefaultSort(columns);
-  const list = table && typeof table === 'object' ? await table.find(env, conn, columns, {
-    where,
-    offset,
-    limit,
+  /** @type {SelectItem[]} */
+  const selects = [{
+    table: typeof table === 'string' ? table : '',
+    columns,
     select,
-    sort: sorted
-  }) : await conn.find(env, table || '', columns, {
     where,
     offset,
     limit,
-    select,
-    sort: sorted
-  });
+    sort: sorted || [],
+    group: [],
+    having: []
+  }];
+  const list = table && typeof table === 'object' ? await table.select(env, conn, selects) : await conn.select(env, selects);
   if (!list.length) {
     return [];
   }
@@ -2243,11 +2258,11 @@ async function search(conn, that, p, env, returnFields, skip) {
 }
 
 /** @import Connection from './index.mjs' */
-/** @import { Environment, TableDefine, IConnection, Skip } from '../types' */
+/** @import { Environment, TableDefine, Skip, TableConnection, SelectItem } from '../types' */
 /**
  *
  * @template {TableDefine} T
- * @param {IConnection} conn
+ * @param {TableConnection} conn
  * @param {Connection} that
  * @param {T} p
  * @param {Environment} env
@@ -2271,17 +2286,18 @@ async function first(conn, that, p, env, skip) {
   if (whereHook) {
     where.push(...where2column(Where.parse(whereHook), fieldColumns));
   }
-  const list = table && typeof table === 'object' ? await table.find(env, conn, columns, {
+  /** @type {SelectItem[]} */
+  const selects = [{
+    table: typeof table === 'string' ? table : '',
+    columns,
     where,
     limit: 1,
-    sort: sort?.length ? sort2column(sort, fieldColumns) : getDefaultSort(columns),
-    select: select2column(columns, fieldColumns)
-  }) : await conn.find(env, table || '', columns, {
-    where,
-    limit: 1,
-    sort: sort?.length ? sort2column(sort, fieldColumns) : getDefaultSort(columns),
-    select: select2column(columns, fieldColumns)
-  });
+    sort: sort?.length ? sort2column(sort, fieldColumns) || [] : getDefaultSort(columns) || [],
+    select: select2column(columns, fieldColumns),
+    group: [],
+    having: []
+  }];
+  const list = table && typeof table === 'object' ? await table.select(env, conn, selects) : await conn.select(env, selects);
   const baseFieldSet = new Set(Object.keys(fieldColumns || columns));
   const [item] = await findSub(conn, list, tableFields, baseFieldSet, env);
   if (!item) {
@@ -2293,9 +2309,9 @@ async function first(conn, that, p, env, skip) {
   return p[Build](item, true, env);
 }
 
-/** @import { Environment, IConnection, Queryable } from '../types' */
+/** @import { Environment, Queryable, TableConnection } from '../types' */
 /**
- * @param {IConnection} conn
+ * @param {TableConnection} conn
  * @param {Queryable} queryable
  * @param {Record<string, any> | boolean | undefined} update
  * @param {Environment} env
@@ -2451,6 +2467,43 @@ function table2db(tables) {
   return allTables;
 }
 
+/** @import { Fields, Queryable, SelectItem } from '../types' */
+/**
+ * @template {Fields} T
+ * @param {Queryable<T>} queryable
+ * @returns {SelectItem[]}
+ */
+function toSelect(queryable) {
+  const [columns, fieldColumns, tableFields] = toColumns(queryable.fields);
+  const {
+    table
+  } = queryable;
+  const options = getOptions(queryable);
+  const {
+    offset,
+    limit
+  } = options;
+  const where = where2column(options.where, fieldColumns);
+  where.push(...getFixedValueWhere(columns));
+  const select = select2column(columns, fieldColumns, options.select);
+  const {
+    sort
+  } = options;
+  /** @type {SelectItem[]} */
+  const result = [{
+    table: typeof table === 'string' ? table : '',
+    columns,
+    offset,
+    limit,
+    where,
+    select,
+    sort: sort?.length ? sort2column(sort, fieldColumns) : getDefaultSort(columns),
+    group: options.group || [],
+    having: []
+  }];
+  return result;
+}
+
 /* eslint-disable max-lines */
 /* eslint-disable max-len */
 /**
@@ -2495,6 +2548,8 @@ class Connection {
   #env;
   /** @type {() => Promise<IConnection<E>>} */
   #getConnection;
+  /** @type {(t: TableConnect<E> | null | undefined) => Promise<TableConnection<E>>} */
+  #getTableConnection;
   /** @type {E?} */
   #baseTransaction;
   /**
@@ -2505,6 +2560,7 @@ class Connection {
   constructor(connection, transaction = null) {
     this.#baseTransaction = transaction;
     this.#getConnection = async () => connection;
+    this.#getTableConnection = async t => typeof t === 'function' ? t(await connection) : connection;
     this.#env = {
       isDevelopment,
       values,
@@ -2635,7 +2691,7 @@ class Connection {
     if (list.length !== 1) {
       const modelBuild = model[Build];
       const md = typeof modelBuild === 'function' ? modelBuild.bind(model) : undefined;
-      const conn = await this.#getConnection();
+      const conn = await this.#getTableConnection(model.connect);
       let setData = list;
       if (typeof beforeCreateMany === 'function') {
         // @ts-ignore
@@ -2651,7 +2707,7 @@ class Connection {
     if (typeof model[Create] !== 'function') {
       const modelBuild = model[Build];
       const md = typeof modelBuild === 'function' ? modelBuild.bind(model) : undefined;
-      const conn = await this.#getConnection();
+      const conn = await this.#getTableConnection(model.connect);
       let setData = data;
       if (typeof beforeCreate === 'function') {
         setData = (await beforeCreate.call(setData, this, model, setData)) || setData;
@@ -2666,7 +2722,7 @@ class Connection {
     const m = /** @type {Create} */model;
     const result = m[Create](this, data, async (data, that) => {
       let setData = data;
-      const conn = await this.#getConnection();
+      const conn = await this.#getTableConnection(model.connect);
       if (typeof beforeCreate === 'function') {
         setData = (await beforeCreate.call(that ?? setData, this, model, setData)) || setData;
       }
@@ -2688,9 +2744,10 @@ class Connection {
    */
   async search(sql, fields, skip) {
     const returnFields = Array.isArray(fields) ? fields : [];
-    const conn = await this.#getConnection();
+    const conn = await this.#getTableConnection(sql.connect);
+    const result = search(conn, this, sql, this.#env, returnFields, skip);
     // @ts-ignore
-    return search(conn, this, sql, this.#env, returnFields, skip);
+    return result;
   }
   /**
    *
@@ -2700,7 +2757,7 @@ class Connection {
    * @returns {Promise<T extends Build<infer R > ? R[] : T extends TableDefine<infer F> ? FieldValue<F>[] : never>}
    */
   async find(sql, skip) {
-    const conn = await this.#getConnection();
+    const conn = await this.#getTableConnection(sql.connect);
     const env = this.#env;
     /** @type {any} */
     const result = await search(conn, this, sql, env, true, skip);
@@ -2719,7 +2776,7 @@ class Connection {
    * @returns {Promise<T extends Build<infer R > ? R : T extends TableDefine<infer F> ? FieldValue<F> : never>}
    */
   async first(sql, skip) {
-    const conn = await this.#getConnection();
+    const conn = await this.#getTableConnection(sql.connect);
     return first(conn, this, sql, this.#env, skip);
   }
   /**
@@ -2738,12 +2795,13 @@ class Connection {
       afterUpdate
     } = model.hooks || {};
     if (typeof data[Save] !== 'function') {
-      const conn = await this.#getConnection();
+      const conn = await this.#getTableConnection(model.connect);
       if (newData) {
         let setData = newData;
         if (typeof beforeUpdate === 'function') {
+          const result = (await beforeUpdate.call(data, this, model, data, setData)) || setData;
           // @ts-ignore
-          setData = (await beforeUpdate.call(data, this, model, data, setData)) || setData;
+          setData = result;
         }
         // @ts-ignore
         const r = await updateData(conn, model, data, setData, this.#env, skip);
@@ -2771,7 +2829,7 @@ class Connection {
     const that = /** @type {Save}*/data;
     // @ts-ignore
     return that[Save](this, async (data, newData) => {
-      const conn = await this.#getConnection();
+      const conn = await this.#getTableConnection(model.connect);
       if (newData) {
         let setData = newData;
         if (typeof beforeUpdate === 'function') {
@@ -2809,7 +2867,7 @@ class Connection {
       afterDelete
     } = tableDef.hooks || {};
     if (typeof data[Destroy] !== 'function') {
-      const conn = await this.#getConnection();
+      const conn = await this.#getTableConnection(tableDef.connect);
       if (typeof beforeDelete === 'function') {
         // @ts-ignore
         await beforeDelete.call(data, this, tableDef, data, null);
@@ -2824,7 +2882,7 @@ class Connection {
     const that = /** @type {Destroy} */data;
     // @ts-ignore
     return that[Destroy](this, async data => {
-      const conn = await this.#getConnection();
+      const conn = await this.#getTableConnection(tableDef.connect);
       if (typeof beforeDelete === 'function') {
         await beforeDelete.call(that, this, tableDef, data, null);
       }
@@ -2855,7 +2913,7 @@ class Connection {
       ...value
     };
     if (typeof data[PseudoDestroy] !== 'function') {
-      const conn = await this.#getConnection();
+      const conn = await this.#getTableConnection(tableDef.connect);
       if (typeof beforeDelete === 'function') {
         // @ts-ignore
         await beforeDelete.call(data, this, tableDef, data, update);
@@ -2871,7 +2929,7 @@ class Connection {
     const that = /** @type {PseudoDestroy} */data;
     // @ts-ignore
     return that[PseudoDestroy](this, update, async data => {
-      const conn = await this.#getConnection();
+      const conn = await this.#getTableConnection(tableDef.connect);
       if (typeof beforeDelete === 'function') {
         await beforeDelete.call(that, this, tableDef, data, update);
       }
@@ -2927,7 +2985,7 @@ class Connection {
    * @returns {Promise<number>}
    */
   async destroyMany(queryable, update) {
-    const conn = await this.#getConnection();
+    const conn = await this.#getTableConnection(queryable.connect);
     if (update === false || !isPseudo(queryable)) {
       return deleteMany(conn, queryable, this.#env);
     }
@@ -3003,6 +3061,7 @@ class Connection {
    * @returns {Promise<T | T[]>}
    */
   async insert({
+    connect,
     table,
     fields
   }, data, keys, ignoreConflict) {
@@ -3025,7 +3084,7 @@ class Connection {
       insertKeys = Object.entries(columns).map(v => v[0]);
     }
     const ignore = Boolean(Array.isArray(keys) ? ignoreConflict : keys);
-    const conn = await this.#getConnection();
+    const conn = await this.#getTableConnection(connect);
     const result = table && typeof table === 'object' ? await table.insert(this.#env, conn, columns, insertValues, insertKeys, ignore) : await conn.insert(this.#env, table || '', columns, insertValues, insertKeys, ignore);
     const list = toFieldList(result, fieldColumns);
     // @ts-ignore
@@ -3125,6 +3184,7 @@ class Connection {
    * @returns {Promise<T | T[]>}
    */
   async upsert({
+    connect,
     table,
     fields
   }, data, keys, conflictKeys, conflictSet) {
@@ -3148,7 +3208,7 @@ class Connection {
       insertKeys = Object.entries(columns).map(v => v[0]);
     }
     const conflict = Array.isArray(conflictKeys) || conflictKeys === true ? conflictKeys : baseFields.filter(([, v]) => v.primary).sort(([, a], [, b]) => Number(a.primary) - Number(b.primary)).map(([v]) => v);
-    const conn = await this.#getConnection();
+    const conn = await this.#getTableConnection(connect);
     const result = table && typeof table === 'object' ? await table.upsert(this.#env, conn, columns, insertValues, insertKeys, conflict, set) : await conn.upsert(this.#env, table || '', columns, insertValues, insertKeys, conflict, set);
     const list = toFieldList(result, fieldColumns);
     // @ts-ignore
@@ -3162,11 +3222,12 @@ class Connection {
    * @returns {Promise<number>}
    */
   async update({
+    connect,
     table,
     fields
   }, update, where, skip) {
     const [columns, fieldColumns, tableFields] = toColumns(fields);
-    const conn = await this.#getConnection();
+    const conn = await this.#getTableConnection(connect);
     const whereColumns = where2column(where ? Where.parse(where) : [], fieldColumns);
     whereColumns.push(...getFixedValueWhere(columns));
     return table && typeof table === 'object' ? table.update(this.#env, conn, columns, await getSetValue$1(columns, fieldColumns, update, skip), whereColumns) : conn.update(this.#env, table || '', columns, await getSetValue$1(columns, fieldColumns, update, skip), whereColumns);
@@ -3181,11 +3242,12 @@ class Connection {
    * @returns {Promise<any[]>}
    */
   async updateReturn({
+    connect,
     table,
     fields
   }, update, returning, where, skip) {
     const [columns, fieldColumns, tableFields] = toColumns(fields);
-    const conn = await this.#getConnection();
+    const conn = await this.#getTableConnection(connect);
     const whereColumns = where2column(where ? Where.parse(where) : [], fieldColumns);
     whereColumns.push(...getFixedValueWhere(columns));
     const result = table && typeof table === 'object' ? await table.updateReturn(this.#env, conn, returning?.length ? field2column(returning, fieldColumns) : Object.keys(columns), columns, await getSetValue$1(columns, fieldColumns, update, skip), whereColumns) : await conn.updateReturn(this.#env, returning?.length ? field2column(returning, fieldColumns) : Object.keys(columns), table || '', columns, await getSetValue$1(columns, fieldColumns, update, skip), whereColumns);
@@ -3200,13 +3262,14 @@ class Connection {
    * @returns {Promise<number>}
    */
   async updateMany({
+    connect,
     table,
     fields
   }, pKeys, setKeys, list, skip) {
     const [columns, fieldColumns, tableFields] = toColumns(fields);
     const update = await getSetValue$1(columns, fieldColumns, null, skip);
     const [whereColumns, setColumns] = getKeys(columns, update, field2column(pKeys, fieldColumns), field2column(setKeys, fieldColumns));
-    const conn = await this.#getConnection();
+    const conn = await this.#getTableConnection(connect);
     return table && typeof table === 'object' ? table.updateMany(this.#env, conn, columns, update, whereColumns, setColumns, toColumnList(list, fieldColumns), []) : conn.updateMany(this.#env, table || '', columns, update, whereColumns, setColumns, list, []);
   }
   /**
@@ -3220,13 +3283,14 @@ class Connection {
    * @returns {Promise<any[]>}
    */
   async updateManyReturn({
+    connect,
     table,
     fields
   }, pKeys, setKeys, list, returning, skip) {
     const [columns, fieldColumns, tableFields] = toColumns(fields);
     const update = getSetValue$1(columns, fieldColumns, null, skip);
     const [whereColumns, setColumns] = getKeys(columns, update, field2column(pKeys, fieldColumns), field2column(setKeys, fieldColumns));
-    const conn = await this.#getConnection();
+    const conn = await this.#getTableConnection(connect);
     const result = table && typeof table === 'object' ? await table.updateManyReturn(this.#env, conn, columns, update, whereColumns, setColumns, toColumnList(list, fieldColumns), [], returning?.length ? field2column(returning, fieldColumns) : Object.keys(columns)) : await conn.updateManyReturn(this.#env, table || '', columns, update, whereColumns, setColumns, toColumnList(list, fieldColumns), [], returning?.length ? field2column(returning, fieldColumns) : Object.keys(columns));
     return toFieldList(result, fieldColumns);
   }
@@ -3236,11 +3300,12 @@ class Connection {
    * @returns {Promise<number>}
    */
   async delete({
+    connect,
     table,
     fields
   }, where) {
     const [columns, fieldColumns, tableFields] = toColumns(fields);
-    const conn = await this.#getConnection();
+    const conn = await this.#getTableConnection(connect);
     const whereColumns = where2column(where ? Where.parse(where) : [], fieldColumns);
     whereColumns.push(...getFixedValueWhere(columns));
     return table && typeof table === 'object' ? table.delete(this.#env, conn, columns, whereColumns) : conn.delete(this.#env, table || '', columns, whereColumns);
@@ -3253,11 +3318,12 @@ class Connection {
    * @returns {Promise<any[]>}
    */
   async deleteReturn({
+    connect,
     table,
     fields
   }, returning, where) {
     const [columns, fieldColumns, tableFields] = toColumns(fields);
-    const conn = await this.#getConnection();
+    const conn = await this.#getTableConnection(connect);
     const whereColumns = where2column(where ? Where.parse(where) : [], fieldColumns);
     whereColumns.push(...getFixedValueWhere(columns));
     const result = table && typeof table === 'object' ? await table.deleteReturn(this.#env, conn, returning?.length ? field2column(returning, fieldColumns) : Object.keys(columns), columns, whereColumns) : await conn.deleteReturn(this.#env, returning?.length ? field2column(returning, fieldColumns) : Object.keys(columns), table || '', columns, whereColumns);
@@ -3271,12 +3337,13 @@ class Connection {
   async count(queryable) {
     const [columns, fieldColumns, tableFields] = toColumns(queryable.fields);
     const {
+      connect,
       table
     } = queryable;
     const options = getOptions(queryable);
     const where = where2column(options.where, fieldColumns);
     where.push(...getFixedValueWhere(columns));
-    const conn = await this.#getConnection();
+    const conn = await this.#getTableConnection(connect);
     return table && typeof table === 'object' ? table.count(this.#env, conn, columns, where) : conn.count(this.#env, table || '', columns, where);
   }
   /**
@@ -3284,43 +3351,12 @@ class Connection {
    * @returns {Promise<any[]>}
    */
   async select(queryable) {
-    const [columns, fieldColumns, tableFields] = toColumns(queryable.fields);
     const {
       table
     } = queryable;
-    const options = getOptions(queryable);
-    const {
-      offset,
-      limit
-    } = options;
-    const where = where2column(options.where, fieldColumns);
-    where.push(...getFixedValueWhere(columns));
-    const conn = await this.#getConnection();
-    const select = select2column(columns, fieldColumns, options.select);
-    const {
-      sort
-    } = options;
-    const result = table && typeof table === 'object' ? await table.select(this.#env, conn, [{
-      table: '',
-      columns,
-      offset,
-      limit,
-      where,
-      select,
-      sort: sort?.length ? sort2column(sort, fieldColumns) : getDefaultSort(columns),
-      group: options.group || [],
-      having: []
-    }]) : await conn.select(this.#env, [{
-      table: table || '',
-      columns,
-      offset,
-      limit,
-      where,
-      select,
-      sort: sort?.length ? sort2column(sort, fieldColumns) : getDefaultSort(columns),
-      group: options.group || [],
-      having: []
-    }]);
+    const conn = await this.#getTableConnection(queryable.connect);
+    const selects = toSelect(queryable);
+    const result = table && typeof table === 'object' ? await table.select(this.#env, conn, selects) : await conn.select(this.#env, selects);
     return result;
   }
   /**
@@ -4747,7 +4783,7 @@ function coefficient(...value) {
   };
 }
 
-/** @import { Fields, Options, Queryable, Select, VirtualTable } from './types' */
+/** @import { Fields, Options, Queryable, Select, TableConnect, VirtualTable } from './types' */
 /** @import { WhereValue, Wheres } from './Where.mjs' */
 /**
  *
@@ -4802,6 +4838,7 @@ function selectFn(fn, select, newSelect) {
  * @template {Fields} T
  * @template {object} [TB=object]
  * @typedef {object} QueryOptions
+ * @property {TableConnect<any>?} [connect]
  * @property {string | VirtualTable} [table]
  * @property {T} fields
  * @property {string} [pseudo]
@@ -4812,7 +4849,7 @@ function selectFn(fn, select, newSelect) {
  * @template {object} [TB=object]
  * @implements {Queryable<T>}
  */
-class Query {
+class Query extends Subquery {
   /**
    * @template {Fields} F
    * @template {new (o: QueryOptions<F>) => Query<F>} T
@@ -4830,6 +4867,8 @@ class Query {
       pseudo
     });
   }
+  /** @readonly @type {TableConnect | null | undefined} */
+
   /** @readonly @type {string | VirtualTable | undefined} */
 
   /** @readonly @type {T} */
@@ -4847,12 +4886,17 @@ class Query {
   get options() {
     return this.#options;
   }
+  toSubquery() {
+    return toSelect(this);
+  }
   /**
    * @param {QueryOptions<T, TB> | Query<T, TB>} options
    * @param {boolean} [noBuild]
    */
   constructor(options, noBuild) {
+    super();
     if (options instanceof Query) {
+      this.connect = options.connect;
       this.table = options.table;
       this.fields = options.fields;
       this.pseudo = options.pseudo;
@@ -4864,11 +4908,13 @@ class Query {
       this.#primary = options.#primary;
     } else {
       const {
+        connect,
         table,
         fields,
         pseudo,
         build
       } = options;
+      this.connect = connect;
       this.table = table;
       this.fields = fields;
       this.pseudo = typeof pseudo === 'string' ? pseudo : '';