pqb 0.10.6 → 0.10.7

package/dist/index.d.ts

@@ -3461,6 +3461,9 @@ declare abstract class VirtualColumn extends ColumnType<unknown, typeof Operator
     update?(q: Query, ctx: UpdateCtx, set: Record<string, unknown>): void;
 }
 
+declare class UnknownColumn extends VirtualColumn {
+}
+
 declare const codeToString: (code: Code, tabs: string, shift: string) => string;
 declare const columnsShapeToCode: (shape: ColumnsShape, tableData: TableData, t: string) => Code[];
 declare const primaryKeyToCode: (primaryKey: TableData.PrimaryKey, t: string) => string;
@@ -3468,9 +3471,11 @@ declare const indexToCode: (index: TableData.Index, t: string) => Code[];
 declare const foreignKeyToCode: (foreignKey: TableData.ForeignKey, t: string) => Code[];
 declare const foreignKeyArgsToCode: (foreignKey: TableData.ForeignKey) => Code[];
 declare const columnDefaultArgumentToCode: (t: string, value: unknown) => string;
+declare const rawToCode: (t: string, raw: RawExpression) => string;
 declare const columnForeignKeysToCode: (foreignKeys: ForeignKey<string, string[]>[]) => Code[];
 declare const foreignKeyArgumentToCode: (foreignKey: ForeignKey<string, string[]>) => Code[];
 declare const columnIndexesToCode: (indexes: Exclude<ColumnData['indexes'], undefined>) => Code[];
+declare const columnCheckToCode: (t: string, check: RawExpression) => string;
 declare const columnCode: (type: ColumnType, t: string, code: Code) => Code;
 
 declare const columnsByType: Record<string, new (...args: never[]) => ColumnType>;
@@ -3491,4 +3496,4 @@ declare const setQueryObjectValue: <T extends {
     query: QueryData;
 }>(q: T, object: string, key: string, value: unknown) => T;
 
