pqb 0.66.8 → 0.67.1

package/dist/internal.d.ts

@@ -1,4 +1,4 @@
-import { Adapter, AdapterClass, AdapterConfigBase, AdapterParams, AfterCommitStandaloneHook, AfterHook, ArrayColumn, ArrayColumnValue, ArrayData, AsyncState, BaseNumberData, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Code, Codes, Column, ColumnFromDbParams, ColumnSchemaConfig, ColumnSchemaGetterColumns, ColumnSchemaGetterTableClass, ColumnToCodeCtx, ColumnTypeSchemaArg, ColumnsByType, ColumnsShape, ComputedColumnsFromOptions, ComputedOptionsConfig, ComputedOptionsFactory, CreateCtx, CreateData, CreateManyMethodsNames, CreateMethodsNames, CreateSelf, CustomTypeColumn, DateColumn, DateColumnData, DbDomainArg, DbExtension, DbOptions, DbResult, DbSharedOptions, DbSqlMethod, DbStructureDomainsMap, DbTableOptionScopes, DbTableOptions, DecimalColumn, DecimalColumnData, DefaultColumnTypes, DefaultPrivileges, DefaultSchemaConfig, DeleteMethodsNames, DomainColumn, DoublePrecisionColumn, DriverAdapter, DynamicRawSQL, EmptyObject, EmptyTuple, EnumColumn, Expression, FromArg, FromResult, GeneratorIgnore, HookSelectValue, InetColumn, IntegerColumn, IntervalColumn, IsQuery, IsolationLevel, JSONColumn, JSONTextColumn, JoinQueryMethod, JoinedShapes, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MaybeArray, MaybePromise, MergeQuery, MoneyColumn, NoPrimaryKeyOption, NonUniqDataItem, NumberColumnData, Operators, OperatorsArray, OperatorsJson, OperatorsOrdinalText, Ord, PathColumn, PickQueryInputType, PickQueryInternal, PickQueryQ, PickQueryRelations, PickQuerySelectableRelations, PickQueryShape, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryAfterHook, QueryArraysResult, QueryBeforeActionHook, QueryBeforeHook, QueryData, QueryHasWhere, QueryHookUtils, QueryHooks, QueryInternal, QueryLogObject, QueryLogOptions, QueryLogger, QueryManyTake, QueryManyTakeOptional, QueryOrExpression, QueryResult, QueryResultRow, QueryReturnType, QuerySchema, QueryScopes, RawSql, RawSqlBase, RealColumn, RecordKeyTrue, RecordOptionalString, RecordString, RecordStringOrNumber, RecordUnknown, RelationConfigBase, RelationJoinQuery, RelationsBase, Rls, RlsPolicy, SearchWeight, SelectableFromShape, SerialColumn, SerialColumnData, ShallowSimplify, ShapeColumnPrimaryKeys, ShapeUniqueColumns, SingleSql, SingleSqlItem, SmallIntColumn, SmallSerialColumn, Sql, SqlFn, SqlSessionState, StorageOptions, StringColumn, StringData, TableData, TableDataFn, TableDataInput, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TableDataMethods, TemplateLiteralArgs, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, Timestamps, TransactionAdapter, TransactionAdapterClass, TransactionOptions, TsQueryColumn, TsVectorColumn, UUIDColumn, UniqueConstraints, UniqueTableDataItem, UnknownColumn, UpdateData, UpsertData, UpsertThis, VarCharColumn, VirtualColumn, WhereArg, XMLColumn, _appendQuery, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnTypes, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteIdentifier, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, tableDataMethods, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry } from "./index.d.ts";
+import { Adapter, AdapterClass, AdapterConfigBase, AdapterParams, AdapterSchemaConfigOptions, AfterCommitStandaloneHook, AfterHook, ArrayColumn, ArrayColumnValue, ArrayData, AsyncState, BaseNumberData, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Code, Codes, Column, ColumnFromDbParams, ColumnSchemaConfig, ColumnSchemaGetterColumns, ColumnSchemaGetterTableClass, ColumnToCodeCtx, ColumnTypeSchemaArg, ColumnsByType, ColumnsShape, ComputedColumnsFromOptions, ComputedOptionsConfig, ComputedOptionsFactory, CreateCtx, CreateData, CreateManyMethodsNames, CreateMethodsNames, CreateSelf, CustomTypeColumn, DateColumn, DateColumnData, DbDomainArg, DbExtension, DbOptions, DbResult, DbSharedOptions, DbSqlMethod, DbStructureDomainsMap, DbTableOptionScopes, DbTableOptions, DecimalColumn, DecimalColumnData, DefaultColumnTypes, DefaultPrivileges, DefaultSchemaConfig, DeleteMethodsNames, DomainColumn, DoublePrecisionColumn, DriverAdapter, DynamicRawSQL, EmptyObject, EmptyTuple, EnumColumn, Expression, FromArg, FromResult, GeneratorIgnore, HookSelectValue, InetColumn, IntegerColumn, IntervalColumn, IsQuery, IsolationLevel, JSONColumn, JSONTextColumn, JoinQueryMethod, JoinedShapes, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MaybeArray, MaybePromise, MergeQuery, MoneyColumn, NoPrimaryKeyOption, NonUniqDataItem, NumberColumnData, Operators, OperatorsArray, OperatorsJson, OperatorsOrdinalText, Ord, PathColumn, PickQueryInputType, PickQueryInternal, PickQueryQ, PickQueryRelations, PickQuerySelectableRelations, PickQueryShape, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryAfterHook, QueryBeforeActionHook, QueryBeforeHook, QueryData, QueryHasWhere, QueryHookUtils, QueryHooks, QueryInternal, QueryLogObject, QueryLogOptions, QueryLogger, QueryManyTake, QueryManyTakeOptional, QueryOrExpression, QueryResult, QueryResultRow, QueryReturnType, QuerySchema, QueryScopes, RawSql, RawSqlBase, RealColumn, RecordKeyTrue, RecordOptionalString, RecordString, RecordStringOrNumber, RecordUnknown, RelationConfigBase, RelationJoinQuery, RelationsBase, Rls, RlsPolicy, SchemaConfigFnWithOptions, SearchWeight, SelectableFromShape, SerialColumn, SerialColumnData, ShallowSimplify, ShapeColumnPrimaryKeys, ShapeUniqueColumns, SingleSql, SingleSqlItem, SmallIntColumn, SmallSerialColumn, Sql, SqlFn, SqlSessionState, StorageOptions, StringColumn, StringData, TableData, TableDataFn, TableDataInput, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TableDataMethods, TemplateLiteralArgs, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, Timestamps, TransactionAdapter, TransactionAdapterClass, TransactionOptions, TsQueryColumn, TsVectorColumn, UUIDColumn, UniqueConstraints, UniqueTableDataItem, UnknownColumn, UpdateData, UpsertData, UpsertThis, VarCharColumn, VirtualColumn, WhereArg, XMLColumn, _appendQuery, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnTypes, getDateAsDateFn, getDateAsNumberFn, getDriverErrorCode, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, internalSchemaConfig, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteIdentifier, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, tableDataMethods, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry } from "./index.d.ts";
 declare namespace Grant {
   type Role = string | [string, ...string[]];
   type TablePrivilege = 'ALL' | 'SELECT' | 'INSERT' | 'UPDATE' | 'DELETE' | 'TRUNCATE' | 'REFERENCES' | 'TRIGGER' | 'MAINTAIN';
@@ -117,4 +117,4 @@ declare namespace Grant {
   }
 }
 declare abstract class OrchidOrmError extends Error {}
