taon-type-sql 21.0.22 → 21.0.24

package/lib-prod/builder/column/boolean-column.ts

@@ -1,19 +0,0 @@
-import QueryTable from "../query-table";
-import NumberColumn from "./number-column";
-import ValueColumn from "./value-column";
-import {ColumnModifier, ColumnName} from "../helpers/internal-types";
-
-
-export default class BooleanColumn<Table extends QueryTable<any, any>> extends ValueColumn<Table, boolean> {
-
-    protected _type = 'boolean';
-
-    constructor(table: Table, name: ColumnName, modifiers: ColumnModifier[] = []) {
-        super(table, name, modifiers);
-    }
-
-    count(): NumberColumn<Table> {
-        return new NumberColumn(this._table, this._name, this._modifiers.concat({ name: 'count' }));
-    }
-
-}

package/lib-prod/builder/column/comparable-column.ts

@@ -1,56 +0,0 @@
-import QueryColumnCondition from "../condition/query-column-condition";
-import QueryTable from "../query-table";
-import ValueColumn from "./value-column";
-import {ColumnModifier, ColumnName} from "../helpers/internal-types";
-
-
-abstract class ComparableColumn<Table extends QueryTable<any, any>, T> extends ValueColumn<Table, T> {
-
-    constructor(table: Table, name: ColumnName, modifiers: ColumnModifier[] = []) {
-        super(table, name, modifiers);
-    }
-
-    lt(value: T) {
-        return new QueryColumnCondition<Table, T>(this, 'lt', value);
-    }
-
-    gt(value: T) {
-        return new QueryColumnCondition<Table, T>(this, 'gt', value);
-    }
-
-    lte(value: T) {
-        return new QueryColumnCondition<Table, T>(this, 'lte', value);
-    }
-
-    gte(value: T) {
-        return new QueryColumnCondition<Table, T>(this, 'gte', value);
-    }
-
-    in(values: T[]) {
-        return new QueryColumnCondition<Table, T>(this, 'in', ...values);
-    }
-
-    notIn(values: T[]) {
-        return new QueryColumnCondition<Table, T>(this, 'not-in', ...values);
-    }
-
-    between(value1: T, value2: T) {
-        return new QueryColumnCondition<Table, T>(this, 'between', value1, value2);
-    }
-
-    notBetween(value1: T, value2: T) {
-        return new QueryColumnCondition<Table, T>(this, 'not-between', value1, value2);
-    }
-
-    // min/max exists for text columns too, not just numeric and date
-
-    min(): this {
-        return new (<any>this.constructor)(this._table, this._name, this._modifiers.concat({ name: 'min' }));
-    }
-
-    max(): this {
-        return new (<any>this.constructor)(this._table, this._name, this._modifiers.concat({ name: 'max' }));
-    }
-}
-
-export default ComparableColumn;

package/lib-prod/builder/column/date-column.ts

@@ -1,19 +0,0 @@
-import QueryTable from "../query-table";
-import ComparableColumn from "./comparable-column";
-import NumberColumn from "./number-column";
-import {ColumnModifier, ColumnName} from "../helpers/internal-types";
-
-
-export default class DateColumn<Table extends QueryTable<any, any>> extends ComparableColumn<Table, Date> {
-
-    protected _type = 'date';
-
-    constructor(table: Table, name: ColumnName, modifiers: ColumnModifier[] = []) {
-        super(table, name, modifiers);
-    }
-
-    count(): NumberColumn<Table> {
-        return new NumberColumn(this._table, this._name, this._modifiers.concat({ name: 'count' }));
-    }
-
-}

package/lib-prod/builder/column/number-column.ts

@@ -1,25 +0,0 @@
-import QueryTable from "../query-table";
-import ComparableColumn from "./comparable-column";
-import {ColumnModifier, ColumnName} from "../helpers/internal-types";
-
-
-export default class NumberColumn<Table extends QueryTable<any, any>> extends ComparableColumn<Table, number> {
-
-    protected _type = 'number';
-
-    constructor(table: Table, name: ColumnName, modifiers: ColumnModifier[] = []) {
-        super(table, name, modifiers);
-    }
-
-    count(): NumberColumn<Table> {
-        return new NumberColumn(this._table, this._name, this._modifiers.concat({ name: 'count' }));
-    }
-
-    sum(): NumberColumn<Table> {
-        return new NumberColumn<Table>(this._table, this._name, this._modifiers.concat({ name: 'sum' }));
-    }
-
-    avg(): NumberColumn<Table> {
-        return new NumberColumn<Table>(this._table, this._name, this._modifiers.concat({ name: 'avg' }));
-    }
-}