-export { Adapter, AdapterOptions, AddQueryJoinedTable, AddQuerySelect, AddQueryWith, AfterCallback, Aggregate, Aggregate1ArgumentTypes, AggregateArg, AggregateItem, AggregateItemArg, AggregateItemOptions, AggregateOptions, AliasOrTable, ArrayColumn, ArrayData, ArrayOfColumnsObjects, BaseRelation, BeforeCallback, BelongsToRelation, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanExpression, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfo, ColumnInfoMethods, ColumnInfoQueryData, ColumnNameOfTable, ColumnOperators, ColumnParser, ColumnType, ColumnTypes, ColumnsObject, ColumnsParsers, ColumnsShape, CommonQueryData, CopyOptions, CopyQueryData, Create, CreateCtx, CreateData, CreateMethodsNames, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeWithTimeZoneBaseClass, Db, DbOptions, DbResult, DbTableOptions, DecimalBaseColumn, DecimalColumn, DefaultColumnTypes, Delete, DeleteMethodsNames, DeleteQueryData, DoublePrecisionColumn, DropMode, EnumColumn, Expression, ExpressionOfType, ExpressionOutput, For, ForeignKey, ForeignKeyOptions, ForeignKeyTable, ForeignKeyTableWithColumns, From, FromArgs, FromResult, GetArg, HasAndBelongsToManyRelation, HasManyRelation, HasOneRelation, Having, HavingArg, HavingItem, IndexColumnOptions, IndexOptions, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, JSONTypes, Join, JoinArgs, JoinCallback, JoinCallbackArg, JoinItem, JoinResult, JoinedTablesBase, Json, JsonItem, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumn, NumberColumnData, NumberExpression, OnConflictItem, OnConflictMergeUpdate, OnConflictQueryBuilder, OnQueryBuilder, Operators, OrchidInternalError, OrderArg, OrderItem, PathColumn, PluckResultColumnType, PointColumn, PolygonColumn, PormError, Query, QueryArraysResult, QueryBase, QueryCallbacks, QueryData, QueryError, QueryErrorName, QueryGet, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMethods, QueryResult, QueryReturnType, QueryReturnsAll, QuerySelectAll, QueryThen, QueryUpsertOrCreate, QueryWithTable, RawMethods, RealColumn, Relation, RelationQuery, RelationQueryBase, RelationQueryData, RelationsBase, Select, SelectAgg, SelectArg, SelectFunctionItem, SelectItem, SelectQueryData, Selectable, SelectableBase, SelectableFromShape, SerialColumn, SerialColumnData, SetQueryJoinedTables, SetQueryReturns, SetQueryReturnsAll, SetQueryReturnsColumnInfo, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValue, SetQueryReturnsValueOptional, SetQueryReturnsVoid, SetQueryTableAlias, SetQueryWindows, SetQueryWith, SingleColumnIndexOptions, SmallIntColumn, SmallSerialColumn, SortDir, Sql, StringColumn, StringExpression, TableData, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimeInterval, TimeWithTimeZoneColumn, TimestampColumn, TimestampWithTimeZoneColumn, ToSqlCtx, ToSqlOptions, Transaction, TransactionAdapter, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, Update, UpdateCtx, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdatedAtDataInjector, UpsertData, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowFunctionOptions, WindowItem, With, WithDataBase, WithDataItem, WithItem, WithOptions, XMLColumn, addOr, addOrNot, addParserForRawExpression, addParserForSelectItem, addParserToQuery, addQueryOn, addQueryOrOn, addWhere, addWhereIn, addWhereNot, aggregate1FunctionNames, anyShape, checkIfASimpleQuery, cloneQueryArrays, codeToString, columnCode, columnDefaultArgumentToCode, columnForeignKeysToCode, columnIndexesToCode, columnTypes, utils as columnUtils, columnsByType, columnsShapeToCode, createDb, defaultsKey, foreignKeyArgsToCode, foreignKeyArgumentToCode, foreignKeyToCode, getClonedQueryData, getColumnTypes, getQueryAs, getRaw, getShapeFromSelect, getTableData, getValueKey, handleResult, indexToCode, instantiateColumn, isQueryReturnsAll, isRequiredRelationKey, jsonTypes, logColors, logParamToLogObject, makeRegexToFindInSql, makeSql, newTableData, parseRecord, parseResult, primaryKeyToCode, processSelectArg, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryMethodByReturnType, queryTypeWithLimitOne, quote, quoteString, relationQueryKey, resetTableData, setQueryObjectValue, toSql, toSqlCacheKey };
+export { Adapter, AdapterOptions, AddQueryJoinedTable, AddQuerySelect, AddQueryWith, AfterCallback, Aggregate, Aggregate1ArgumentTypes, AggregateArg, AggregateItem, AggregateItemArg, AggregateItemOptions, AggregateOptions, AliasOrTable, ArrayColumn, ArrayData, ArrayOfColumnsObjects, BaseRelation, BeforeCallback, BelongsToRelation, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanExpression, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfo, ColumnInfoMethods, ColumnInfoQueryData, ColumnNameOfTable, ColumnOperators, ColumnParser, ColumnType, ColumnTypes, ColumnsObject, ColumnsParsers, ColumnsShape, CommonQueryData, CopyOptions, CopyQueryData, Create, CreateCtx, CreateData, CreateMethodsNames, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeWithTimeZoneBaseClass, Db, DbOptions, DbResult, DbTableOptions, DecimalBaseColumn, DecimalColumn, DefaultColumnTypes, Delete, DeleteMethodsNames, DeleteQueryData, DoublePrecisionColumn, DropMode, EnumColumn, Expression, ExpressionOfType, ExpressionOutput, For, ForeignKey, ForeignKeyOptions, ForeignKeyTable, ForeignKeyTableWithColumns, From, FromArgs, FromResult, GetArg, HasAndBelongsToManyRelation, HasManyRelation, HasOneRelation, Having, HavingArg, HavingItem, IndexColumnOptions, IndexOptions, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, JSONTypes, Join, JoinArgs, JoinCallback, JoinCallbackArg, JoinItem, JoinResult, JoinedTablesBase, Json, JsonItem, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumn, NumberColumnData, NumberExpression, OnConflictItem, OnConflictMergeUpdate, OnConflictQueryBuilder, OnQueryBuilder, Operators, OrchidInternalError, OrderArg, OrderItem, PathColumn, PluckResultColumnType, PointColumn, PolygonColumn, PormError, Query, QueryArraysResult, QueryBase, QueryCallbacks, QueryData, QueryError, QueryErrorName, QueryGet, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMethods, QueryResult, QueryReturnType, QueryReturnsAll, QuerySelectAll, QueryThen, QueryUpsertOrCreate, QueryWithTable, RawMethods, RealColumn, Relation, RelationQuery, RelationQueryBase, RelationQueryData, RelationsBase, Select, SelectAgg, SelectArg, SelectFunctionItem, SelectItem, SelectQueryData, Selectable, SelectableBase, SelectableFromShape, SerialColumn, SerialColumnData, SetQueryJoinedTables, SetQueryReturns, SetQueryReturnsAll, SetQueryReturnsColumnInfo, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValue, SetQueryReturnsValueOptional, SetQueryReturnsVoid, SetQueryTableAlias, SetQueryWindows, SetQueryWith, SingleColumnIndexOptions, SmallIntColumn, SmallSerialColumn, SortDir, Sql, StringColumn, StringExpression, TableData, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimeInterval, TimeWithTimeZoneColumn, TimestampColumn, TimestampWithTimeZoneColumn, ToSqlCtx, ToSqlOptions, Transaction, TransactionAdapter, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UnknownColumn, Update, UpdateCtx, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdatedAtDataInjector, UpsertData, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowFunctionOptions, WindowItem, With, WithDataBase, WithDataItem, WithItem, WithOptions, XMLColumn, addOr, addOrNot, addParserForRawExpression, addParserForSelectItem, addParserToQuery, addQueryOn, addQueryOrOn, addWhere, addWhereIn, addWhereNot, aggregate1FunctionNames, anyShape, checkIfASimpleQuery, cloneQueryArrays, codeToString, columnCheckToCode, columnCode, columnDefaultArgumentToCode, columnForeignKeysToCode, columnIndexesToCode, columnTypes, utils as columnUtils, columnsByType, columnsShapeToCode, createDb, defaultsKey, foreignKeyArgsToCode, foreignKeyArgumentToCode, foreignKeyToCode, getClonedQueryData, getColumnTypes, getQueryAs, getRaw, getShapeFromSelect, getTableData, getValueKey, handleResult, indexToCode, instantiateColumn, isQueryReturnsAll, isRequiredRelationKey, jsonTypes, logColors, logParamToLogObject, makeRegexToFindInSql, makeSql, newTableData, parseRecord, parseResult, primaryKeyToCode, processSelectArg, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryMethodByReturnType, queryTypeWithLimitOne, quote, quoteString, rawToCode, relationQueryKey, resetTableData, setQueryObjectValue, toSql, toSqlCacheKey };