-export { type Adapter, AdapterClass, type AdapterConfigBase, type AdapterParams, type AfterCommitStandaloneHook, type AfterHook, ArrayColumn, type ArrayColumnValue, type ArrayData, type AsyncState, type BaseNumberData, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, type Code, type Codes, Column, type ColumnFromDbParams, type ColumnSchemaConfig, type ColumnSchemaGetterColumns, type ColumnSchemaGetterTableClass, type ColumnToCodeCtx, type ColumnTypeSchemaArg, type ColumnsByType, type ColumnsShape, type ComputedColumnsFromOptions, type ComputedOptionsConfig, type ComputedOptionsFactory, type CreateCtx, type CreateData, type CreateManyMethodsNames, type CreateMethodsNames, type CreateSelf, CustomTypeColumn, DateColumn, type DateColumnData, type DbDomainArg, type DbExtension, type DbOptions, type DbResult, type DbSharedOptions, type DbSqlMethod, type DbStructureDomainsMap, type DbTableOptionScopes, type DbTableOptions, DecimalColumn, type DecimalColumnData, type DefaultColumnTypes, type DefaultPrivileges, type DefaultSchemaConfig, type DeleteMethodsNames, DomainColumn, DoublePrecisionColumn, type DriverAdapter, DynamicRawSQL, type EmptyObject, type EmptyTuple, EnumColumn, Expression, type FromArg, type FromResult, type GeneratorIgnore, type Grant, type HookSelectValue, InetColumn, IntegerColumn, IntervalColumn, type IsQuery, type IsolationLevel, JSONColumn, JSONTextColumn, type JoinQueryMethod, type JoinedShapes, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, type MapTableScopesOption, type MaybeArray, type MaybePromise, type MergeQuery, MoneyColumn, type NoPrimaryKeyOption, type NonUniqDataItem, type NumberColumnData, Operators, type OperatorsArray, type OperatorsJson, type OperatorsOrdinalText, OrchidOrmError, type Ord, PathColumn, type PickQueryInputType, type PickQueryInternal, type PickQueryQ, type PickQueryRelations, type PickQuerySelectableRelations, type PickQueryShape, PointColumn, PolygonColumn, PostgisGeographyPointColumn, type QueryAfterHook, type QueryArraysResult, type QueryBeforeActionHook, type QueryBeforeHook, type QueryData, type QueryHasWhere, QueryHookUtils, QueryHooks, type QueryInternal, type QueryLogObject, type QueryLogOptions, type QueryLogger, type QueryManyTake, type QueryManyTakeOptional, type QueryOrExpression, type QueryResult, type QueryResultRow, type QueryReturnType, type QuerySchema, type QueryScopes, RawSql, type RawSqlBase, RealColumn, type RecordKeyTrue, type RecordOptionalString, type RecordString, type RecordStringOrNumber, type RecordUnknown, type RelationConfigBase, type RelationJoinQuery, type RelationsBase, type Rls, type RlsPolicy, type SearchWeight, type SelectableFromShape, SerialColumn, type SerialColumnData, type ShallowSimplify, type ShapeColumnPrimaryKeys, type ShapeUniqueColumns, type SingleSql, type SingleSqlItem, SmallIntColumn, SmallSerialColumn, type Sql, type SqlFn, type SqlSessionState, type StorageOptions, StringColumn, type StringData, type TableData, type TableDataFn, type TableDataInput, type TableDataItem, type TableDataItemsUniqueColumnTuples, type TableDataItemsUniqueColumns, type TableDataItemsUniqueConstraints, type TableDataMethods, type TemplateLiteralArgs, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, type Timestamps, type TransactionAdapter, TransactionAdapterClass, type TransactionOptions, TsQueryColumn, TsVectorColumn, UUIDColumn, type UniqueConstraints, type UniqueTableDataItem, UnknownColumn, type UpdateData, type UpsertData, type UpsertThis, VarCharColumn, VirtualColumn, type WhereArg, XMLColumn, _appendQuery, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnTypes, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteIdentifier, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, tableDataMethods, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry };
+export { type Adapter, AdapterClass, type AdapterConfigBase, type AdapterParams, type AdapterSchemaConfigOptions, type AfterCommitStandaloneHook, type AfterHook, ArrayColumn, type ArrayColumnValue, type ArrayData, type AsyncState, type BaseNumberData, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, type Code, type Codes, Column, type ColumnFromDbParams, type ColumnSchemaConfig, type ColumnSchemaGetterColumns, type ColumnSchemaGetterTableClass, type ColumnToCodeCtx, type ColumnTypeSchemaArg, type ColumnsByType, type ColumnsShape, type ComputedColumnsFromOptions, type ComputedOptionsConfig, type ComputedOptionsFactory, type CreateCtx, type CreateData, type CreateManyMethodsNames, type CreateMethodsNames, type CreateSelf, CustomTypeColumn, DateColumn, type DateColumnData, type DbDomainArg, type DbExtension, type DbOptions, type DbResult, type DbSharedOptions, type DbSqlMethod, type DbStructureDomainsMap, type DbTableOptionScopes, type DbTableOptions, DecimalColumn, type DecimalColumnData, type DefaultColumnTypes, type DefaultPrivileges, type DefaultSchemaConfig, type DeleteMethodsNames, DomainColumn, DoublePrecisionColumn, type DriverAdapter, DynamicRawSQL, type EmptyObject, type EmptyTuple, EnumColumn, Expression, type FromArg, type FromResult, type GeneratorIgnore, type Grant, type HookSelectValue, InetColumn, IntegerColumn, IntervalColumn, type IsQuery, type IsolationLevel, JSONColumn, JSONTextColumn, type JoinQueryMethod, type JoinedShapes, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, type MapTableScopesOption, type MaybeArray, type MaybePromise, type MergeQuery, MoneyColumn, type NoPrimaryKeyOption, type NonUniqDataItem, type NumberColumnData, Operators, type OperatorsArray, type OperatorsJson, type OperatorsOrdinalText, OrchidOrmError, type Ord, PathColumn, type PickQueryInputType, type PickQueryInternal, type PickQueryQ, type PickQueryRelations, type PickQuerySelectableRelations, type PickQueryShape, PointColumn, PolygonColumn, PostgisGeographyPointColumn, type QueryAfterHook, type QueryBeforeActionHook, type QueryBeforeHook, type QueryData, type QueryHasWhere, QueryHookUtils, QueryHooks, type QueryInternal, type QueryLogObject, type QueryLogOptions, type QueryLogger, type QueryManyTake, type QueryManyTakeOptional, type QueryOrExpression, type QueryResult, type QueryResultRow, type QueryReturnType, type QuerySchema, type QueryScopes, RawSql, type RawSqlBase, RealColumn, type RecordKeyTrue, type RecordOptionalString, type RecordString, type RecordStringOrNumber, type RecordUnknown, type RelationConfigBase, type RelationJoinQuery, type RelationsBase, type Rls, type RlsPolicy, type SchemaConfigFnWithOptions, type SearchWeight, type SelectableFromShape, SerialColumn, type SerialColumnData, type ShallowSimplify, type ShapeColumnPrimaryKeys, type ShapeUniqueColumns, type SingleSql, type SingleSqlItem, SmallIntColumn, SmallSerialColumn, type Sql, type SqlFn, type SqlSessionState, type StorageOptions, StringColumn, type StringData, type TableData, type TableDataFn, type TableDataInput, type TableDataItem, type TableDataItemsUniqueColumnTuples, type TableDataItemsUniqueColumns, type TableDataItemsUniqueConstraints, type TableDataMethods, type TemplateLiteralArgs, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, type Timestamps, type TransactionAdapter, TransactionAdapterClass, type TransactionOptions, TsQueryColumn, TsVectorColumn, UUIDColumn, type UniqueConstraints, type UniqueTableDataItem, UnknownColumn, type UpdateData, type UpsertData, type UpsertThis, VarCharColumn, VirtualColumn, type WhereArg, XMLColumn, _appendQuery, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnTypes, getDateAsDateFn, getDateAsNumberFn, getDriverErrorCode, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, internalSchemaConfig, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteIdentifier, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, tableDataMethods, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry };

package/dist/internal.js

@@ -656,6 +656,24 @@ Object.defineProperty(exports, "getColumnTypes", {
 		return src_index_ts.getColumnTypes;
 	}
 });