package/lib-prod/builder/column/query-column.ts

@@ -1,34 +0,0 @@
-import QueryTable from "../query-table";
-import NumberColumn from "./number-column";
-import GenericsHelper from "../helpers/generics-helper";
-import QueryColumnCondition from "../condition/query-column-condition";
-import {ColumnModifier, ColumnName} from "../helpers/internal-types";
-
-
-abstract class QueryColumn<Table extends QueryTable<any, any>, T> {
-
-    protected _$type: GenericsHelper<T>;
-    protected _type: string;
-
-    constructor(
-        protected _table: Table,
-        protected _name: ColumnName,
-        protected _modifiers: ColumnModifier[] = []
-    ) {}
-
-    abstract count(): NumberColumn<Table>; // TODO I had to copy-paste the implementation to every child class to avoid a circular dependency
-
-    as(alias: string): this {
-        return new (<any>this.constructor)(this._table, this._name, this._modifiers.concat({ name: 'as', params: alias }));
-    }
-
-    isNull() {
-        return new QueryColumnCondition<Table, T>(this, 'is-null');
-    }
-
-    isNotNull() {
-        return new QueryColumnCondition<Table, T>(this, 'is-not-null');
-    }
-}
-
-export default QueryColumn;

package/lib-prod/builder/column/string-column.ts

@@ -1,47 +0,0 @@
-import QueryTable from "../query-table";
-import ComparableColumn from "./comparable-column";
-import NumberColumn from "./number-column";
-import QueryColumnCondition from "../condition/query-column-condition";
-import {ColumnModifier, ColumnName} from "../helpers/internal-types";
-
-
-export default class StringColumn<Table extends QueryTable<any, any>> extends ComparableColumn<Table, string> {
-
-    protected _type = 'string';
-
-    constructor(table: Table, name: ColumnName, modifiers: ColumnModifier[] = []) {
-        super(table, name, modifiers);
-    }
-
-    count(): NumberColumn<Table> {
-        return new NumberColumn(this._table, this._name, this._modifiers.concat({ name: 'count' }));
-    }
-
-    lower(): this {
-        return new (<any>this.constructor)(this._table, this._name, this._modifiers.concat({ name: 'lower' }));
-    }
-
-    upper(): this {
-        return new (<any>this.constructor)(this._table, this._name, this._modifiers.concat({ name: 'upper' }));
-    }
-
-    contains(value: string) {
-        return this.like('%' + value + '%');
-    }
-
-    startsWith(value: string) {
-        return this.like(value + '%');
-    }
-
-    endsWith(value: string) {
-        return this.like('%' + value);
-    }
-
-    like(value: string) {
-        return new QueryColumnCondition<Table, string>(this, 'like', value);
-    }
-
-    notLike(value: string) {
-        return new QueryColumnCondition<Table, string>(this, 'not-like', value);
-    }
-}

package/lib-prod/builder/column/value-column.ts

@@ -1,39 +0,0 @@
-import QueryColumnCondition from "../condition/query-column-condition";
-import QueryOrdering from "../other/query-ordering";
-import QueryTable from "../query-table";
-import QueryColumn from "./query-column";
-import QueryCondition from "../condition/query-condition";
-import QueryJoinCondition from "../condition/query-join-condition";
-import {ColumnModifier, ColumnName} from "../helpers/internal-types";
-
-
-abstract class ValueColumn<Table extends QueryTable<any, any>, T> extends QueryColumn<Table, T> {
-
-    constructor(table: Table, name: ColumnName, modifiers: ColumnModifier[] = []) {
-        super(table, name, modifiers);
-    }
-
-    asc() {
-        return new QueryOrdering<Table>(this, 'ASC');
-    }
-
-    desc() {
-        return new QueryOrdering<Table>(this, 'DESC');
-    }
-
-    eq<Table2 extends QueryTable<any, any>>(value: QueryColumn<Table2, T>): QueryJoinCondition<Table, Table2, T>;
-    eq(value: T): QueryColumnCondition<Table, T>;
-    eq<Table2 extends QueryTable<any, any>>(value: any): QueryCondition<any> {
-        if (value instanceof QueryColumn) {
-            return new QueryJoinCondition<Table, Table2, T>(this, 'eq', value);
-        } else {
-            return new QueryColumnCondition<Table, T>(this, 'eq', value);
-        }
-    }
-
-    ne(value: T) {
-        return new QueryColumnCondition<Table, T>(this, 'ne', value);
-    }
-}
-
-export default ValueColumn;

