pqb 0.9.13 → 0.9.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pqb",
-  "version": "0.9.13",
+  "version": "0.9.15",
   "description": "Postgres query builder",
   "homepage": "https://orchid-orm.netlify.app/guide/query-builder-setup.html",
   "repository": {
@@ -56,7 +56,8 @@
     "typescript": "^4.7.4"
   },
   "scripts": {
-    "test": "jest",
+    "test": "jest --watch --verbose false",
+    "check": "jest",
     "test:ci": "jest --coverage --coverageReporters json-summary",
     "build": "rimraf ./dist/ && rollup -c --rollup.config"
   }

package/src/{columnSchema → columns}/array.ts

@@ -1,5 +1,5 @@
 import { ColumnData, ColumnType } from './columnType';
-import { Operators } from '../columnsOperators';
+import { Operators } from './operators';
 import { assignMethodsToClass } from './utils';
 import { arrayMethods } from './commonMethods';
 import { addCode, Code, columnCode } from './code';

package/src/{columnSchema → columns}/boolean.ts

@@ -1,5 +1,5 @@
 import { ColumnType } from './columnType';
-import { Operators } from '../columnsOperators';
+import { Operators } from './operators';
 import { Code, columnCode } from './code';
 
 // 1 byte, true or false

package/src/{columnSchema → columns}/columnType.test.ts

@@ -1,5 +1,5 @@
 import { ColumnType, instantiateColumn } from './columnType';