+Object.defineProperty(exports, "getDateAsDateFn", {
+	enumerable: true,
+	get: function() {
+		return src_index_ts.getDateAsDateFn;
+	}
+});
+Object.defineProperty(exports, "getDateAsNumberFn", {
+	enumerable: true,
+	get: function() {
+		return src_index_ts.getDateAsNumberFn;
+	}
+});
+Object.defineProperty(exports, "getDriverErrorCode", {
+	enumerable: true,
+	get: function() {
+		return src_index_ts.getDriverErrorCode;
+	}
+});
 Object.defineProperty(exports, "getFreeAlias", {
 	enumerable: true,
 	get: function() {
@@ -722,6 +740,12 @@ Object.defineProperty(exports, "indexInnerToCode", {
 		return src_index_ts.indexInnerToCode;
 	}
 });
+Object.defineProperty(exports, "internalSchemaConfig", {
+	enumerable: true,
+	get: function() {
+		return src_index_ts.internalSchemaConfig;
+	}
+});
 Object.defineProperty(exports, "isExpression", {
 	enumerable: true,
 	get: function() {

package/dist/internal.mjs

@@ -1,5 +1,5 @@
-import { AdapterClass, ArrayColumn, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Column, CustomTypeColumn, DateColumn, DecimalColumn, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, Expression, InetColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MoneyColumn, Operators, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryHookUtils, QueryHooks, RawSql, RealColumn, SerialColumn, SmallIntColumn, SmallSerialColumn, StringColumn, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, TransactionAdapterClass, TsQueryColumn, TsVectorColumn, UUIDColumn, UnknownColumn, VarCharColumn, VirtualColumn, XMLColumn, _appendQuery, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnTypes, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteIdentifier, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, tableDataMethods, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry } from "./index.mjs";
+import { AdapterClass, ArrayColumn, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Column, CustomTypeColumn, DateColumn, DecimalColumn, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, Expression, InetColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MoneyColumn, Operators, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryHookUtils, QueryHooks, RawSql, RealColumn, SerialColumn, SmallIntColumn, SmallSerialColumn, StringColumn, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, TransactionAdapterClass, TsQueryColumn, TsVectorColumn, UUIDColumn, UnknownColumn, VarCharColumn, VirtualColumn, XMLColumn, _appendQuery, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnTypes, getDateAsDateFn, getDateAsNumberFn, getDriverErrorCode, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, internalSchemaConfig, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteIdentifier, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, tableDataMethods, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry } from "./index.mjs";
 var OrchidOrmError = class extends Error {};
-export { AdapterClass, ArrayColumn, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Column, CustomTypeColumn, DateColumn, DecimalColumn, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, Expression, InetColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MoneyColumn, Operators, OrchidOrmError, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryHookUtils, QueryHooks, RawSql, RealColumn, SerialColumn, SmallIntColumn, SmallSerialColumn, StringColumn, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, TransactionAdapterClass, TsQueryColumn, TsVectorColumn, UUIDColumn, UnknownColumn, VarCharColumn, VirtualColumn, XMLColumn, _appendQuery, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnTypes, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteIdentifier, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, tableDataMethods, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry };
+export { AdapterClass, ArrayColumn, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Column, CustomTypeColumn, DateColumn, DecimalColumn, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, Expression, InetColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MoneyColumn, Operators, OrchidOrmError, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryHookUtils, QueryHooks, RawSql, RealColumn, SerialColumn, SmallIntColumn, SmallSerialColumn, StringColumn, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, TransactionAdapterClass, TsQueryColumn, TsVectorColumn, UUIDColumn, UnknownColumn, VarCharColumn, VirtualColumn, XMLColumn, _appendQuery, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnTypes, getDateAsDateFn, getDateAsNumberFn, getDriverErrorCode, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, internalSchemaConfig, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteIdentifier, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, tableDataMethods, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry };
 
 //# sourceMappingURL=internal.mjs.map

package/dist/node-postgres.d.ts

@@ -1,5 +1,6 @@
 import { PoolConfig } from "pg";
-import { AdapterConfigBase, ColumnSchemaConfig, DbOptions, DbResult, DefaultColumnTypes, DefaultSchemaConfig, DriverAdapter, QuerySchema } from "pqb/internal";
+import { AdapterConfigBase, AdapterSchemaConfigOptions, ColumnSchemaConfig, DbOptions, DbResult, DefaultColumnTypes, DefaultSchemaConfig, DriverAdapter, QuerySchema } from "pqb/internal";
+declare const nodePostgresSchemaConfig: (() => DefaultSchemaConfig) & AdapterSchemaConfigOptions;
 declare const createDb: <SchemaConfig extends ColumnSchemaConfig = DefaultSchemaConfig, ColumnTypes = DefaultColumnTypes<SchemaConfig>>({
   log,
   ...options
@@ -14,4 +15,4 @@ interface NodePostgresAdapterOptions extends Omit<AdapterConfig, 'log'> {
   schema?: QuerySchema;
 }
 declare const NodePostgresAdapter: DriverAdapter;
-export { AdapterConfig, NodePostgresAdapter, NodePostgresAdapterOptions, TypeParsers, createDb };
+export { AdapterConfig, NodePostgresAdapter, NodePostgresAdapterOptions, TypeParsers, createDb, nodePostgresSchemaConfig };

package/dist/node-postgres.js

@@ -23,8 +23,11 @@ let pg = require("pg");
 pg = __toESM(pg);
 let pqb_internal = require("pqb/internal");
 let pqb = require("pqb");
+const schemaConfig = { jsonEncodedByDriver: false };
+const nodePostgresSchemaConfig = Object.assign(() => (0, pqb_internal.defaultSchemaConfig)(schemaConfig), schemaConfig);
 const createDb = ({ log, ...options }) => {
 	return (0, pqb.createDbWithAdapter)({
+		schemaConfig: nodePostgresSchemaConfig,
 		...options,
 		log,
 		adapter: new pqb_internal.AdapterClass({
@@ -43,8 +46,7 @@ for (const key in types.builtins) {
 	types.builtins.DATE,
 	types.builtins.TIMESTAMP,
 	types.builtins.TIMESTAMPTZ,
-	types.builtins.CIRCLE,
-	types.builtins.BYTEA
+	types.builtins.CIRCLE
 ].forEach((id) => {
 	delete defaultTypeParsers[id];
 });
@@ -66,15 +68,16 @@ const queryClient = (client, text, values, arraysMode) => {
 		return __lock.then(() => {
 			const promise = client.query(params);
 			promise.then(resolve, resolve);
-			return promise;
+			return promise.then((result) => arraysMode ? normalizeArraysResult(result) : result);
 		});
 	}
 	const promise = client.query(params);
 	client.__lock = promise.catch(pqb_internal.noop);
-	return promise;
+	return promise.then((result) => arraysMode ? normalizeArraysResult(result) : result);
 };
 const NodePostgresAdapter = {
 	manualPool: true,
+	schemaConfig,
 	errorClass: pg.DatabaseError,
 	errorFields: {
 		message: "message",
@@ -130,14 +133,14 @@ const NodePostgresAdapter = {
 		}
 	},
 	async savepoint(client, _setClient, name, cb) {
-		const safeName = name.replaceAll("\"", "\"\"");
+		const safeName = (0, pqb_internal.quoteIdentifier)(name);
 		try {
-			await queryClient(client, `SAVEPOINT "${safeName}"`);
+			await queryClient(client, `SAVEPOINT ${safeName}`);
 			const res = await cb();
-			await queryClient(client, `RELEASE SAVEPOINT "${safeName}"`);
+			await queryClient(client, `RELEASE SAVEPOINT ${safeName}`);
 			return res;
 		} catch (err) {
-			await queryClient(client, `ROLLBACK TO SAVEPOINT "${safeName}"`);
+			await queryClient(client, `ROLLBACK TO SAVEPOINT ${safeName}`);
 			throw err;
 		}
 	},
@@ -157,7 +160,7 @@ const NodePostgresAdapter = {
 		});
 		const savepointPromise = (async () => {
 			try {
-				await queryClient(client, `SAVEPOINT "${safeName}"`);
+				await queryClient(client, `SAVEPOINT ${safeName}`);
 				try {
 					const res = await queryClient(client, text, values, arraysMode);
 					resultResolve(res);
@@ -166,10 +169,10 @@ const NodePostgresAdapter = {
 					throw err;
 				}
 				const result = await promise;
-				await queryClient(client, `RELEASE SAVEPOINT "${safeName}"`);
+				await queryClient(client, `RELEASE SAVEPOINT ${safeName}`);
 				return result;
 			} catch (err) {
-				await queryClient(client, `ROLLBACK TO SAVEPOINT "${safeName}"`);
+				await queryClient(client, `ROLLBACK TO SAVEPOINT ${safeName}`);
 				throw err;
 			}
 		})();
@@ -192,7 +195,11 @@ const NodePostgresAdapter = {
 const defaultTypesConfig = { getTypeParser(id) {
 	return defaultTypeParsers[id] || pqb_internal.returnArg;
 } };
+const normalizeArraysResult = (result) => {
+	return result;
+};
 exports.NodePostgresAdapter = NodePostgresAdapter;
 exports.createDb = createDb;
+exports.nodePostgresSchemaConfig = nodePostgresSchemaConfig;
 
 //# sourceMappingURL=node-postgres.js.map

package/dist/node-postgres.js.map

@@ -1 +1 @@
-{"version":3,"file":"node-postgres.js","names":["AdapterClass","noop","DatabaseError","returnArg"],"sources":["../src/adapters/node-postgres.ts"],"sourcesContent":["import pg, { DatabaseError, Pool, PoolClient, PoolConfig } from 'pg';\nimport {\n  AdapterConfigBase,\n  ColumnSchemaConfig,\n  noop,\n  QueryResult,\n  QueryResultRow,\n  RecordUnknown,\n  returnArg,\n  DefaultColumnTypes,\n  DefaultSchemaConfig,\n  DbOptions,\n  DbResult,\n  QuerySchema,\n  AdapterClass,\n  DriverAdapter,\n} from 'pqb/internal';\nimport { createDbWithAdapter } from 'pqb';\nimport { HackySavepointState } from './adapter';\n\nexport const createDb = <\n  SchemaConfig extends ColumnSchemaConfig = DefaultSchemaConfig,\n  ColumnTypes = DefaultColumnTypes<SchemaConfig>,\n>({\n  log,\n  ...options\n}: DbOptions<SchemaConfig, ColumnTypes> &\n  Omit<NodePostgresAdapterOptions, 'log'>): DbResult<ColumnTypes> => {\n  return createDbWithAdapter({\n    ...options,\n    log,\n    adapter: new AdapterClass({\n      driverAdapter: NodePostgresAdapter,\n      config: options,\n    }),\n  });\n};\n\nconst { types } = pg;\n\nexport interface TypeParsers {\n  [K: number]: (input: string) => unknown;\n}\n\nconst defaultTypeParsers: TypeParsers = {};\n\nfor (const key in types.builtins) {\n  const id = types.builtins[key as keyof typeof types.builtins];\n  defaultTypeParsers[id] = types.getTypeParser(id);\n}\n\n[\n  types.builtins.DATE,\n  types.builtins.TIMESTAMP,\n  types.builtins.TIMESTAMPTZ,\n  types.builtins.CIRCLE,\n  types.builtins.BYTEA,\n].forEach((id) => {\n  delete defaultTypeParsers[id];\n});\n\nexport interface AdapterConfig\n  extends\n    Omit<AdapterConfigBase, 'searchPath' | 'ssl'>,\n    Omit<PoolConfig, 'types' | 'connectionString'> {\n  databaseURL?: string;\n}\n\nexport interface NodePostgresAdapterOptions extends Omit<AdapterConfig, 'log'> {\n  schema?: QuerySchema;\n}\n\nconst queryClient = <T extends QueryResultRow = QueryResultRow>(\n  client: PoolClient,\n  text: string,\n  values?: unknown[],\n  // SQL session state (role and setConfig) from async storage\n  arraysMode?: boolean,\n): Promise<QueryResult<T>> => {\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const params: any = {\n    text,\n    values,\n    rowMode: arraysMode ? 'array' : undefined,\n    types: defaultTypesConfig,\n  };\n\n  // When using save points (it's in transaction), need to perform a single query at a time.\n  // stating 1 then 2 then releasing 1 would fail.\n  // Start 1, release 1, start 2, release 2, and so on.\n  const { __lock } = client as unknown as { __lock?: Promise<unknown> };\n  if (__lock) {\n    let resolve: () => void | undefined;\n    (client as unknown as RecordUnknown).__lock = new Promise<void>((res) => {\n      resolve = () => {\n        res();\n      };\n    });\n\n    return __lock.then(() => {\n      const promise = client.query(params);\n      promise.then(resolve, resolve);\n      return promise;\n    });\n  }\n\n  const promise = client.query(params);\n\n  (client as unknown as { __lock?: Promise<unknown> }).__lock =\n    promise.catch(noop);\n\n  return promise;\n};\n\nexport const NodePostgresAdapter: DriverAdapter = {\n  manualPool: true,\n\n  errorClass: DatabaseError,\n  errorFields: {\n    message: 'message',\n    length: 'length',\n    name: 'name',\n    severity: 'severity',\n    code: 'code',\n    detail: 'detail',\n    hint: 'hint',\n    position: 'position',\n    internalPosition: 'internalPosition',\n    internalQuery: 'internalQuery',\n    where: 'where',\n    schema: 'schema',\n    table: 'table',\n    column: 'column',\n    dataType: 'dataType',\n    constraint: 'constraint',\n    file: 'file',\n    line: 'line',\n    routine: 'routine',\n  },\n\n  configure(config: NodePostgresAdapterOptions): pg.Pool {\n    if (config.databaseURL) {\n      (config as PoolConfig).connectionString = config.databaseURL;\n    }\n\n    if (config.setConfig?.search_path) {\n      config = {\n        ...config,\n        options: `${config.options ? `${config.options} ` : ''}-c search_path=\"${config.setConfig.search_path}\"`,\n      };\n    }\n\n    return new pg.Pool(config);\n  },\n\n  queryClient,\n\n  borrow(pool: Pool): Promise<PoolClient> {\n    return pool.connect();\n  },\n\n  release(client: PoolClient): void {\n    client.release();\n  },\n\n  async begin<DriverClient, Result>(\n    pool: Pool,\n    cb: (adapter: DriverClient) => Promise<Result>,\n    options?: string,\n  ): Promise<Result> {\n    const client = await pool.connect();\n\n    try {\n      await queryClient(client, options ? 'BEGIN ' + options : 'BEGIN');\n\n      let result;\n      try {\n        result = await cb(client as DriverClient);\n      } catch (err) {\n        await queryClient(client, 'ROLLBACK');\n        throw err;\n      }\n      await queryClient(client, 'COMMIT');\n      return result as Result;\n    } finally {\n      client.release();\n    }\n  },\n\n  async savepoint<T>(\n    client: PoolClient,\n    // node-postgres doesn't need to switch the client in a savepoint\n    _setClient: (client: PoolClient) => void,\n    name: string,\n    cb: () => Promise<T>,\n  ): Promise<T> {\n    const safeName = name.replaceAll('\"', '\"\"');\n    try {\n      await queryClient(client, `SAVEPOINT \"${safeName}\"`);\n      const res = await cb();\n      await queryClient(client, `RELEASE SAVEPOINT \"${safeName}\"`);\n      return res;\n    } catch (err) {\n      await queryClient(client, `ROLLBACK TO SAVEPOINT \"${safeName}\"`);\n      throw err;\n    }\n  },\n\n  async hackySavepoint<T extends QueryResultRow>(\n    client: PoolClient,\n    // node-postgres doesn't need to switch the client in a savepoint\n    _setClient: (client: PoolClient) => void,\n    state: HackySavepointState,\n    text: string,\n    values?: unknown[],\n    arraysMode?: boolean,\n  ): Promise<QueryResult<T>> {\n    const safeName = state.name.replaceAll('\"', '\"\"');\n\n    let resolve: () => void;\n    let reject: (err: unknown) => void;\n    const promise = new Promise<void>((res, rej) => {\n      resolve = res;\n      reject = rej;\n    });\n\n    let resultResolve: (res: QueryResult<T>) => void;\n    let resultReject: (err: unknown) => void;\n    const resultPromise = new Promise<QueryResult<T>>((res, rej) => {\n      resultResolve = res;\n      resultReject = rej;\n    });\n\n    const savepointPromise = (async () => {\n      try {\n        await queryClient(client, `SAVEPOINT \"${safeName}\"`);\n\n        try {\n          const res = await queryClient<T>(client, text, values, arraysMode);\n          resultResolve!(res);\n        } catch (err) {\n          resultReject!(err);\n          throw err;\n        }\n\n        const result = await promise;\n        await queryClient(client, `RELEASE SAVEPOINT \"${safeName}\"`);\n        return result;\n      } catch (err) {\n        await queryClient(client, `ROLLBACK TO SAVEPOINT \"${safeName}\"`);\n        throw err;\n      }\n    })();\n\n    state.activeSavepoint = {\n      async release() {\n        resolve();\n        await savepointPromise;\n      },\n      async rollback(err) {\n        reject(err);\n        await savepointPromise.catch(noop);\n      },\n    };\n\n    return resultPromise;\n  },\n\n  close(pool: Pool): Promise<void> {\n    return pool.end();\n  },\n};\n\nconst defaultTypesConfig = {\n  getTypeParser(id: number) {\n    return defaultTypeParsers[id] || returnArg;\n  },\n};\n"],"mappings":"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"}
+{"version":3,"file":"node-postgres.js","names":["AdapterClass","noop","DatabaseError","returnArg"],"sources":["../src/adapters/node-postgres.ts"],"sourcesContent":["import pg, { DatabaseError, Pool, PoolClient, PoolConfig } from 'pg';\nimport {\n  AdapterConfigBase,\n  ColumnSchemaConfig,\n  noop,\n  QueryResult,\n  QueryResultRow,\n  RecordUnknown,\n  returnArg,\n  DefaultColumnTypes,\n  DefaultSchemaConfig,\n  DbOptions,\n  DbResult,\n  QuerySchema,\n  AdapterClass,\n  DriverAdapter,\n  defaultSchemaConfig,\n  quoteIdentifier,\n  AdapterSchemaConfigOptions,\n} from 'pqb/internal';\nimport { createDbWithAdapter } from 'pqb';\nimport { HackySavepointState } from './adapter';\n\nconst schemaConfig: AdapterSchemaConfigOptions = {\n  jsonEncodedByDriver: false,\n};\n\nexport const nodePostgresSchemaConfig = Object.assign(\n  () => defaultSchemaConfig(schemaConfig),\n  schemaConfig,\n);\n\nexport const createDb = <\n  SchemaConfig extends ColumnSchemaConfig = DefaultSchemaConfig,\n  ColumnTypes = DefaultColumnTypes<SchemaConfig>,\n>({\n  log,\n  ...options\n}: DbOptions<SchemaConfig, ColumnTypes> &\n  Omit<NodePostgresAdapterOptions, 'log'>): DbResult<ColumnTypes> => {\n  return createDbWithAdapter({\n    schemaConfig: nodePostgresSchemaConfig as unknown as () => SchemaConfig,\n    ...options,\n    log,\n    adapter: new AdapterClass({\n      driverAdapter: NodePostgresAdapter,\n      config: options,\n    }),\n  });\n};\n\nconst { types } = pg;\n\nexport interface TypeParsers {\n  [K: number]: (input: string) => unknown;\n}\n\nconst defaultTypeParsers: TypeParsers = {};\n\nfor (const key in types.builtins) {\n  const id = types.builtins[key as keyof typeof types.builtins];\n  defaultTypeParsers[id] = types.getTypeParser(id);\n}\n\n[\n  types.builtins.DATE,\n  types.builtins.TIMESTAMP,\n  types.builtins.TIMESTAMPTZ,\n  types.builtins.CIRCLE,\n].forEach((id) => {\n  delete defaultTypeParsers[id];\n});\n\nexport interface AdapterConfig\n  extends\n    Omit<AdapterConfigBase, 'searchPath' | 'ssl'>,\n    Omit<PoolConfig, 'types' | 'connectionString'> {\n  databaseURL?: string;\n}\n\nexport interface NodePostgresAdapterOptions extends Omit<AdapterConfig, 'log'> {\n  schema?: QuerySchema;\n}\n\nconst queryClient = <T = QueryResultRow>(\n  client: PoolClient,\n  text: string,\n  values?: unknown[],\n  arraysMode?: boolean,\n): Promise<QueryResult<T>> => {\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const params: any = {\n    text,\n    values,\n    rowMode: arraysMode ? 'array' : undefined,\n    types: defaultTypesConfig,\n  };\n\n  // When using save points (it's in transaction), need to perform a single query at a time.\n  // stating 1 then 2 then releasing 1 would fail.\n  // Start 1, release 1, start 2, release 2, and so on.\n  const { __lock } = client as unknown as { __lock?: Promise<unknown> };\n  if (__lock) {\n    let resolve: () => void | undefined;\n    (client as unknown as RecordUnknown).__lock = new Promise<void>((res) => {\n      resolve = () => {\n        res();\n      };\n    });\n\n    return __lock.then(() => {\n      const promise = client.query(params) as Promise<QueryResult>;\n      promise.then(resolve, resolve);\n      return promise.then((result) =>\n        arraysMode ? normalizeArraysResult(result) : result,\n      ) as Promise<QueryResult<T>>;\n    });\n  }\n\n  const promise = client.query(params) as Promise<QueryResult>;\n\n  (client as unknown as { __lock?: Promise<unknown> }).__lock =\n    promise.catch(noop);\n\n  return promise.then((result) =>\n    arraysMode ? normalizeArraysResult(result) : result,\n  ) as Promise<QueryResult<T>>;\n};\n\nexport const NodePostgresAdapter: DriverAdapter = {\n  manualPool: true,\n  schemaConfig,\n  errorClass: DatabaseError,\n  errorFields: {\n    message: 'message',\n    length: 'length',\n    name: 'name',\n    severity: 'severity',\n    code: 'code',\n    detail: 'detail',\n    hint: 'hint',\n    position: 'position',\n    internalPosition: 'internalPosition',\n    internalQuery: 'internalQuery',\n    where: 'where',\n    schema: 'schema',\n    table: 'table',\n    column: 'column',\n    dataType: 'dataType',\n    constraint: 'constraint',\n    file: 'file',\n    line: 'line',\n    routine: 'routine',\n  },\n\n  configure(config: NodePostgresAdapterOptions): pg.Pool {\n    if (config.databaseURL) {\n      (config as PoolConfig).connectionString = config.databaseURL;\n    }\n\n    if (config.setConfig?.search_path) {\n      config = {\n        ...config,\n        options: `${config.options ? `${config.options} ` : ''}-c search_path=\"${config.setConfig.search_path}\"`,\n      };\n    }\n\n    return new pg.Pool(config);\n  },\n\n  queryClient,\n\n  borrow(pool: Pool): Promise<PoolClient> {\n    return pool.connect();\n  },\n\n  release(client: PoolClient): void {\n    client.release();\n  },\n\n  async begin<DriverClient, Result>(\n    pool: Pool,\n    cb: (adapter: DriverClient) => Promise<Result>,\n    options?: string,\n  ): Promise<Result> {\n    const client = await pool.connect();\n\n    try {\n      await queryClient(client, options ? 'BEGIN ' + options : 'BEGIN');\n\n      let result;\n      try {\n        result = await cb(client as DriverClient);\n      } catch (err) {\n        await queryClient(client, 'ROLLBACK');\n        throw err;\n      }\n      await queryClient(client, 'COMMIT');\n      return result as Result;\n    } finally {\n      client.release();\n    }\n  },\n\n  async savepoint<T>(\n    client: PoolClient,\n    // node-postgres doesn't need to switch the client in a savepoint\n    _setClient: (client: PoolClient) => void,\n    name: string,\n    cb: () => Promise<T>,\n  ): Promise<T> {\n    const safeName = quoteIdentifier(name);\n    try {\n      await queryClient(client, `SAVEPOINT ${safeName}`);\n      const res = await cb();\n      await queryClient(client, `RELEASE SAVEPOINT ${safeName}`);\n      return res;\n    } catch (err) {\n      await queryClient(client, `ROLLBACK TO SAVEPOINT ${safeName}`);\n      throw err;\n    }\n  },\n\n  async hackySavepoint<T extends QueryResultRow>(\n    client: PoolClient,\n    // node-postgres doesn't need to switch the client in a savepoint\n    _setClient: (client: PoolClient) => void,\n    state: HackySavepointState,\n    text: string,\n    values?: unknown[],\n    arraysMode?: boolean,\n  ): Promise<QueryResult<T>> {\n    const safeName = state.name.replaceAll('\"', '\"\"');\n\n    let resolve: () => void;\n    let reject: (err: unknown) => void;\n    const promise = new Promise<void>((res, rej) => {\n      resolve = res;\n      reject = rej;\n    });\n\n    let resultResolve: (res: QueryResult<T>) => void;\n    let resultReject: (err: unknown) => void;\n    const resultPromise = new Promise<QueryResult<T>>((res, rej) => {\n      resultResolve = res;\n      resultReject = rej;\n    });\n\n    const savepointPromise = (async () => {\n      try {\n        await queryClient(client, `SAVEPOINT ${safeName}`);\n\n        try {\n          const res = await queryClient<T>(client, text, values, arraysMode);\n          resultResolve!(res as QueryResult<T>);\n        } catch (err) {\n          resultReject!(err);\n          throw err;\n        }\n\n        const result = await promise;\n        await queryClient(client, `RELEASE SAVEPOINT ${safeName}`);\n        return result;\n      } catch (err) {\n        await queryClient(client, `ROLLBACK TO SAVEPOINT ${safeName}`);\n        throw err;\n      }\n    })();\n\n    state.activeSavepoint = {\n      async release() {\n        resolve();\n        await savepointPromise;\n      },\n      async rollback(err) {\n        reject(err);\n        await savepointPromise.catch(noop);\n      },\n    };\n\n    return resultPromise;\n  },\n\n  close(pool: Pool): Promise<void> {\n    return pool.end();\n  },\n};\n\nconst defaultTypesConfig = {\n  getTypeParser(id: number) {\n    return defaultTypeParsers[id] || returnArg;\n  },\n};\n\nconst normalizeArraysResult = <\n  // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n  R extends any[] = any[],\n>(\n  result: QueryResult,\n): QueryResult<R> => {\n  return result as unknown as QueryResult<R>;\n};\n"],"mappings":"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"}

package/dist/node-postgres.mjs

@@ -1,8 +1,11 @@
 import pg, { DatabaseError } from "pg";
-import { AdapterClass, noop, returnArg } from "pqb/internal";
+import { AdapterClass, defaultSchemaConfig, noop, quoteIdentifier, returnArg } from "pqb/internal";
 import { createDbWithAdapter } from "pqb";
+const schemaConfig = { jsonEncodedByDriver: false };
+const nodePostgresSchemaConfig = Object.assign(() => defaultSchemaConfig(schemaConfig), schemaConfig);
 const createDb = ({ log, ...options }) => {
 	return createDbWithAdapter({
+		schemaConfig: nodePostgresSchemaConfig,
 		...options,
 		log,
 		adapter: new AdapterClass({
@@ -21,8 +24,7 @@ for (const key in types.builtins) {
 	types.builtins.DATE,
 	types.builtins.TIMESTAMP,
 	types.builtins.TIMESTAMPTZ,
-	types.builtins.CIRCLE,
-	types.builtins.BYTEA
+	types.builtins.CIRCLE
 ].forEach((id) => {
 	delete defaultTypeParsers[id];
 });
@@ -44,15 +46,16 @@ const queryClient = (client, text, values, arraysMode) => {
 		return __lock.then(() => {
 			const promise = client.query(params);
 			promise.then(resolve, resolve);
-			return promise;
+			return promise.then((result) => arraysMode ? normalizeArraysResult(result) : result);
 		});
 	}
 	const promise = client.query(params);
 	client.__lock = promise.catch(noop);
-	return promise;
+	return promise.then((result) => arraysMode ? normalizeArraysResult(result) : result);
 };
 const NodePostgresAdapter = {
 	manualPool: true,
+	schemaConfig,
 	errorClass: DatabaseError,
 	errorFields: {
 		message: "message",
@@ -108,14 +111,14 @@ const NodePostgresAdapter = {
 		}
 	},
 	async savepoint(client, _setClient, name, cb) {
-		const safeName = name.replaceAll("\"", "\"\"");
+		const safeName = quoteIdentifier(name);
 		try {
-			await queryClient(client, `SAVEPOINT "${safeName}"`);
+			await queryClient(client, `SAVEPOINT ${safeName}`);
 			const res = await cb();
-			await queryClient(client, `RELEASE SAVEPOINT "${safeName}"`);
+			await queryClient(client, `RELEASE SAVEPOINT ${safeName}`);
 			return res;
 		} catch (err) {
-			await queryClient(client, `ROLLBACK TO SAVEPOINT "${safeName}"`);
+			await queryClient(client, `ROLLBACK TO SAVEPOINT ${safeName}`);
 			throw err;
 		}
 	},
@@ -135,7 +138,7 @@ const NodePostgresAdapter = {
 		});
 		const savepointPromise = (async () => {
 			try {
-				await queryClient(client, `SAVEPOINT "${safeName}"`);
+				await queryClient(client, `SAVEPOINT ${safeName}`);
 				try {
 					const res = await queryClient(client, text, values, arraysMode);
 					resultResolve(res);
@@ -144,10 +147,10 @@ const NodePostgresAdapter = {
 					throw err;
 				}
 				const result = await promise;
-				await queryClient(client, `RELEASE SAVEPOINT "${safeName}"`);
+				await queryClient(client, `RELEASE SAVEPOINT ${safeName}`);
 				return result;
 			} catch (err) {
-				await queryClient(client, `ROLLBACK TO SAVEPOINT "${safeName}"`);
+				await queryClient(client, `ROLLBACK TO SAVEPOINT ${safeName}`);
 				throw err;
 			}
 		})();
@@ -170,6 +173,9 @@ const NodePostgresAdapter = {
 const defaultTypesConfig = { getTypeParser(id) {
 	return defaultTypeParsers[id] || returnArg;
 } };
-export { NodePostgresAdapter, createDb };
+const normalizeArraysResult = (result) => {
+	return result;
+};
+export { NodePostgresAdapter, createDb, nodePostgresSchemaConfig };
 
 //# sourceMappingURL=node-postgres.mjs.map

package/dist/node-postgres.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"node-postgres.mjs","names":[],"sources":["../src/adapters/node-postgres.ts"],"sourcesContent":["import pg, { DatabaseError, Pool, PoolClient, PoolConfig } from 'pg';\nimport {\n  AdapterConfigBase,\n  ColumnSchemaConfig,\n  noop,\n  QueryResult,\n  QueryResultRow,\n  RecordUnknown,\n  returnArg,\n  DefaultColumnTypes,\n  DefaultSchemaConfig,\n  DbOptions,\n  DbResult,\n  QuerySchema,\n  AdapterClass,\n  DriverAdapter,\n} from 'pqb/internal';\nimport { createDbWithAdapter } from 'pqb';\nimport { HackySavepointState } from './adapter';\n\nexport const createDb = <\n  SchemaConfig extends ColumnSchemaConfig = DefaultSchemaConfig,\n  ColumnTypes = DefaultColumnTypes<SchemaConfig>,\n>({\n  log,\n  ...options\n}: DbOptions<SchemaConfig, ColumnTypes> &\n  Omit<NodePostgresAdapterOptions, 'log'>): DbResult<ColumnTypes> => {\n  return createDbWithAdapter({\n    ...options,\n    log,\n    adapter: new AdapterClass({\n      driverAdapter: NodePostgresAdapter,\n      config: options,\n    }),\n  });\n};\n\nconst { types } = pg;\n\nexport interface TypeParsers {\n  [K: number]: (input: string) => unknown;\n}\n\nconst defaultTypeParsers: TypeParsers = {};\n\nfor (const key in types.builtins) {\n  const id = types.builtins[key as keyof typeof types.builtins];\n  defaultTypeParsers[id] = types.getTypeParser(id);\n}\n\n[\n  types.builtins.DATE,\n  types.builtins.TIMESTAMP,\n  types.builtins.TIMESTAMPTZ,\n  types.builtins.CIRCLE,\n  types.builtins.BYTEA,\n].forEach((id) => {\n  delete defaultTypeParsers[id];\n});\n\nexport interface AdapterConfig\n  extends\n    Omit<AdapterConfigBase, 'searchPath' | 'ssl'>,\n    Omit<PoolConfig, 'types' | 'connectionString'> {\n  databaseURL?: string;\n}\n\nexport interface NodePostgresAdapterOptions extends Omit<AdapterConfig, 'log'> {\n  schema?: QuerySchema;\n}\n\nconst queryClient = <T extends QueryResultRow = QueryResultRow>(\n  client: PoolClient,\n  text: string,\n  values?: unknown[],\n  // SQL session state (role and setConfig) from async storage\n  arraysMode?: boolean,\n): Promise<QueryResult<T>> => {\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const params: any = {\n    text,\n    values,\n    rowMode: arraysMode ? 'array' : undefined,\n    types: defaultTypesConfig,\n  };\n\n  // When using save points (it's in transaction), need to perform a single query at a time.\n  // stating 1 then 2 then releasing 1 would fail.\n  // Start 1, release 1, start 2, release 2, and so on.\n  const { __lock } = client as unknown as { __lock?: Promise<unknown> };\n  if (__lock) {\n    let resolve: () => void | undefined;\n    (client as unknown as RecordUnknown).__lock = new Promise<void>((res) => {\n      resolve = () => {\n        res();\n      };\n    });\n\n    return __lock.then(() => {\n      const promise = client.query(params);\n      promise.then(resolve, resolve);\n      return promise;\n    });\n  }\n\n  const promise = client.query(params);\n\n  (client as unknown as { __lock?: Promise<unknown> }).__lock =\n    promise.catch(noop);\n\n  return promise;\n};\n\nexport const NodePostgresAdapter: DriverAdapter = {\n  manualPool: true,\n\n  errorClass: DatabaseError,\n  errorFields: {\n    message: 'message',\n    length: 'length',\n    name: 'name',\n    severity: 'severity',\n    code: 'code',\n    detail: 'detail',\n    hint: 'hint',\n    position: 'position',\n    internalPosition: 'internalPosition',\n    internalQuery: 'internalQuery',\n    where: 'where',\n    schema: 'schema',\n    table: 'table',\n    column: 'column',\n    dataType: 'dataType',\n    constraint: 'constraint',\n    file: 'file',\n    line: 'line',\n    routine: 'routine',\n  },\n\n  configure(config: NodePostgresAdapterOptions): pg.Pool {\n    if (config.databaseURL) {\n      (config as PoolConfig).connectionString = config.databaseURL;\n    }\n\n    if (config.setConfig?.search_path) {\n      config = {\n        ...config,\n        options: `${config.options ? `${config.options} ` : ''}-c search_path=\"${config.setConfig.search_path}\"`,\n      };\n    }\n\n    return new pg.Pool(config);\n  },\n\n  queryClient,\n\n  borrow(pool: Pool): Promise<PoolClient> {\n    return pool.connect();\n  },\n\n  release(client: PoolClient): void {\n    client.release();\n  },\n\n  async begin<DriverClient, Result>(\n    pool: Pool,\n    cb: (adapter: DriverClient) => Promise<Result>,\n    options?: string,\n  ): Promise<Result> {\n    const client = await pool.connect();\n\n    try {\n      await queryClient(client, options ? 'BEGIN ' + options : 'BEGIN');\n\n      let result;\n      try {\n        result = await cb(client as DriverClient);\n      } catch (err) {\n        await queryClient(client, 'ROLLBACK');\n        throw err;\n      }\n      await queryClient(client, 'COMMIT');\n      return result as Result;\n    } finally {\n      client.release();\n    }\n  },\n\n  async savepoint<T>(\n    client: PoolClient,\n    // node-postgres doesn't need to switch the client in a savepoint\n    _setClient: (client: PoolClient) => void,\n    name: string,\n    cb: () => Promise<T>,\n  ): Promise<T> {\n    const safeName = name.replaceAll('\"', '\"\"');\n    try {\n      await queryClient(client, `SAVEPOINT \"${safeName}\"`);\n      const res = await cb();\n      await queryClient(client, `RELEASE SAVEPOINT \"${safeName}\"`);\n      return res;\n    } catch (err) {\n      await queryClient(client, `ROLLBACK TO SAVEPOINT \"${safeName}\"`);\n      throw err;\n    }\n  },\n\n  async hackySavepoint<T extends QueryResultRow>(\n    client: PoolClient,\n    // node-postgres doesn't need to switch the client in a savepoint\n    _setClient: (client: PoolClient) => void,\n    state: HackySavepointState,\n    text: string,\n    values?: unknown[],\n    arraysMode?: boolean,\n  ): Promise<QueryResult<T>> {\n    const safeName = state.name.replaceAll('\"', '\"\"');\n\n    let resolve: () => void;\n    let reject: (err: unknown) => void;\n    const promise = new Promise<void>((res, rej) => {\n      resolve = res;\n      reject = rej;\n    });\n\n    let resultResolve: (res: QueryResult<T>) => void;\n    let resultReject: (err: unknown) => void;\n    const resultPromise = new Promise<QueryResult<T>>((res, rej) => {\n      resultResolve = res;\n      resultReject = rej;\n    });\n\n    const savepointPromise = (async () => {\n      try {\n        await queryClient(client, `SAVEPOINT \"${safeName}\"`);\n\n        try {\n          const res = await queryClient<T>(client, text, values, arraysMode);\n          resultResolve!(res);\n        } catch (err) {\n          resultReject!(err);\n          throw err;\n        }\n\n        const result = await promise;\n        await queryClient(client, `RELEASE SAVEPOINT \"${safeName}\"`);\n        return result;\n      } catch (err) {\n        await queryClient(client, `ROLLBACK TO SAVEPOINT \"${safeName}\"`);\n        throw err;\n      }\n    })();\n\n    state.activeSavepoint = {\n      async release() {\n        resolve();\n        await savepointPromise;\n      },\n      async rollback(err) {\n        reject(err);\n        await savepointPromise.catch(noop);\n      },\n    };\n\n    return resultPromise;\n  },\n\n  close(pool: Pool): Promise<void> {\n    return pool.end();\n  },\n};\n\nconst defaultTypesConfig = {\n  getTypeParser(id: number) {\n    return defaultTypeParsers[id] || returnArg;\n  },\n};\n"],"mappings":"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"}
+{"version":3,"file":"node-postgres.mjs","names":[],"sources":["../src/adapters/node-postgres.ts"],"sourcesContent":["import pg, { DatabaseError, Pool, PoolClient, PoolConfig } from 'pg';\nimport {\n  AdapterConfigBase,\n  ColumnSchemaConfig,\n  noop,\n  QueryResult,\n  QueryResultRow,\n  RecordUnknown,\n  returnArg,\n  DefaultColumnTypes,\n  DefaultSchemaConfig,\n  DbOptions,\n  DbResult,\n  QuerySchema,\n  AdapterClass,\n  DriverAdapter,\n  defaultSchemaConfig,\n  quoteIdentifier,\n  AdapterSchemaConfigOptions,\n} from 'pqb/internal';\nimport { createDbWithAdapter } from 'pqb';\nimport { HackySavepointState } from './adapter';\n\nconst schemaConfig: AdapterSchemaConfigOptions = {\n  jsonEncodedByDriver: false,\n};\n\nexport const nodePostgresSchemaConfig = Object.assign(\n  () => defaultSchemaConfig(schemaConfig),\n  schemaConfig,\n);\n\nexport const createDb = <\n  SchemaConfig extends ColumnSchemaConfig = DefaultSchemaConfig,\n  ColumnTypes = DefaultColumnTypes<SchemaConfig>,\n>({\n  log,\n  ...options\n}: DbOptions<SchemaConfig, ColumnTypes> &\n  Omit<NodePostgresAdapterOptions, 'log'>): DbResult<ColumnTypes> => {\n  return createDbWithAdapter({\n    schemaConfig: nodePostgresSchemaConfig as unknown as () => SchemaConfig,\n    ...options,\n    log,\n    adapter: new AdapterClass({\n      driverAdapter: NodePostgresAdapter,\n      config: options,\n    }),\n  });\n};\n\nconst { types } = pg;\n\nexport interface TypeParsers {\n  [K: number]: (input: string) => unknown;\n}\n\nconst defaultTypeParsers: TypeParsers = {};\n\nfor (const key in types.builtins) {\n  const id = types.builtins[key as keyof typeof types.builtins];\n  defaultTypeParsers[id] = types.getTypeParser(id);\n}\n\n[\n  types.builtins.DATE,\n  types.builtins.TIMESTAMP,\n  types.builtins.TIMESTAMPTZ,\n  types.builtins.CIRCLE,\n].forEach((id) => {\n  delete defaultTypeParsers[id];\n});\n\nexport interface AdapterConfig\n  extends\n    Omit<AdapterConfigBase, 'searchPath' | 'ssl'>,\n    Omit<PoolConfig, 'types' | 'connectionString'> {\n  databaseURL?: string;\n}\n\nexport interface NodePostgresAdapterOptions extends Omit<AdapterConfig, 'log'> {\n  schema?: QuerySchema;\n}\n\nconst queryClient = <T = QueryResultRow>(\n  client: PoolClient,\n  text: string,\n  values?: unknown[],\n  arraysMode?: boolean,\n): Promise<QueryResult<T>> => {\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const params: any = {\n    text,\n    values,\n    rowMode: arraysMode ? 'array' : undefined,\n    types: defaultTypesConfig,\n  };\n\n  // When using save points (it's in transaction), need to perform a single query at a time.\n  // stating 1 then 2 then releasing 1 would fail.\n  // Start 1, release 1, start 2, release 2, and so on.\n  const { __lock } = client as unknown as { __lock?: Promise<unknown> };\n  if (__lock) {\n    let resolve: () => void | undefined;\n    (client as unknown as RecordUnknown).__lock = new Promise<void>((res) => {\n      resolve = () => {\n        res();\n      };\n    });\n\n    return __lock.then(() => {\n      const promise = client.query(params) as Promise<QueryResult>;\n      promise.then(resolve, resolve);\n      return promise.then((result) =>\n        arraysMode ? normalizeArraysResult(result) : result,\n      ) as Promise<QueryResult<T>>;\n    });\n  }\n\n  const promise = client.query(params) as Promise<QueryResult>;\n\n  (client as unknown as { __lock?: Promise<unknown> }).__lock =\n    promise.catch(noop);\n\n  return promise.then((result) =>\n    arraysMode ? normalizeArraysResult(result) : result,\n  ) as Promise<QueryResult<T>>;\n};\n\nexport const NodePostgresAdapter: DriverAdapter = {\n  manualPool: true,\n  schemaConfig,\n  errorClass: DatabaseError,\n  errorFields: {\n    message: 'message',\n    length: 'length',\n    name: 'name',\n    severity: 'severity',\n    code: 'code',\n    detail: 'detail',\n    hint: 'hint',\n    position: 'position',\n    internalPosition: 'internalPosition',\n    internalQuery: 'internalQuery',\n    where: 'where',\n    schema: 'schema',\n    table: 'table',\n    column: 'column',\n    dataType: 'dataType',\n    constraint: 'constraint',\n    file: 'file',\n    line: 'line',\n    routine: 'routine',\n  },\n\n  configure(config: NodePostgresAdapterOptions): pg.Pool {\n    if (config.databaseURL) {\n      (config as PoolConfig).connectionString = config.databaseURL;\n    }\n\n    if (config.setConfig?.search_path) {\n      config = {\n        ...config,\n        options: `${config.options ? `${config.options} ` : ''}-c search_path=\"${config.setConfig.search_path}\"`,\n      };\n    }\n\n    return new pg.Pool(config);\n  },\n\n  queryClient,\n\n  borrow(pool: Pool): Promise<PoolClient> {\n    return pool.connect();\n  },\n\n  release(client: PoolClient): void {\n    client.release();\n  },\n\n  async begin<DriverClient, Result>(\n    pool: Pool,\n    cb: (adapter: DriverClient) => Promise<Result>,\n    options?: string,\n  ): Promise<Result> {\n    const client = await pool.connect();\n\n    try {\n      await queryClient(client, options ? 'BEGIN ' + options : 'BEGIN');\n\n      let result;\n      try {\n        result = await cb(client as DriverClient);\n      } catch (err) {\n        await queryClient(client, 'ROLLBACK');\n        throw err;\n      }\n      await queryClient(client, 'COMMIT');\n      return result as Result;\n    } finally {\n      client.release();\n    }\n  },\n\n  async savepoint<T>(\n    client: PoolClient,\n    // node-postgres doesn't need to switch the client in a savepoint\n    _setClient: (client: PoolClient) => void,\n    name: string,\n    cb: () => Promise<T>,\n  ): Promise<T> {\n    const safeName = quoteIdentifier(name);\n    try {\n      await queryClient(client, `SAVEPOINT ${safeName}`);\n      const res = await cb();\n      await queryClient(client, `RELEASE SAVEPOINT ${safeName}`);\n      return res;\n    } catch (err) {\n      await queryClient(client, `ROLLBACK TO SAVEPOINT ${safeName}`);\n      throw err;\n    }\n  },\n\n  async hackySavepoint<T extends QueryResultRow>(\n    client: PoolClient,\n    // node-postgres doesn't need to switch the client in a savepoint\n    _setClient: (client: PoolClient) => void,\n    state: HackySavepointState,\n    text: string,\n    values?: unknown[],\n    arraysMode?: boolean,\n  ): Promise<QueryResult<T>> {\n    const safeName = state.name.replaceAll('\"', '\"\"');\n\n    let resolve: () => void;\n    let reject: (err: unknown) => void;\n    const promise = new Promise<void>((res, rej) => {\n      resolve = res;\n      reject = rej;\n    });\n\n    let resultResolve: (res: QueryResult<T>) => void;\n    let resultReject: (err: unknown) => void;\n    const resultPromise = new Promise<QueryResult<T>>((res, rej) => {\n      resultResolve = res;\n      resultReject = rej;\n    });\n\n    const savepointPromise = (async () => {\n      try {\n        await queryClient(client, `SAVEPOINT ${safeName}`);\n\n        try {\n          const res = await queryClient<T>(client, text, values, arraysMode);\n          resultResolve!(res as QueryResult<T>);\n        } catch (err) {\n          resultReject!(err);\n          throw err;\n        }\n\n        const result = await promise;\n        await queryClient(client, `RELEASE SAVEPOINT ${safeName}`);\n        return result;\n      } catch (err) {\n        await queryClient(client, `ROLLBACK TO SAVEPOINT ${safeName}`);\n        throw err;\n      }\n    })();\n\n    state.activeSavepoint = {\n      async release() {\n        resolve();\n        await savepointPromise;\n      },\n      async rollback(err) {\n        reject(err);\n        await savepointPromise.catch(noop);\n      },\n    };\n\n    return resultPromise;\n  },\n\n  close(pool: Pool): Promise<void> {\n    return pool.end();\n  },\n};\n\nconst defaultTypesConfig = {\n  getTypeParser(id: number) {\n    return defaultTypeParsers[id] || returnArg;\n  },\n};\n\nconst normalizeArraysResult = <\n  // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n  R extends any[] = any[],\n>(\n  result: QueryResult,\n): QueryResult<R> => {\n  return result as unknown as QueryResult<R>;\n};\n"],"mappings":"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"}

package/dist/postgres-js.js

@@ -23,6 +23,22 @@ let postgres = require("postgres");
 postgres = __toESM(postgres);
 let pqb_internal = require("pqb/internal");
 let pqb = require("pqb");
+const intervalRegExp = /^\s*(?:([+-]?\d+)\s+years?)?\s*(?:([+-]?\d+)\s+mons?)?\s*(?:([+-]?\d+)\s+days?)?\s*(?:([+-])?(\d+):(\d\d):(\d\d(?:\.\d{1,6})?))?\s*$/;
+const parseInterval = (str) => {
+	const [, years, months, days, timeSign, hours, minutes, seconds] = intervalRegExp.exec(str) || [];
+	const timeMultiplier = timeSign === "-" ? -1 : 1;
+	const secondsFloat = Number(seconds) || 0;
+	const wholeSeconds = Math.floor(secondsFloat);
+	return {
+		years: years ? Number(years) : 0,
+		months: months ? Number(months) : 0,
+		days: days ? Number(days) : 0,
+		hours: hours ? timeMultiplier * Number(hours) : 0,
+		minutes: minutes ? timeMultiplier * Number(minutes) : 0,
+		seconds: timeMultiplier * wholeSeconds,
+		milliseconds: Math.round(timeMultiplier * (secondsFloat - wholeSeconds) * 1e6) / 1e3
+	};
+};
 const createDb = (options) => {
 	return (0, pqb.createDbWithAdapter)({
 		...options,
@@ -39,11 +55,19 @@ var PostgresJsResult = class {
 		this.fields = result.statement.columns;
 	}
 };
+var PostgresJsArraysResult = class {
+	constructor(result) {
+		this.rowCount = result.count;
+		this.rows = result;
+		this.fields = result.statement.columns;
+	}
+};
 const types = {
 	bytea: {
 		to: 17,
 		from: 17,
-		serialize: (x) => "\\x" + Buffer.from(x).toString("hex")
+		serialize: (x) => "\\x" + Buffer.from(x).toString("hex"),
+		parse: (x) => Buffer.from(x.slice(2), "hex")
 	},
 	dateAndTimestampAsStrings: {
 		to: 25,
@@ -57,23 +81,11 @@ const types = {
 	interval: {
 		from: [1186],
 		serialize: pqb_internal.returnArg,
-		parse(str) {
-			const [years, , months, , days, , time] = str.split(" ");
-			const [hours, minutes, seconds] = time.split(":");
-			return {
-				years: years ? Number(years) : 0,
-				months: months ? Number(months) : 0,
-				days: days ? Number(days) : 0,
-				hours: hours ? Number(hours) : 0,
-				minutes: minutes ? Number(minutes) : 0,
-				seconds: seconds ? Number(seconds) : 0
-			};
-		}
+		parse: parseInterval
 	},
 	json: {
 		to: 114,
 		from: [114, 3802],
-		serialize: pqb_internal.returnArg,
 		parse: (x) => {
 			return JSON.parse(x);
 		}
@@ -115,8 +127,8 @@ const PostgresJsAdapter = {
 		let query = client.unsafe(text, values);
 		if (arraysMode) query = query.values();
 		const result = await query;
-		if (result.constructor === Array) return result.map((res) => new PostgresJsResult(res));
-		else return new PostgresJsResult(result);
+		if (result.constructor === Array) return result.map((res) => makePostgresJsResult(res, arraysMode));
+		else return makePostgresJsResult(result, arraysMode);
 	},
 	borrow(client) {
 		return client.reserve();
@@ -188,6 +200,9 @@ const PostgresJsAdapter = {
 		return client.end();
 	}
 };
+const makePostgresJsResult = (result, arraysMode) => {
+	return arraysMode ? new PostgresJsArraysResult(result) : new PostgresJsResult(result);
+};
 exports.PostgresJsAdapter = PostgresJsAdapter;
 exports.createDb = createDb;
 

package/dist/postgres-js.js.map

@@ -1 +1 @@
-{"version":3,"file":"postgres-js.js","names":["AdapterClass","returnArg","noop"],"sources":["../src/adapters/postgres-js.ts"],"sourcesContent":["import postgres, { Row, RowList, TransactionSql } from 'postgres';\nimport {\n  AdapterConfigBase,\n  QueryResult,\n  QueryResultRow,\n  returnArg,\n  DbOptions,\n  DefaultColumnTypes,\n  DefaultSchemaConfig,\n  DbResult,\n  ColumnSchemaConfig,\n  AdapterClass,\n  DriverAdapter,\n  QuerySchema,\n  noop,\n} from 'pqb/internal';\nimport { createDbWithAdapter } from 'pqb';\nimport { HackySavepointState } from './adapter';\n\nexport interface CreatePostgresJsDbOptions<\n  SchemaConfig extends ColumnSchemaConfig,\n  ColumnTypes,\n>\n  extends PostgresJsAdapterOptions, DbOptions<SchemaConfig, ColumnTypes> {}\n\nexport const createDb = <\n  SchemaConfig extends ColumnSchemaConfig = DefaultSchemaConfig,\n  ColumnTypes = DefaultColumnTypes<SchemaConfig>,\n>(\n  options: CreatePostgresJsDbOptions<SchemaConfig, ColumnTypes>,\n): DbResult<ColumnTypes> => {\n  return createDbWithAdapter({\n    ...options,\n    adapter: new AdapterClass({\n      driverAdapter: PostgresJsAdapter,\n      config: options,\n    }),\n  });\n};\n\nexport interface PostgresJsAdapterOptions\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  extends postgres.Options<any>, Omit<AdapterConfigBase, 'searchPath' | 'ssl'> {\n  databaseURL?: string;\n  schema?: QuerySchema;\n}\n\ntype RawResult = RowList<(Row & Iterable<Row>)[]>;\n\nclass PostgresJsResult<T extends QueryResultRow> implements QueryResult<T> {\n  rowCount: number;\n  rows: T[];\n  fields: QueryResult<T>['fields'];\n\n  constructor(result: RawResult) {\n    this.rowCount = result.count;\n    this.rows = result as never;\n    this.fields = result.statement.columns;\n  }\n}\n\nconst types: Record<string, Partial<postgres.PostgresType>> = {\n  bytea: {\n    to: 17,\n    from: 17 as never,\n    serialize: (x) => '\\\\x' + Buffer.from(x).toString('hex'),\n    // omit parse, let bytea return a string, so it remains consistent with when it's selected via JSON\n  },\n  dateAndTimestampAsStrings: {\n    to: 25,\n    from: [1082, 1114, 1184],\n    parse: returnArg,\n  },\n  interval: {\n    from: [1186],\n    serialize: returnArg,\n    parse(str: string) {\n      const [years, , months, , days, , time] = str.split(' ');\n      const [hours, minutes, seconds] = time.split(':');\n\n      return {\n        years: years ? Number(years) : 0,\n        months: months ? Number(months) : 0,\n        days: days ? Number(days) : 0,\n        hours: hours ? Number(hours) : 0,\n        minutes: minutes ? Number(minutes) : 0,\n        seconds: seconds ? Number(seconds) : 0,\n      };\n    },\n  },\n  // overrides the built-in json type to not serialize it, because it incorrectly serializes\n  json: {\n    to: 114,\n    from: [114, 3802],\n    serialize: returnArg,\n    parse: (x) => {\n      return JSON.parse(x);\n    },\n  },\n};\n\nexport const PostgresJsAdapter: DriverAdapter = {\n  manualPool: false,\n\n  errorClass: postgres.PostgresError,\n  errorFields: {\n    message: 'message',\n    severity: 'severity',\n    code: 'code',\n    detail: 'detail',\n    schema: 'schema_name',\n    table: 'table_name',\n    constraint: 'constraint_name',\n    hint: 'hint',\n    position: 'position',\n    where: 'where',\n    file: 'file',\n    line: 'line',\n    routine: 'routine',\n  },\n\n  configure(params: PostgresJsAdapterOptions): postgres.Sql {\n    const config: PostgresJsAdapterOptions = { ...params, types };\n\n    if (config.setConfig?.search_path) {\n      config.connection = {\n        ...config.connection,\n        search_path: config.setConfig.search_path,\n      };\n    }\n\n    let sql;\n    if (config.databaseURL) {\n      sql = postgres(config.databaseURL, config);\n    } else {\n      sql = postgres(config);\n    }\n\n    return sql;\n  },\n\n  async queryClient<T extends QueryResultRow = QueryResultRow>(\n    client: TransactionSql,\n    text: string,\n    values?: unknown[],\n    // SQL session state (role and setConfig) from async storage\n    arraysMode?: boolean,\n  ): Promise<QueryResult<T>> {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    let query = client.unsafe(text, values as never) as any;\n\n    if (arraysMode) query = query.values();\n\n    const result = await query;\n    if (result.constructor === Array) {\n      return (result as RawResult[]).map(\n        (res) => new PostgresJsResult(res),\n      ) as never;\n    } else {\n      return new PostgresJsResult(result as RawResult);\n    }\n  },\n\n  borrow(client: postgres.Sql): Promise<postgres.ReservedSql> {\n    return client.reserve();\n  },\n\n  release(client: postgres.ReservedSql): void {\n    client.release();\n  },\n\n  begin<DriverClient, Result>(\n    client: postgres.Sql,\n    cb: (adapter: DriverClient) => Promise<Result>,\n    options?: string,\n  ): Promise<Result> {\n    let ok: boolean | undefined;\n    let result: unknown;\n\n    const fn = (sql: TransactionSql): Promise<Result> =>\n      cb(sql as DriverClient).then((res) => {\n        ok = true;\n        return (result = res);\n      });\n\n    return (options ? client.begin(options, fn) : client.begin(fn)).catch(\n      (err) => {\n        if (ok) return result;\n\n        throw err;\n      },\n    ) as never;\n  },\n\n  async savepoint<T>(\n    client: postgres.TransactionSql,\n    setClient: (client: postgres.TransactionSql) => void,\n    name: string,\n    cb: () => Promise<T>,\n  ): Promise<T> {\n    let result: T | undefined;\n    await client\n      .savepoint(name, async (savepointClient) => {\n        setClient(savepointClient);\n        result = await cb();\n      })\n      .finally(() => {\n        setClient(client);\n      });\n    return result as T;\n  },\n\n  async hackySavepoint<T extends QueryResultRow>(\n    client: postgres.TransactionSql,\n    setClient: (client: postgres.TransactionSql) => void,\n    state: HackySavepointState,\n    text: string,\n    values?: unknown[],\n    arraysMode?: boolean,\n  ): Promise<QueryResult<T>> {\n    let resolve: () => void;\n    let reject: (err: unknown) => void;\n    const promise = new Promise<void>((res, rej) => {\n      resolve = res;\n      reject = rej;\n    });\n\n    let resultResolve: (res: QueryResult<T>) => void;\n    let resultReject: (err: unknown) => void;\n    const resultPromise = new Promise<QueryResult<T>>((res, rej) => {\n      resultResolve = res;\n      resultReject = rej;\n    });\n\n    const savepointPromise = client\n      .savepoint<void>(state.name, async (savepointClient) => {\n        try {\n          setClient(savepointClient);\n\n          const res = await this.queryClient<T>(\n            savepointClient,\n            text,\n            values,\n            arraysMode,\n          );\n          resultResolve(res);\n        } catch (err) {\n          resultReject(err);\n          throw err;\n        }\n\n        return promise;\n      })\n      .finally(() => {\n        setClient(client);\n      });\n\n    state.activeSavepoint = {\n      async release() {\n        resolve();\n        await savepointPromise;\n      },\n      async rollback(err) {\n        reject(err);\n        await savepointPromise.catch(noop);\n      },\n    };\n\n    return resultPromise;\n  },\n\n  close(client: postgres.Sql): Promise<void> {\n    return client.end();\n  },\n};\n"],"mappings":"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"}
+{"version":3,"file":"postgres-js.js","names":["AdapterClass","returnArg","noop"],"sources":["../src/adapters/driver-adapter-shared.ts","../src/adapters/postgres-js.ts"],"sourcesContent":["export interface PostgresInterval {\n  years: number;\n  months: number;\n  days: number;\n  hours: number;\n  minutes: number;\n  seconds: number;\n  milliseconds: number;\n}\n\nconst intervalRegExp =\n  /^\\s*(?:([+-]?\\d+)\\s+years?)?\\s*(?:([+-]?\\d+)\\s+mons?)?\\s*(?:([+-]?\\d+)\\s+days?)?\\s*(?:([+-])?(\\d+):(\\d\\d):(\\d\\d(?:\\.\\d{1,6})?))?\\s*$/;\n\nexport const parseInterval = (str: string): PostgresInterval => {\n  const [, years, months, days, timeSign, hours, minutes, seconds] =\n    intervalRegExp.exec(str) || [];\n  const timeMultiplier = timeSign === '-' ? -1 : 1;\n  const secondsFloat = Number(seconds) || 0;\n  const wholeSeconds = Math.floor(secondsFloat);\n\n  return {\n    years: years ? Number(years) : 0,\n    months: months ? Number(months) : 0,\n    days: days ? Number(days) : 0,\n    hours: hours ? timeMultiplier * Number(hours) : 0,\n    minutes: minutes ? timeMultiplier * Number(minutes) : 0,\n    seconds: timeMultiplier * wholeSeconds,\n    milliseconds:\n      Math.round(timeMultiplier * (secondsFloat - wholeSeconds) * 1000000) /\n      1000,\n  };\n};\n","import postgres, { Row, RowList, TransactionSql } from 'postgres';\nimport {\n  AdapterConfigBase,\n  QueryResult,\n  QueryResultRow,\n  returnArg,\n  DbOptions,\n  DefaultColumnTypes,\n  DefaultSchemaConfig,\n  DbResult,\n  ColumnSchemaConfig,\n  AdapterClass,\n  DriverAdapter,\n  QuerySchema,\n  noop,\n} from 'pqb/internal';\nimport { createDbWithAdapter } from 'pqb';\nimport { HackySavepointState } from './adapter';\nimport { parseInterval } from './driver-adapter-shared';\n\nexport interface CreatePostgresJsDbOptions<\n  SchemaConfig extends ColumnSchemaConfig,\n  ColumnTypes,\n>\n  extends PostgresJsAdapterOptions, DbOptions<SchemaConfig, ColumnTypes> {}\n\nexport const createDb = <\n  SchemaConfig extends ColumnSchemaConfig = DefaultSchemaConfig,\n  ColumnTypes = DefaultColumnTypes<SchemaConfig>,\n>(\n  options: CreatePostgresJsDbOptions<SchemaConfig, ColumnTypes>,\n): DbResult<ColumnTypes> => {\n  return createDbWithAdapter({\n    ...options,\n    adapter: new AdapterClass({\n      driverAdapter: PostgresJsAdapter,\n      config: options,\n    }),\n  });\n};\n\nexport interface PostgresJsAdapterOptions\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  extends postgres.Options<any>, Omit<AdapterConfigBase, 'searchPath' | 'ssl'> {\n  databaseURL?: string;\n  schema?: QuerySchema;\n}\n\ntype RawResult = RowList<(Row & Iterable<Row>)[]>;\n\nclass PostgresJsResult<T extends QueryResultRow> implements QueryResult<T> {\n  rowCount: number;\n  rows: T[];\n  fields: QueryResult<T>['fields'];\n\n  constructor(result: RawResult) {\n    this.rowCount = result.count;\n    this.rows = result as never;\n    this.fields = result.statement.columns;\n  }\n}\n\nclass PostgresJsArraysResult<\n  // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n  R extends any[],\n> implements QueryResult<R> {\n  rowCount: number;\n  rows: R[];\n  fields: QueryResult['fields'];\n\n  constructor(result: RawResult) {\n    this.rowCount = result.count;\n    this.rows = result as never;\n    this.fields = result.statement.columns;\n  }\n}\n\nconst types: Record<string, Partial<postgres.PostgresType>> = {\n  bytea: {\n    to: 17,\n    from: 17 as never,\n    serialize: (x) => '\\\\x' + Buffer.from(x).toString('hex'),\n    parse: (x: string) => Buffer.from(x.slice(2), 'hex'),\n  },\n  dateAndTimestampAsStrings: {\n    to: 25,\n    from: [1082, 1114, 1184],\n    parse: returnArg,\n  },\n  interval: {\n    from: [1186],\n    serialize: returnArg,\n    parse: parseInterval,\n  },\n  json: {\n    to: 114,\n    from: [114, 3802],\n    parse: (x) => {\n      return JSON.parse(x);\n    },\n  },\n};\n\nexport const PostgresJsAdapter: DriverAdapter = {\n  manualPool: false,\n\n  errorClass: postgres.PostgresError,\n  errorFields: {\n    message: 'message',\n    severity: 'severity',\n    code: 'code',\n    detail: 'detail',\n    schema: 'schema_name',\n    table: 'table_name',\n    constraint: 'constraint_name',\n    hint: 'hint',\n    position: 'position',\n    where: 'where',\n    file: 'file',\n    line: 'line',\n    routine: 'routine',\n  },\n\n  configure(params: PostgresJsAdapterOptions): postgres.Sql {\n    const config: PostgresJsAdapterOptions = {\n      ...params,\n      types,\n    };\n\n    if (config.setConfig?.search_path) {\n      config.connection = {\n        ...config.connection,\n        search_path: config.setConfig.search_path,\n      };\n    }\n\n    let sql;\n    if (config.databaseURL) {\n      sql = postgres(config.databaseURL, config);\n    } else {\n      sql = postgres(config);\n    }\n\n    return sql;\n  },\n\n  async queryClient<T = QueryResultRow>(\n    client: TransactionSql,\n    text: string,\n    values?: unknown[],\n    arraysMode?: boolean,\n  ): Promise<QueryResult<T>> {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    let query = client.unsafe(text, values as never) as any;\n\n    if (arraysMode) query = query.values();\n\n    const result = await query;\n    if (result.constructor === Array) {\n      return (result as RawResult[]).map((res) =>\n        makePostgresJsResult(res, arraysMode),\n      ) as never;\n    } else {\n      return makePostgresJsResult(\n        result as RawResult,\n        arraysMode,\n      ) as QueryResult<T>;\n    }\n  },\n\n  borrow(client: postgres.Sql): Promise<postgres.ReservedSql> {\n    return client.reserve();\n  },\n\n  release(client: postgres.ReservedSql): void {\n    client.release();\n  },\n\n  begin<DriverClient, Result>(\n    client: postgres.Sql,\n    cb: (adapter: DriverClient) => Promise<Result>,\n    options?: string,\n  ): Promise<Result> {\n    let ok: boolean | undefined;\n    let result: unknown;\n\n    const fn = (sql: TransactionSql): Promise<Result> =>\n      cb(sql as DriverClient).then((res) => {\n        ok = true;\n        return (result = res);\n      });\n\n    return (options ? client.begin(options, fn) : client.begin(fn)).catch(\n      (err) => {\n        if (ok) return result;\n\n        throw err;\n      },\n    ) as never;\n  },\n\n  async savepoint<T>(\n    client: postgres.TransactionSql,\n    setClient: (client: postgres.TransactionSql) => void,\n    name: string,\n    cb: () => Promise<T>,\n  ): Promise<T> {\n    let result: T | undefined;\n    await client\n      .savepoint(name, async (savepointClient) => {\n        setClient(savepointClient);\n        result = await cb();\n      })\n      .finally(() => {\n        setClient(client);\n      });\n    return result as T;\n  },\n\n  async hackySavepoint<T extends QueryResultRow>(\n    client: postgres.TransactionSql,\n    setClient: (client: postgres.TransactionSql) => void,\n    state: HackySavepointState,\n    text: string,\n    values?: unknown[],\n    arraysMode?: boolean,\n  ): Promise<QueryResult<T>> {\n    let resolve: () => void;\n    let reject: (err: unknown) => void;\n    const promise = new Promise<void>((res, rej) => {\n      resolve = res;\n      reject = rej;\n    });\n\n    let resultResolve: (res: QueryResult<T>) => void;\n    let resultReject: (err: unknown) => void;\n    const resultPromise = new Promise<QueryResult<T>>((res, rej) => {\n      resultResolve = res;\n      resultReject = rej;\n    });\n\n    const savepointPromise = client\n      .savepoint<void>(state.name, async (savepointClient) => {\n        try {\n          setClient(savepointClient);\n\n          const res = await this.queryClient<T>(\n            savepointClient,\n            text,\n            values,\n            arraysMode,\n          );\n          resultResolve(res as QueryResult<T>);\n        } catch (err) {\n          resultReject(err);\n          throw err;\n        }\n\n        return promise;\n      })\n      .finally(() => {\n        setClient(client);\n      });\n\n    state.activeSavepoint = {\n      async release() {\n        resolve();\n        await savepointPromise;\n      },\n      async rollback(err) {\n        reject(err);\n        await savepointPromise.catch(noop);\n      },\n    };\n\n    return resultPromise;\n  },\n\n  close(client: postgres.Sql): Promise<void> {\n    return client.end();\n  },\n};\n\nconst makePostgresJsResult = (\n  result: RawResult,\n  arraysMode?: boolean,\n): QueryResult => {\n  return arraysMode\n    ? new PostgresJsArraysResult(result)\n    : new PostgresJsResult(result);\n};\n"],"mappings":"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"}