package/lib-prod/builder/condition/query-column-condition.ts

@@ -1,28 +0,0 @@
-import QueryColumn from "../column/query-column";
-import QueryTable from "../query-table";
-import QueryCondition from "./query-condition";
-import QueryConditionChain from "./query-condition-chain";
-import {ConditionType} from "../helpers/internal-types";
-
-
-export default class QueryColumnCondition<Table extends QueryTable<any, any>, T> extends QueryCondition<Table> {
-
-    protected _column: QueryColumn<Table, T>;
-    protected _type: ConditionType;
-    protected _values: T[];
-
-    constructor(column: QueryColumn<Table, T>, type: ConditionType, ...values: T[]) {
-        super();
-        this._column = column;
-        this._type = type;
-        this._values = values;
-    }
-
-    and<Table2 extends QueryTable<any, any>>(condition: QueryCondition<Table2>): QueryConditionChain<Table | Table2> {
-        return new QueryConditionChain<Table | Table2>(this, condition, 'and');
-    }
-
-    or<Table2 extends QueryTable<any, any>>(condition: QueryCondition<Table2>): QueryConditionChain<Table | Table2> {
-        return new QueryConditionChain<Table | Table2>(this, condition, 'or');
-    }
-}

package/lib-prod/builder/condition/query-condition-chain.ts

@@ -1,42 +0,0 @@
-import QueryTable from "../query-table";
-import QueryCondition from "./query-condition";
-import GenericsHelper from "../helpers/generics-helper";
-import {ConditionChainType} from "../helpers/internal-types";
-
-
-export default class QueryConditionChain<Table extends QueryTable<any, any>> extends QueryCondition<Table> {
-
-    protected _$type: GenericsHelper<Table>;
-
-    protected _sibling: QueryCondition<any>;
-    protected _child: QueryCondition<any>;
-    protected _chainType: ConditionChainType;
-    protected _parenthesis = false;
-    protected _negation = false;
-
-    constructor(sibling: QueryCondition<any>, child: QueryCondition<any>, chainType: ConditionChainType) {
-        super();
-        this._sibling = sibling;
-        this._child = child;
-        this._chainType = chainType;
-    }
-
-    // TODO how to call this
-    $() {
-        this._parenthesis = true;
-        return this;
-    }
-
-    not() {
-        this._negation = true;
-        return this;
-    }
-
-    and<Table2 extends QueryTable<any, any>>(condition: QueryCondition<Table2>): QueryConditionChain<Table | Table2>  {
-        return new QueryConditionChain<Table | Table2>(this, condition, 'and');
-    }
-
-    or<Table2 extends QueryTable<any, any>>(condition: QueryCondition<Table2>): QueryConditionChain<Table | Table2>  {
-        return new QueryConditionChain<Table | Table2>(this, condition, 'or');
-    }
-}

package/lib-prod/builder/condition/query-condition.ts

@@ -1,13 +0,0 @@
-import QueryTable from "../query-table";
-import QueryConditionChain from "./query-condition-chain";
-
-// TODO I had to copy-paste the method implementations to every child class to avoid circular dependencies
-
-abstract class QueryCondition<Table extends QueryTable<any, any>> {
-
-    abstract and<Table2 extends QueryTable<any, any>>(condition: QueryCondition<Table2>): QueryConditionChain<Table | Table2>;
-
-    abstract or<Table2 extends QueryTable<any, any>>(condition: QueryCondition<Table2>): QueryConditionChain<Table | Table2>;
-}
-
-export default QueryCondition;

package/lib-prod/builder/condition/query-join-condition.ts