package/dist/index.js

@@ -666,14 +666,17 @@ const foreignKeyArgsToCode = (foreignKey) => {
 };
 const columnDefaultArgumentToCode = (t, value) => {
   if (typeof value === "object" && value && orchidCore.isRaw(value)) {
-    const values = value.__values;
-    return `${t}.raw(${orchidCore.singleQuote(value.__raw)}${values ? `, ${JSON.stringify(values)}` : ""})`;
+    return rawToCode(t, value);
   } else if (typeof value === "string") {
     return orchidCore.singleQuote(value);
   } else {
     return JSON.stringify(value);
   }
 };
+const rawToCode = (t, raw) => {
+  const values = raw.__values;
+  return `${t}.raw(${orchidCore.singleQuote(raw.__raw)}${values ? `, ${JSON.stringify(values)}` : ""})`;
+};
 const columnForeignKeysToCode = (foreignKeys) => {
   const code = [];
   for (const foreignKey of foreignKeys) {
@@ -744,6 +747,9 @@ const columnIndexesToCode = (indexes) => {
   }
   return code;
 };
+const columnCheckToCode = (t, check) => {
+  return `.check(${rawToCode(t, check)})`;
+};
 const columnCode = (type, t, code) => {
   code = orchidCore.toArray(code);
   let prepend = `${t}.`;
@@ -786,6 +792,9 @@ const columnCode = (type, t, code) => {
   }
   if (type.data.comment)
     orchidCore.addCode(code, `.comment(${orchidCore.singleQuote(type.data.comment)})`);
+  if (type.data.check) {
+    orchidCore.addCode(code, columnCheckToCode(t, type.data.check));
+  }
   const { validationDefault } = type.data;
   if (validationDefault) {
     orchidCore.addCode(
@@ -3235,6 +3244,9 @@ class VirtualColumn extends ColumnType {
   }
 }
 
+class UnknownColumn extends VirtualColumn {
+}
+
 const columnsByType = {
   bool: BooleanColumn,
   boolean: BooleanColumn,
@@ -3468,9 +3480,6 @@ class QueryGet {
   }
 }
 
-class UnknownColumn extends VirtualColumn {
-}
-
 const queryMethodByReturnType = {
   all: "query",
   rows: "arrays",
@@ -6144,6 +6153,7 @@ exports.TsVectorColumn = TsVectorColumn;
 exports.UUIDColumn = UUIDColumn;
 exports.UnhandledTypeError = UnhandledTypeError;
 exports.Union = Union;
+exports.UnknownColumn = UnknownColumn;
 exports.Update = Update;
 exports.VarCharColumn = VarCharColumn;
 exports.VirtualColumn = VirtualColumn;
@@ -6166,6 +6176,7 @@ exports.anyShape = anyShape;
 exports.checkIfASimpleQuery = checkIfASimpleQuery;
 exports.cloneQueryArrays = cloneQueryArrays;
 exports.codeToString = codeToString;
+exports.columnCheckToCode = columnCheckToCode;
 exports.columnCode = columnCode;
 exports.columnDefaultArgumentToCode = columnDefaultArgumentToCode;
 exports.columnForeignKeysToCode = columnForeignKeysToCode;
@@ -6209,6 +6220,7 @@ exports.queryMethodByReturnType = queryMethodByReturnType;
 exports.queryTypeWithLimitOne = queryTypeWithLimitOne;
 exports.quote = quote;
 exports.quoteString = quoteString;
+exports.rawToCode = rawToCode;
 exports.relationQueryKey = relationQueryKey;
 exports.resetTableData = resetTableData;
 exports.setQueryObjectValue = setQueryObjectValue;