@atscript/db-postgres 0.1.149 → 0.1.150

package/dist/index.cjs

@@ -138,6 +138,7 @@ const pgDialect = {
 			params: [pattern]
 		};
 	},
+	integerText: (expr) => `CAST(CAST(${expr} AS BIGINT) AS TEXT)`,
 	geoWithin(quotedCol, circle) {
 		return {
 			sql: `ST_DWithin(${quotedCol}, ST_SetSRID(ST_MakePoint(?, ?), 4326)::geography, ?)`,
@@ -912,16 +913,14 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		const colList = quotedKeys.join(", ");
 		return `${quotedKeys.length === 1 ? `${colList} =` : `(${colList}) IN`} (SELECT ${colList} FROM ${quotedTable} WHERE ${whereSql} LIMIT 1)`;
 	}
-	async updateOne(filter, data, ops, expectedVersion) {
+	async updateOne(filter, data, ops, expectedVersion, opts) {
 		const where = buildWhere(filter);
 		const tableName = this.resolveTableName();
 		const quotedTable = quoteTableName(tableName);
-		const limitedWhere = {
+		const { sql, params } = buildUpdate(tableName, data, {
 			sql: this._limitOnePredicate(quotedTable, where.sql),
 			params: where.params
-		};
-		const versionColumn = this._table.versionColumnPhysical;
-		const { sql, params } = buildUpdate(tableName, data, limitedWhere, void 0, ops, versionColumn, expectedVersion);
+		}, void 0, ops, this._versionColumnFor(opts, expectedVersion), expectedVersion);
 		this._log(sql, params);
 		const result = await this._wrapConstraintError(() => this._exec().run(sql, params));
 		return {
@@ -929,9 +928,9 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 			modifiedCount: result.affectedRows
 		};
 	}
-	async updateMany(filter, data, ops) {
+	async updateMany(filter, data, ops, opts) {
 		const where = buildWhere(filter);
-		const versionColumn = this._table.versionColumnPhysical;
+		const versionColumn = this._versionColumnFor(opts);
 		const { sql, params } = buildUpdate(this.resolveTableName(), data, where, void 0, ops, versionColumn);
 		this._log(sql, params);
 		const result = await this._wrapConstraintError(() => this._exec().run(sql, params));
@@ -1441,7 +1440,9 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 			},
 			createIndex: async (index) => {
 				if (index.type === "fulltext") {
-					const tsvectorExpr = this._buildTsvectorExpr(index.fields);
+					const textFields = (0, _atscript_db.splitFulltextFields)(index).text;
+					if (textFields.length === 0) return;
+					const tsvectorExpr = this._buildTsvectorExpr(textFields);
 					const sql = `CREATE INDEX IF NOT EXISTS ${qi(index.key)} ON ${quoteTableName(this.resolveTableName())} USING gin(to_tsvector('english', ${tsvectorExpr}))`;
 					this._log(sql);
 					await this._exec().exec(sql);
@@ -1535,12 +1536,14 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	getSearchIndexes() {
 		const indexes = [];
-		for (const index of this._table.indexes.values()) if (index.type === "fulltext") indexes.push({
+		const ftAll = [...this._table.indexes.values()].filter((i) => i.type === "fulltext");
+		const ftDefault = (0, _atscript_db.defaultFulltextIndex)(ftAll);
+		for (const index of ftAll) indexes.push({
 			name: index.key,
-			description: `GIN tsvector index on ${index.fields.map((f) => f.name).join(", ")}`,
+			description: (0, _atscript_db.describeFulltext)(index, (names) => `GIN tsvector index on ${names}`),
 			type: "text",
 			fields: this._indexLogicalPaths(index),
-			isDefault: indexes.length === 0
+			isDefault: index === ftDefault
 		});
 		let firstVector = true;
 		for (const [field, vec] of this._vectorFields) {
@@ -1591,12 +1594,24 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	_buildSearchWhere(text, query, indexName) {
 		const fulltextIndex = this._getFulltextIndex(indexName);
 		if (!fulltextIndex) throw new Error("No fulltext index found for search");
-		const tsvectorExpr = this._buildTsvectorExpr(fulltextIndex.fields);
+		const { text: textFields, integer: integerFields } = (0, _atscript_db.splitFulltextFields)(fulltextIndex);
 		const where = buildWhere(query.filter);
-		const tsqueryClause = `to_tsvector('english', ${tsvectorExpr}) @@ plainto_tsquery('english', ?)`;
+		const n = integerFields.length > 0 ? (0, _atscript_db.searchTermInteger)(text) : void 0;
+		const parts = [];
+		const params = [];
+		if (textFields.length > 0) {
+			const tsvectorExpr = this._buildTsvectorExpr(textFields);
+			parts.push(`to_tsvector('english', ${tsvectorExpr}) @@ plainto_tsquery('english', ?)`);
+			params.push(text);
+		}
+		if (n !== void 0) for (const f of integerFields) {
+			parts.push(`${qi(f.name)} = CAST(? AS BIGINT)`);
+			params.push(n);
+		}
+		const clause = (0, _atscript_db_sql_tools.orFragment)(parts, params);
 		return {
-			sql: where.sql === "1=1" ? tsqueryClause : `${where.sql} AND ${tsqueryClause}`,
-			params: [...where.params, text]
+			sql: where.sql === "1=1" ? clause.sql : `${where.sql} AND ${clause.sql}`,
+			params: [...where.params, ...clause.params]
 		};
 	}
 	/** Builds the tsvector SQL expression for a fulltext index's fields. Must match between index DDL and queries. */
@@ -1604,9 +1619,9 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		return fields.map((f) => `coalesce(${qi(f.name)}, '')`).join(" || ' ' || ");
 	}
 	_getFulltextIndex(indexName) {
-		for (const index of this._table.indexes.values()) if (index.type === "fulltext") {
-			if (!indexName || index.key === indexName) return index;
-		}
+		const ftAll = [...this._table.indexes.values()].filter((i) => i.type === "fulltext");
+		if (!indexName) return (0, _atscript_db.defaultFulltextIndex)(ftAll);
+		return ftAll.find((index) => index.key === indexName);
 	}
 	/**
 	* Detects pgvector support by attempting to enable the extension.

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair, TViewCapability } from "@atscript/db";
+import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateOptions, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair, TViewCapability } from "@atscript/db";
 import { TMetadataMap } from "@atscript/typescript/utils";
 import { TFilterVisitorOptions, TSqlFragment } from "@atscript/db-sql-tools";
 
@@ -189,8 +189,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
    * existing behavior rather than guess.
    */
   private _limitOnePredicate;
-  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number): Promise<TDbUpdateResult>;
-  updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps): Promise<TDbUpdateResult>;
+  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
+  updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
   replaceOne(filter: FilterExpr, data: Record<string, unknown>, expectedVersion?: number): Promise<TDbUpdateResult>;
   replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
   deleteOne(filter: FilterExpr): Promise<TDbDeleteResult>;

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair, TViewCapability } from "@atscript/db";
+import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateOptions, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair, TViewCapability } from "@atscript/db";
 import { TFilterVisitorOptions, TSqlFragment } from "@atscript/db-sql-tools";
 import { TMetadataMap } from "@atscript/typescript/utils";
 
@@ -189,8 +189,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
    * existing behavior rather than guess.
    */
   private _limitOnePredicate;
-  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number): Promise<TDbUpdateResult>;
-  updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps): Promise<TDbUpdateResult>;
+  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
+  updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
   replaceOne(filter: FilterExpr, data: Record<string, unknown>, expectedVersion?: number): Promise<TDbUpdateResult>;
   replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
   deleteOne(filter: FilterExpr): Promise<TDbDeleteResult>;

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, ALL_VIEW_CAPABILITIES, BaseDbAdapter, DbError, DbSpace, bucketTimeZoneUnavailable, fkColumns, isColumnTypeChanged, uniqueKeyTuple, vectorIndexNotFoundMessage } from "@atscript/db";
+import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, ALL_VIEW_CAPABILITIES, BaseDbAdapter, DbError, DbSpace, bucketTimeZoneUnavailable, defaultFulltextIndex, describeFulltext, fkColumns, isColumnTypeChanged, searchTermInteger, splitFulltextFields, uniqueKeyTuple, vectorIndexNotFoundMessage } from "@atscript/db";
 import { resolveAggregateSearch } from "@atscript/db/agg";