@@ -1,27 +0,0 @@
-import QueryColumn from "../column/query-column";
-import QueryTable from "../query-table";
-import QueryCondition from "./query-condition";
-import QueryConditionChain from "./query-condition-chain";
-
-
-export default class QueryJoinCondition<Table1 extends QueryTable<any, any>, Table2 extends QueryTable<any, any>, T> extends QueryCondition<Table1 | Table2> {
-
-    protected _column: QueryColumn<Table1, T>;
-    protected _type: string;
-    protected _otherColumn: QueryColumn<Table2, T>;
-
-    constructor(column: QueryColumn<Table1, T>, type: string, otherColumn: QueryColumn<Table2, T>) {
-        super();
-        this._column = column;
-        this._type = type;
-        this._otherColumn = otherColumn;
-    }
-
-    and<Table3 extends QueryTable<any, any>>(condition: QueryCondition<Table3>): QueryConditionChain<Table1 | Table2 | Table3>  {
-        return new QueryConditionChain<Table1 | Table2 | Table3>(this, condition, 'and');
-    }
-
-    or<Table3 extends QueryTable<any, any>>(condition: QueryCondition<Table3>): QueryConditionChain<Table1 | Table2 | Table3>  {
-        return new QueryConditionChain<Table1 | Table2 | Table3>(this, condition, 'or');
-    }
-}

package/lib-prod/builder/helpers/internal-types.ts

@@ -1,31 +0,0 @@
-// query:
-
-export type QueryAction = 'select' | 'insert' | 'update' | 'delete';
-
-// columns:
-
-export type ColumnModifierType = 'as' | 'count' | 'min' | 'min' | 'max' | 'sum' | 'avg' | 'lower' | 'upper';
-
-export interface ColumnModifier {
-    name: ColumnModifierType,
-    params?: any
-}
-
-export type ColumnName = string | { name: string, alias: string };
-
-export type ColumnType = 'boolean' | 'number' | 'string' | 'date'; // FIXME use this in the columns, but it causes type errors
-
-// conditions:
-
-export type ConditionChainType = 'or' | 'and';
-
-export type ConditionType = 'eq' | 'ne' | 'lt' | 'lte' | 'gt' | 'gte' | 'in' | 'not-in' | 'between' | 'not-between'
-    | 'like' | 'not-like' | 'is-null' | 'is-not-null';
-
-// joins:
-
-export type JoinType = 'inner' | 'left' | 'right' | 'full';
-
-// processor:
-
-export type QueryProcessor = (query: any) => Promise<any>;

package/lib-prod/builder/join/joined-tables-chain.ts

@@ -1,17 +0,0 @@
-import QueryTable from "../query-table";
-import QueryJoinCondition from "../condition/query-join-condition";
-import JoinedTables from "./joined-tables";
-import {JoinType} from "../helpers/internal-types";
-
-export default class JoinedTablesChain<Tables extends QueryTable<any, any>> {
-
-    constructor(
-        protected _table: QueryTable<any, any>,
-        protected _modifier: JoinType,
-        protected _parent: JoinedTables<Tables> | QueryTable<any, any>
-    ) {}
-
-    on(condition: QueryJoinCondition<Tables, Tables, any>): JoinedTables<Tables> {
-        return new JoinedTables(condition, this);
-    }
-}

package/lib-prod/builder/join/joined-tables.ts

@@ -1,28 +0,0 @@
-import QueryTable from "../query-table";
-import JoinedTablesChain from "./joined-tables-chain";
-import QueryJoinCondition from "../condition/query-join-condition";
-
-
-export default class JoinedTables<Tables extends QueryTable<any, any>> {
-
-    constructor(
-        protected _condition: QueryJoinCondition<Tables, Tables, any>,
-        protected _parent: JoinedTablesChain<Tables>
-    ) {}
-
-    innerJoin<JoinTable extends QueryTable<any, any>>(table: JoinTable): JoinedTablesChain<Tables | JoinTable> {
-        return new JoinedTablesChain(table, 'inner', this);
-    }
-
-    leftJoin<JoinTable extends QueryTable<any, any>>(table: JoinTable): JoinedTablesChain<Tables | JoinTable> {
-        return new JoinedTablesChain(table, 'left', this);
-    }
-
-    rightJoin<JoinTable extends QueryTable<any, any>>(table: JoinTable): JoinedTablesChain<Tables | JoinTable> {
-        return new JoinedTablesChain(table, 'right', this);
-    }
-
-    fullJoin<JoinTable extends QueryTable<any, any>>(table: JoinTable): JoinedTablesChain<Tables | JoinTable> {
-        return new JoinedTablesChain(table, 'full', this);
-    }
-}

package/lib-prod/builder/other/query-ordering.ts