-import { Operators } from '../columnsOperators';
+import { Operators } from './operators';
 import {
   adapter,
   assertType,

package/src/{columnSchema → columns}/columnType.ts

@@ -1,4 +1,4 @@
-import { Operator, Operators } from '../columnsOperators';
+import { BaseOperators, Operator } from './operators';
 import { JSONTypeAny } from './json';
 import { ColumnsShape } from './columnsSchema';
 import { raw, RawExpression } from '../raw';
@@ -17,9 +17,10 @@ export type NullableColumn<T extends ColumnType> = Omit<
   type: T['type'] | null;
   inputType: T['inputType'] | null;
   isNullable: true;
-  operators: Omit<T['operators'], 'equals' | 'not'> & {
-    equals: Operator<T['type'] | null>;
-    not: Operator<T['type'] | null>;
+  operators: {
+    [K in keyof T['operators']]: K extends 'equals' | 'not'
+      ? Operator<T['type'] | null>
+      : T['operators'][K];
   };
 };
 
@@ -178,7 +179,7 @@ export const instantiateColumn = (
 
 export abstract class ColumnType<
   Type = unknown,
-  Ops extends Operators = Operators,
+  Ops extends BaseOperators = BaseOperators,
   InputType = Type,
 > {
   abstract dataType: string;
@@ -271,7 +272,7 @@ export abstract class ColumnType<
 
   as<
     T extends ColumnType,
-    C extends ColumnType<T['type'], Operators, T['inputType']>,
+    C extends ColumnType<T['type'], BaseOperators, T['inputType']>,
   >(this: T, column: C): C {
     return addColumnData(this, 'as', column) as unknown as C;
   }

package/src/{columnSchema → columns}/columnsSchema.ts

@@ -1,5 +1,5 @@
 import { ColumnInput, ColumnOutput, ColumnType } from './columnType';
-import { Operators } from '../columnsOperators';
+import { Operators } from './operators';
 import { SetOptional, SomeIsTrue, StringKey } from '../utils';
 
 export type ColumnsShape = Record<string, ColumnType>;

package/src/{columnSchema → columns}/dateTime.ts

@@ -1,5 +1,5 @@
 import { ColumnData, ColumnType } from './columnType';
-import { Operators } from '../columnsOperators';
+import { Operators } from './operators';
 import { joinTruthy } from '../utils';
 import { dateTypeMethods } from './commonMethods';
 import { assignMethodsToClass } from './utils';

package/src/{columnSchema → columns}/enum.ts

@@ -1,6 +1,7 @@
 import { ColumnType } from './columnType';
-import { Operators } from '../columnsOperators';
+import { Operators } from './operators';
 import { Code, columnCode } from './code';
+import { quoteFullColumn } from '../sql/common';
 
 export class EnumColumn<
   U extends string = string,
@@ -23,7 +24,7 @@ export class EnumColumn<
     );
   }
 
-  toSql() {
-    return this.enumName;
+  toSQL() {
+    return quoteFullColumn(this.enumName);
   }
 }

package/src/{columnSchema → columns}/json.ts

@@ -1,5 +1,5 @@
 import { ColumnData, ColumnType } from './columnType';
-import { Operators } from '../columnsOperators';
+import { Operators } from './operators';
 import {
   scalarTypes,
   array,

package/src/{columnSchema → columns}/number.ts

@@ -1,4 +1,4 @@
-import { Operators } from '../columnsOperators';
+import { Operators } from './operators';
 import { ColumnData, ColumnType } from './columnType';
 import { joinTruthy } from '../utils';
 import { assignMethodsToClass } from './utils';

package/src/{columnsOperators.test.ts → columns/operators.test.ts}

@@ -1,4 +1,4 @@
-import { db, expectSql, User } from './test-utils/test-utils';
+import { db, expectSql, User } from '../test-utils/test-utils';
 
 describe('operators', () => {
   describe('equals', () => {

package/src/{columnsOperators.ts → columns/operators.ts}

@@ -1,13 +1,13 @@
-import { Query } from './query';
-import { addValue } from './sql/common';
-import { getRaw, isRaw, RawExpression } from './raw';
+import { Query } from '../query';
+import { addValue } from '../sql/common';
+import { getRaw, isRaw, RawExpression } from '../raw';
 
 type Fn<T> = (key: string, value: T, values: unknown[]) => string;
 
 export type Operator<T> = Fn<T> & { type: T };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type Operators = Record<string, Operator<any>>;
+export type BaseOperators = Record<string, Operator<any>>;
 
 export const createOperator = <T>(fn: Fn<T>) => {
   return Object.assign(fn, { type: undefined as unknown as T });

package/src/{columnSchema → columns}/string.ts

@@ -1,5 +1,5 @@
 import { ColumnData, ColumnType } from './columnType';
-import { Operators } from '../columnsOperators';
+import { Operators } from './operators';
 import { joinTruthy, singleQuote } from '../utils';
 import { NumberBaseColumn } from './number';
 import { assignMethodsToClass } from './utils';

package/src/{columnSchema → columns}/virtual.ts

@@ -1,5 +1,5 @@
 import { ColumnType } from './columnType';
-import { Operators } from '../columnsOperators';
+import { Operators } from './operators';
 import { Query } from '../query';
 import { CreateCtx, UpdateCtx } from '../queryMethods';
 

package/src/db.ts

@@ -26,7 +26,7 @@ import {
   getTableData,
   DefaultColumnTypes,
   columnTypes,
-} from './columnSchema';
+} from './columns';
 import { applyMixins, pushOrNewArray, StringKey } from './utils';
 import { QueryError, QueryErrorName } from './errors';
 

package/src/errors.ts

@@ -1,4 +1,4 @@
-import { ColumnsShape } from './columnSchema';
+import { ColumnsShape } from './columns';
 
 export class PormError extends Error {}
 

package/src/index.ts

@@ -1,4 +1,4 @@
-export * from './columnSchema';
+export * from './columns';
 export * from './sql';
 export * from './adapter';
 export * from './raw';
@@ -10,4 +10,4 @@ export * from './utils';
 export * from './queryDataUtils';
 export * from './errors';
 export * from './relations';
-export * from './columnsOperators';
+export * from './columns/operators';

package/src/query.ts

@@ -13,7 +13,7 @@ import {
   ColumnsShape,
   ColumnType,
   ColumnTypesBase,
-} from './columnSchema';
+} from './columns';
 import { AliasOrTable, EmptyObject, Spread, StringKey } from './utils';
 import { RawExpression } from './raw';
 import { Db } from './db';

package/src/queryMethods/aggregate.ts

@@ -9,7 +9,7 @@ import {
   NullableColumn,
   NumberColumn,
   StringColumn,
-} from '../columnSchema';
+} from '../columns';
 import {
   BooleanExpression,
   CoalesceString,

package/src/queryMethods/create.ts

@@ -20,7 +20,7 @@ import { WhereArg } from './where';
 import { parseResult, queryMethodByReturnType } from './then';
 import { NotFoundError } from '../errors';
 import { RawExpression } from '../raw';
-import { VirtualColumn } from '../columnSchema';
+import { VirtualColumn } from '../columns';
 import { anyShape } from '../db';
 
 export type CreateData<

package/src/queryMethods/join.ts

@@ -13,7 +13,7 @@ import { RawExpression } from '../raw';
 import { WhereQueryBuilder } from './where';
 import { Relation, RelationsBase } from '../relations';
 import { QueryData } from '../sql';
-import { ColumnsShape } from '../columnSchema';
+import { ColumnsShape } from '../columns';
 import { StringKey } from '../utils';
 
 type WithSelectable<

package/src/queryMethods/json.test.ts

@@ -6,7 +6,7 @@ import {
   userData,
   useTestDatabase,
 } from '../test-utils/test-utils';
-import { columnTypes } from '../columnSchema';
+import { columnTypes } from '../columns';
 
 describe('json methods', () => {
   useTestDatabase();

package/src/queryMethods/json.ts

@@ -5,7 +5,7 @@ import {
   SetQueryReturnsValueOptional,
 } from '../query';
 import { pushQueryValue } from '../queryDataUtils';
-import { ColumnType, StringColumn } from '../columnSchema';
+import { ColumnType, StringColumn } from '../columns';
 import { JsonItem } from '../sql';
 import { raw } from '../raw';
 import { StringKey } from '../utils';

package/src/queryMethods/merge.test.ts

@@ -7,7 +7,7 @@ import {
   User,
 } from '../test-utils/test-utils';
 import { QueryReturnType } from '../query';
-import { IntegerColumn, TextColumn } from '../columnSchema';
+import { IntegerColumn, TextColumn } from '../columns';
 import { getValueKey } from './get';
 import { logParamToLogObject } from './log';
 import {

package/src/queryMethods/queryMethods.ts

@@ -30,7 +30,7 @@ import {
 } from '../sql';
 import { pushQueryArray, pushQueryValue } from '../queryDataUtils';
 import { Then } from './then';
-import { BooleanColumn } from '../columnSchema';
+import { BooleanColumn } from '../columns';
 import { Aggregate } from './aggregate';
 import { addParserForSelectItem, Select } from './select';
 import { From } from './from';

package/src/queryMethods/raw.test.ts

@@ -1,4 +1,4 @@
-import { ColumnType } from '../columnSchema';
+import { ColumnType } from '../columns';
 import { createDb } from '../db';
 import { adapter, db, expectSql, User } from '../test-utils/test-utils';
 

package/src/queryMethods/raw.ts

@@ -1,4 +1,4 @@
-import { ColumnType, ColumnTypesBase } from '../columnSchema';
+import { ColumnType, ColumnTypesBase } from '../columns';
 import { Query } from '../query';
 import { RawExpression } from '../raw';
 

package/src/queryMethods/select.test.ts

@@ -10,7 +10,7 @@ import {
   UserRecord,
   useTestDatabase,
 } from '../test-utils/test-utils';
-import { DateColumn } from '../columnSchema';
+import { DateColumn } from '../columns';
 
 const insertUserAndProfile = async () => {
   const id = await User.get('id').create(userData);

package/src/queryMethods/select.ts

@@ -13,7 +13,7 @@ import {
   ColumnsObject,
   NullableColumn,
   PluckResultColumnType,
-} from '../columnSchema';
+} from '../columns';
 import { RawExpression } from '../raw';
 import { pushQueryArray } from '../queryDataUtils';
 import { parseRecord } from './then';

package/src/queryMethods/update.ts

@@ -13,7 +13,7 @@ import { EmptyObject, MaybeArray, StringKey } from '../utils';
 import { CreateData } from './create';
 import { parseResult, queryMethodByReturnType } from './then';
 import { UpdateQueryData } from '../sql';
-import { ColumnsShape, VirtualColumn } from '../columnSchema';
+import { ColumnsShape, VirtualColumn } from '../columns';
 import { anyShape } from '../db';
 
 export type UpdateData<T extends Query> = {

package/src/queryMethods/where.ts

@@ -4,7 +4,7 @@ import { pushQueryArray, pushQueryValue } from '../queryDataUtils';
 import { getClonedQueryData, MaybeArray } from '../utils';
 import { JoinArgs, JoinCallback, JoinCallbackArg } from './join';
 import { RelationsBase } from '../relations';
-import { ColumnsShape } from '../columnSchema';
+import { ColumnsShape } from '../columns';
 import { RawExpression } from '../raw';
 
 export type WhereArg<T extends QueryBase> =

package/src/queryMethods/window.ts

@@ -1,5 +1,5 @@
 import { Query } from '../query';
-import { ColumnType, IntegerColumn } from '../columnSchema';
+import { ColumnType, IntegerColumn } from '../columns';
 import { SelectAgg, WindowFunctionOptions } from './aggregate';
 import { pushQueryValue } from '../queryDataUtils';
 import { addParserToQuery } from './select';

package/src/queryMethods/with.test.ts

@@ -5,7 +5,7 @@ import {
   expectSql,
   User,
 } from '../test-utils/test-utils';
-import { columnTypes } from '../columnSchema';
+import { columnTypes } from '../columns';
 
 describe('with', () => {
   const options: (

package/src/queryMethods/with.ts

@@ -1,5 +1,5 @@
 import { WithOptions } from '../sql';
-import { ColumnShapeOutput, ColumnsShape, ColumnTypes } from '../columnSchema';
+import { ColumnShapeOutput, ColumnsShape, ColumnTypes } from '../columns';
 import { isRaw, RawExpression } from '../raw';
 import { AddQueryWith, Query } from '../query';
 import { Db } from '../db';

package/src/raw.ts

@@ -1,4 +1,4 @@
-import { ColumnType } from './columnSchema/columnType';
+import { ColumnType } from './columns/columnType';
 import { emptyObject } from './utils';
 
 export type RawExpression<C extends ColumnType = ColumnType> = {

package/src/sql/data.ts

@@ -8,7 +8,7 @@ import {
 } from '../queryMethods';
 import { Adapter, QueryResult } from '../adapter';
 import { RelationQueryData, relationQueryKey } from '../relations';
-import { ColumnsShape } from '../columnSchema';
+import { ColumnsShape } from '../columns';
 import { toSqlCacheKey } from './toSql';
 import {
   HavingItem,

package/src/sql/having.ts

@@ -1,6 +1,6 @@
 import { AggregateItemOptions, HavingItem } from './types';
 import { getRaw, isRaw, RawExpression } from '../raw';
-import { Operator } from '../columnsOperators';
+import { Operator } from '../columns/operators';
 import { aggregateToSql } from './aggregate';
 import { QueryBase } from '../query';
 import { addValue, q } from './common';

package/src/sql/types.ts

@@ -1,6 +1,6 @@
 import { Query, QueryBase, QueryWithTable, SelectableBase } from '../query';
 import { RawExpression } from '../raw';
-import { ColumnType } from '../columnSchema';
+import { ColumnType } from '../columns';
 import { RelationQuery } from '../relations';
 import { Expression, MaybeArray } from '../utils';
 import { QueryData, SelectQueryData } from './data';

package/src/utils.ts

@@ -1,6 +1,6 @@
 import { cloneQueryArrays, QueryData, toSqlCacheKey } from './sql';
 import type { Query, Selectable } from './query';
-import type { ColumnOutput, ColumnType } from './columnSchema';
+import type { ColumnOutput, ColumnType } from './columns';
 import type { RawExpression } from './raw';
 export * from '../../common/utils';