-import { SEARCH_SOURCE_ALIAS, arithOverflowError, buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildInsertMany, buildPartitionedSelect, buildSelect, buildUpdate, buildVectorSearchCount, buildVectorSearchSelect, buildWhere as buildWhere$1, chunkInsertRows, defaultValueForType, defaultValueToSqlLiteral, derivedColumnExpr, fillReplacePayload, finalizeParams, foreignKeySql, geoWindowFromControls, mapQueryErrors, normalizeGeoPointValue, numericOutOfRangeError, parseRegexString, quotedJsonPathSegments, renameGeoDistance, replaceColumnsFor, sqlStringLiteral, sqlTimeZoneLiteral, stripPartitionRowNumber, vectorDistanceSource } from "@atscript/db-sql-tools";
+import { SEARCH_SOURCE_ALIAS, arithOverflowError, buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildInsertMany, buildPartitionedSelect, buildSelect, buildUpdate, buildVectorSearchCount, buildVectorSearchSelect, buildWhere as buildWhere$1, chunkInsertRows, defaultValueForType, defaultValueToSqlLiteral, derivedColumnExpr, fillReplacePayload, finalizeParams, foreignKeySql, geoWindowFromControls, mapQueryErrors, normalizeGeoPointValue, numericOutOfRangeError, orFragment, parseRegexString, quotedJsonPathSegments, renameGeoDistance, replaceColumnsFor, sqlStringLiteral, sqlTimeZoneLiteral, stripPartitionRowNumber, vectorDistanceSource } from "@atscript/db-sql-tools";
 import { BUCKET_MAX_INSTANT, BUCKET_MIN_INSTANT } from "@uniqu/core";
 //#region src/insert-ignore.ts
 /**
@@ -137,6 +137,7 @@ const pgDialect = {
 			params: [pattern]
 		};
 	},
+	integerText: (expr) => `CAST(CAST(${expr} AS BIGINT) AS TEXT)`,
 	geoWithin(quotedCol, circle) {
 		return {
 			sql: `ST_DWithin(${quotedCol}, ST_SetSRID(ST_MakePoint(?, ?), 4326)::geography, ?)`,
@@ -911,16 +912,14 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		const colList = quotedKeys.join(", ");
 		return `${quotedKeys.length === 1 ? `${colList} =` : `(${colList}) IN`} (SELECT ${colList} FROM ${quotedTable} WHERE ${whereSql} LIMIT 1)`;
 	}
-	async updateOne(filter, data, ops, expectedVersion) {
+	async updateOne(filter, data, ops, expectedVersion, opts) {
 		const where = buildWhere(filter);
 		const tableName = this.resolveTableName();
 		const quotedTable = quoteTableName(tableName);
-		const limitedWhere = {
+		const { sql, params } = buildUpdate$1(tableName, data, {
 			sql: this._limitOnePredicate(quotedTable, where.sql),
 			params: where.params
-		};
-		const versionColumn = this._table.versionColumnPhysical;
-		const { sql, params } = buildUpdate$1(tableName, data, limitedWhere, void 0, ops, versionColumn, expectedVersion);
+		}, void 0, ops, this._versionColumnFor(opts, expectedVersion), expectedVersion);
 		this._log(sql, params);
 		const result = await this._wrapConstraintError(() => this._exec().run(sql, params));
 		return {
@@ -928,9 +927,9 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 			modifiedCount: result.affectedRows
 		};
 	}
-	async updateMany(filter, data, ops) {
+	async updateMany(filter, data, ops, opts) {
 		const where = buildWhere(filter);
-		const versionColumn = this._table.versionColumnPhysical;
+		const versionColumn = this._versionColumnFor(opts);
 		const { sql, params } = buildUpdate$1(this.resolveTableName(), data, where, void 0, ops, versionColumn);
 		this._log(sql, params);
 		const result = await this._wrapConstraintError(() => this._exec().run(sql, params));
@@ -1440,7 +1439,9 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 			},
 			createIndex: async (index) => {
 				if (index.type === "fulltext") {
-					const tsvectorExpr = this._buildTsvectorExpr(index.fields);
+					const textFields = splitFulltextFields(index).text;
+					if (textFields.length === 0) return;
+					const tsvectorExpr = this._buildTsvectorExpr(textFields);
 					const sql = `CREATE INDEX IF NOT EXISTS ${qi(index.key)} ON ${quoteTableName(this.resolveTableName())} USING gin(to_tsvector('english', ${tsvectorExpr}))`;
 					this._log(sql);
 					await this._exec().exec(sql);
@@ -1534,12 +1535,14 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	}
 	getSearchIndexes() {
 		const indexes = [];
-		for (const index of this._table.indexes.values()) if (index.type === "fulltext") indexes.push({
+		const ftAll = [...this._table.indexes.values()].filter((i) => i.type === "fulltext");
+		const ftDefault = defaultFulltextIndex(ftAll);
+		for (const index of ftAll) indexes.push({
 			name: index.key,
-			description: `GIN tsvector index on ${index.fields.map((f) => f.name).join(", ")}`,
+			description: describeFulltext(index, (names) => `GIN tsvector index on ${names}`),
 			type: "text",
 			fields: this._indexLogicalPaths(index),
-			isDefault: indexes.length === 0
+			isDefault: index === ftDefault
 		});
 		let firstVector = true;
 		for (const [field, vec] of this._vectorFields) {
@@ -1590,12 +1593,24 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	_buildSearchWhere(text, query, indexName) {
 		const fulltextIndex = this._getFulltextIndex(indexName);
 		if (!fulltextIndex) throw new Error("No fulltext index found for search");
-		const tsvectorExpr = this._buildTsvectorExpr(fulltextIndex.fields);
+		const { text: textFields, integer: integerFields } = splitFulltextFields(fulltextIndex);
 		const where = buildWhere(query.filter);
-		const tsqueryClause = `to_tsvector('english', ${tsvectorExpr}) @@ plainto_tsquery('english', ?)`;
+		const n = integerFields.length > 0 ? searchTermInteger(text) : void 0;
+		const parts = [];
+		const params = [];
+		if (textFields.length > 0) {
+			const tsvectorExpr = this._buildTsvectorExpr(textFields);
+			parts.push(`to_tsvector('english', ${tsvectorExpr}) @@ plainto_tsquery('english', ?)`);
+			params.push(text);
+		}
+		if (n !== void 0) for (const f of integerFields) {
+			parts.push(`${qi(f.name)} = CAST(? AS BIGINT)`);
+			params.push(n);
+		}
+		const clause = orFragment(parts, params);
 		return {
-			sql: where.sql === "1=1" ? tsqueryClause : `${where.sql} AND ${tsqueryClause}`,
-			params: [...where.params, text]
+			sql: where.sql === "1=1" ? clause.sql : `${where.sql} AND ${clause.sql}`,
+			params: [...where.params, ...clause.params]
 		};
 	}
 	/** Builds the tsvector SQL expression for a fulltext index's fields. Must match between index DDL and queries. */