@@ -1,26 +0,0 @@
-import QueryColumn from "../column/query-column";
-import QueryTable from "../query-table";
-
-
-export default class QueryOrdering<Table extends QueryTable<any, any>> {
-
-    protected _column: QueryColumn<Table, any>;
-    protected _direction: 'ASC' | 'DESC';
-    protected _nullsPosition: 'FIRST' | 'LAST';
-
-    constructor(column: QueryColumn<Table, any>, direction: 'ASC' | 'DESC') {
-        this._column = column;
-        this._direction = direction;
-    }
-
-    nullsFirst(): this {
-        this._nullsPosition = 'FIRST';
-        return this;
-    }
-
-    nullsLast(): this {
-        this._nullsPosition = 'LAST';
-        return this;
-    }
-
-}

package/lib-prod/builder/query/select-query.ts

@@ -1,68 +0,0 @@
-import QueryCondition from "../condition/query-condition";
-import QueryOrdering from "../other/query-ordering";
-import QueryTable from "../query-table";
-import QueryColumn from "../column/query-column";
-import { QueryProcessor, QueryAction } from "../helpers/internal-types";
-
-
-export default class SelectQuery<Entity, Table extends QueryTable<Entity, any>> {
-
-    constructor(
-        protected _queryProcessor: QueryProcessor,
-        protected _tables: Table[]
-    ) {}
-
-    protected _distinct = false;
-    protected _offset: number;
-    protected _limit: number;
-    protected _conditions: QueryCondition<Table>[] = [];
-    protected _groupBy: QueryColumn<Table, any>[] = [];
-    protected _having: QueryCondition<Table>[] = [];
-    protected _orderings: (QueryColumn<Table, any> | QueryOrdering<Table>)[] = [];
-    protected _columns: QueryColumn<Table, any>[] = [];
-    protected _action: QueryAction;
-
-    offset(offset: number): this {
-        this._offset = offset;
-        return this;
-    }
-
-    limit(limit: number): this {
-        this._limit = limit;
-        return this;
-    }
-
-    distinct(): this {
-        this._distinct = true;
-        return this;
-    }
-
-    where(...conditions: QueryCondition<Table>[]): this {
-        this._conditions = conditions;
-        return this;
-    }
-
-    groupBy(...columns: QueryColumn<Table, any>[]): this {
-        this._groupBy = columns;
-        return this;
-    }
-
-    having(...conditions: QueryCondition<Table>[]): this {
-        this._having = conditions;
-        return this;
-    }
-
-    orderBy(...orderings: (QueryColumn<Table, any> | QueryOrdering<Table>)[]): this {
-        this._orderings = orderings;
-        return this;
-    }
-
-    select(): Promise<Entity[]>
-    select<T>(column: QueryColumn<Table, T>): Promise<T[]>
-    select(...columns: QueryColumn<Table, any>[]): Promise<any[]>
-    select(...columns: QueryColumn<Table, any>[]): Promise<any[]> {
-        this._columns = columns;
-        this._action = 'select';
-        return this._queryProcessor(this);
-    }
-}

package/lib-prod/builder/query/table-condition-query.ts

@@ -1,35 +0,0 @@
-import QueryTable from "../query-table";
-import QueryCondition from "../condition/query-condition";
-import QueryColumn from "../column/query-column";
-import { QueryProcessor, QueryAction } from "../helpers/internal-types";
-
-
-export default class TableConditionQuery<Entity, Table extends QueryTable<Entity, any>> {
-
-    constructor(
-        protected _queryProcessor: QueryProcessor,
-        protected _table: Table,
-        protected _conditions: QueryCondition<Table>[]
-    ) {}
-
-    protected _columns: QueryColumn<Table, any>[] = [];
-    protected _action: QueryAction;
-    protected _entity: Entity | Partial<Entity>;
-
-    update(entity: Partial<Entity>): Promise<number> {
-        this._entity = entity;
-        this._action = 'update';
-        return this._queryProcessor(this);
-    }
-
-    delete(): Promise<number> {
-        this._action = 'delete';
-        return this._queryProcessor(this);
-    }
-
-    count(): Promise<number> {
-        this._columns = [this._table.$all.count()];
-        this._action = 'select';
-        return this._queryProcessor(this).then((rows: number[]) => rows[0]);
-    }
-}

package/lib-prod/builder/query/table-query.ts

@@ -1,72 +0,0 @@
-import QueryTable from "../query-table";
-import TableConditionQuery from "./table-condition-query";
-import QueryCondition from "../condition/query-condition";
-import ValueColumn from "../column/value-column";
-import QueryColumn from "../column/query-column";
-import { QueryProcessor, QueryAction } from "../helpers/internal-types";
-
-
-export default class TableQuery<Entity, Id, Table extends QueryTable<Entity, Id>> {
-
-    constructor(
-        protected _queryProcessor: QueryProcessor,
-        protected _table: Table
-    ) {}
-
-    protected _entity: Entity | Entity[] | Partial<Entity>;
-    protected _action: QueryAction;
-    protected _columns: QueryColumn<Table, any>[] = [];
-
-    where(...conditions: QueryCondition<Table>[]) {
-        return new TableConditionQuery<Entity, Table>(this._queryProcessor, this._table, conditions);
-    }
-
-    insert(entity: Entity): Promise<any> // returns the generated ID, but not other kinds of IDs, so the type is unknown (mysql limitations)
-    insert(entities: Entity[]): Promise<void>
-    insert(param: any): Promise<any> {
-        this._entity = param;
-        this._action = 'insert';
-        return this._queryProcessor(this);
-    }
-
-    deleteAll(): Promise<number> {
-        this._action = 'delete';
-        return this._queryProcessor(this);
-    }
-
-    updateAll(entity: Partial<Entity>): Promise<number> {
-        this._entity = entity;
-        this._action = 'update';
-        return this._queryProcessor(this);
-    }
-
-    countAll(): Promise<number> {
-        this._columns = [this._table.$all.count()];
-        this._action = 'select';
-        return this._queryProcessor(this).then((rows: any[]) => rows[0]);
-    }
-
-    delete(id: Id): Promise<boolean> {
-        return this._whereId(id).delete().then(count => count > 0);
-    }
-
-    update(id: Id, entity: Partial<Entity>): Promise<boolean> {
-        return this._whereId(id).update(entity).then(count => count > 0);
-    }
-
-    get(id: Id): Promise<Entity | undefined> {
-        let query = this._whereId(id);
-        return this._queryProcessor({ _action: 'select', ...query })
-            .then((rows: Entity[]) => rows[0]);
-    }
-
-    _whereId(id: Id): TableConditionQuery<Entity, Table> {
-        // TODO remove assertions if $id typing is fixed
-        let $id = (this._table as any).$id;
-        if ($id instanceof ValueColumn) {
-            return this.where($id.eq(id));
-        } else {
-            return this.where(...Object.keys($id).map(key => ((this._table as any)[key] as ValueColumn<Table, any>).eq((id as any)[key] as any)));
-        }
-    }
-}

package/lib-prod/builder/query-source.ts

@@ -1,25 +0,0 @@
-import QueryTable from './query-table';
-import SelectQuery from './query/select-query';
-import { QueryProcessor } from "./helpers/internal-types";
-import JoinedTables from "./join/joined-tables";
-import TableQuery from "./query/table-query";
-
-
-export default class QuerySource {
-
-    constructor(protected _queryProcessor: QueryProcessor) {}
-
-    from<Entity, Table1 extends QueryTable<Entity, any>>(table1: Table1 & QueryTable<Entity, any>): SelectQuery<Entity, Table1>
-    from<Tables extends QueryTable<any, any>>(tables: JoinedTables<Tables>): SelectQuery<any, Tables>
-    from<Table1 extends QueryTable<any, any>, Table2 extends QueryTable<any, any>>(table1: Table1, table2: Table2): SelectQuery<any, Table1 | Table2>
-    from<Table1 extends QueryTable<any, any>, Table2 extends QueryTable<any, any>, Table3 extends QueryTable<any, any>>(table1: Table1, table2: Table2, table3: Table3): SelectQuery<any, Table1 | Table2 | Table3>
-    from<Entity, Table1 extends QueryTable<any, any>, Table2 extends QueryTable<any, any>, Table3 extends QueryTable<any, any>>(table1: any, table2?: any, table3?: any) {
-        if (table3 != null) return new SelectQuery<any, Table1 | Table2 | Table3>(this._queryProcessor, [table1, table2, table3]);
-        else if (table2 != null) return new SelectQuery<any, Table1 | Table2>(this._queryProcessor, [table1, table2]);
-        return new SelectQuery<Entity, Table1>(this._queryProcessor, [table1]);
-    }
-
-    table<Entity, Id, Table extends QueryTable<Entity, Id>>(table: Table & QueryTable<Entity, Id>): TableQuery<Entity, Id, Table> {
-        return new TableQuery<Entity, Id, Table>(this._queryProcessor, table);
-    }
-}