@@ -1603,9 +1618,9 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		return fields.map((f) => `coalesce(${qi(f.name)}, '')`).join(" || ' ' || ");
 	}
 	_getFulltextIndex(indexName) {
-		for (const index of this._table.indexes.values()) if (index.type === "fulltext") {
-			if (!indexName || index.key === indexName) return index;
-		}
+		const ftAll = [...this._table.indexes.values()].filter((i) => i.type === "fulltext");
+		if (!indexName) return defaultFulltextIndex(ftAll);
+		return ftAll.find((index) => index.key === indexName);
 	}
 	/**
 	* Detects pgvector support by attempting to enable the extension.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-postgres",
-  "version": "0.1.149",
+  "version": "0.1.150",
   "description": "PostgreSQL adapter for @atscript/db with pg (node-postgres) driver support.",
   "keywords": [
     "atscript",
@@ -43,20 +43,20 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.100",
-    "@atscript/typescript": "^0.1.100",
+    "@atscript/core": "^0.1.101",
+    "@atscript/typescript": "^0.1.101",
     "@types/pg": "^8.11.0",
     "@uniqu/core": "^0.1.13",
     "pg": "^8.13.0",
-    "unplugin-atscript": "^0.1.100"
+    "unplugin-atscript": "^0.1.101"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.100",
-    "@atscript/typescript": "^0.1.100",
+    "@atscript/core": "^0.1.101",
+    "@atscript/typescript": "^0.1.101",
     "@uniqu/core": "^0.1.13",
     "pg": ">=8.0.0",
-    "@atscript/db-sql-tools": "^0.1.149",
-    "@atscript/db": "^0.1.149"
+    "@atscript/db": "^0.1.150",
+    "@atscript/db-sql-tools": "^0.1.150"
   },
   "peerDependenciesMeta": {
     "pg": {