@atscript/db-postgres 0.1.142 → 0.1.143

package/dist/index.cjs

@@ -330,17 +330,6 @@ function buildCreateTable(table, fields, foreignKeys, options) {
 	}
 	return `CREATE TABLE IF NOT EXISTS ${quoteTableName(table)} (${colDefs.join(", ")})`;
 }
-/**
-* Offsets numbered placeholders ($1, $2, ...) in a SQL fragment by a given amount.
-* Used when WHERE params follow SET params in UPDATE statements.
-*/
-function offsetPlaceholders(fragment, offset) {
-	if (offset === 0) return fragment;
-	return {
-		sql: fragment.sql.replace(/\$(\d+)/g, (_, n) => `$${Number(n) + offset}`),
-		params: fragment.params
-	};
-}
 //#endregion
 //#region src/filter-builder.ts
 /**
@@ -1354,13 +1343,21 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		for (const index of this._table.indexes.values()) if (index.type === "fulltext") indexes.push({
 			name: index.key,
 			description: `GIN tsvector index on ${index.fields.map((f) => f.name).join(", ")}`,
-			type: "text"
-		});
-		for (const [field, vec] of this._vectorFields) indexes.push({
-			name: vec.indexName,
-			description: `vector(${vec.dimensions}) on ${field}, ${vec.similarity}`,
-			type: "vector"
+			type: "text",
+			fields: this._indexLogicalPaths(index),
+			isDefault: indexes.length === 0
 		});
+		let firstVector = true;
+		for (const [field, vec] of this._vectorFields) {
+			indexes.push({
+				name: vec.indexName,
+				description: `vector(${vec.dimensions}) on ${field}, ${vec.similarity}`,
+				type: "vector",
+				fields: [field],
+				isDefault: firstVector
+			});
+			firstVector = false;
+		}
 		return indexes;
 	}
 	async search(text, query, indexName) {
@@ -1465,7 +1462,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 				found = true;
 				break;
 			}
-			if (!found) throw new Error(`Vector index "${indexName}" not found`);
+			if (!found) throw new Error((0, _atscript_db.vectorIndexNotFoundMessage)(indexName));
 		} else {
 			const first = this._vectorFields.entries().next();
 			if (first.done) throw new Error("No vector fields defined");
@@ -1487,41 +1484,31 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 			vectorStr: vectorToString(vector)
 		};
 	}
-	_buildVectorSearchQuery(vector, query, indexName) {
-		const ctx = this._prepareVectorSearch(vector, query, indexName);
-		let inner = `SELECT *, (${qi(ctx.field)} ${ctx.distanceOp} $1::vector) AS _distance FROM ${quoteTableName(ctx.tableName)} WHERE ${offsetPlaceholders((0, _atscript_db_sql_tools.finalizeParams)(pgDialect, ctx.where), 1).sql}`;
-		const params = [ctx.vectorStr, ...ctx.where.params];
-		let sql = `SELECT * FROM (${inner}) _v`;
-		if (ctx.threshold !== void 0) {
-			sql += ` WHERE _distance <= $${params.length + 1}`;
-			params.push(thresholdToDistance(ctx.threshold, ctx.vec.similarity));
-		}
-		sql += ` ORDER BY _distance ASC`;
-		if (ctx.controls.$skip) {
-			sql += ` LIMIT $${params.length + 1} OFFSET $${params.length + 2}`;
-			params.push(ctx.controls.$limit || 1e3, ctx.controls.$skip);
-		} else {
-			sql += ` LIMIT $${params.length + 1}`;
-			params.push(ctx.controls.$limit || 20);
-		}
+	/** The row source + distance cap (threshold on pgvector's distance scale) of a vector search. */
+	_vectorSearchSource(ctx, withRows) {
+		const distExpr = {
+			sql: `(${qi(ctx.field)} ${ctx.distanceOp} ?::vector)`,
+			params: [ctx.vectorStr]
+		};
 		return {
-			sql,
-			params
+			source: (0, _atscript_db_sql_tools.vectorDistanceSource)(pgDialect, ctx.tableName, ctx.where, distExpr, withRows),
+			maxDistance: ctx.threshold === void 0 ? void 0 : thresholdToDistance(ctx.threshold, ctx.vec.similarity)
 		};
 	}
-	_buildVectorSearchCountQuery(vector, query, indexName) {
+	_buildVectorSearchQuery(vector, query, indexName) {
 		const ctx = this._prepareVectorSearch(vector, query, indexName);
-		let inner = `SELECT (${qi(ctx.field)} ${ctx.distanceOp} $1::vector) AS _distance FROM ${quoteTableName(ctx.tableName)} WHERE ${offsetPlaceholders((0, _atscript_db_sql_tools.finalizeParams)(pgDialect, ctx.where), 1).sql}`;
-		const params = [ctx.vectorStr, ...ctx.where.params];
-		let sql = `SELECT COUNT(*) AS cnt FROM (${inner}) _v`;
-		if (ctx.threshold !== void 0) {
-			sql += ` WHERE _distance <= $${params.length + 1}`;
-			params.push(thresholdToDistance(ctx.threshold, ctx.vec.similarity));
-		}
-		return {
-			sql,
-			params
-		};
+		const { source, maxDistance } = this._vectorSearchSource(ctx, true);
+		const skip = Number(ctx.controls.$skip) || 0;
+		return (0, _atscript_db_sql_tools.buildVectorSearchSelect)(pgDialect, source, {
+			select: ctx.controls.$select,
+			limit: Number(ctx.controls.$limit) || (skip ? 1e3 : 20),
+			skip,
+			maxDistance
+		});
+	}
+	_buildVectorSearchCountQuery(vector, query, indexName) {
+		const { source, maxDistance } = this._vectorSearchSource(this._prepareVectorSearch(vector, query, indexName), false);
+		return (0, _atscript_db_sql_tools.buildVectorSearchCount)(pgDialect, source, { maxDistance });
 	}
 	/** Resolves threshold: query-time $threshold > schema-level @db.search.vector.threshold. */
 	_resolveVectorThreshold(controls, indexName) {
@@ -1583,10 +1570,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		};
 	}
 	_buildGeoSearchSelect(ctx) {
-		return (0, _atscript_db_sql_tools.buildGeoSearchSelect)(pgDialect, ctx.tableName, ctx.where, ctx.dist, ctx.window, {
-			$limit: ctx.controls.$limit,
-			$skip: ctx.controls.$skip
-		});
+		return (0, _atscript_db_sql_tools.buildGeoSearchSelect)(pgDialect, ctx.tableName, ctx.where, ctx.dist, ctx.window, ctx.controls);
 	}
 };
 /** A text / character type: the value is converted by the assignment into the column. */

package/dist/index.d.cts

@@ -265,6 +265,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
   }>;
   /** Resolves vector field and computes shared context for vector search SQL builders. */
   private _prepareVectorSearch;
+  /** The row source + distance cap (threshold on pgvector's distance scale) of a vector search. */
+  private _vectorSearchSource;
   private _buildVectorSearchQuery;
   private _buildVectorSearchCountQuery;
   /** Resolves threshold: query-time $threshold > schema-level @db.search.vector.threshold. */

package/dist/index.d.mts

@@ -265,6 +265,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
   }>;
   /** Resolves vector field and computes shared context for vector search SQL builders. */
   private _prepareVectorSearch;
+  /** The row source + distance cap (threshold on pgvector's distance scale) of a vector search. */
+  private _vectorSearchSource;
   private _buildVectorSearchQuery;
   private _buildVectorSearchCountQuery;
   /** Resolves threshold: query-time $threshold > schema-level @db.search.vector.threshold. */

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, BaseDbAdapter, DbError, DbSpace, bucketTimeZoneUnavailable, isColumnTypeChanged } from "@atscript/db";
+import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, BaseDbAdapter, DbError, DbSpace, bucketTimeZoneUnavailable, isColumnTypeChanged, vectorIndexNotFoundMessage } from "@atscript/db";
 import { resolveAggregateSearch } from "@atscript/db/agg";
-import { buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildInsertMany, buildSelect, buildUpdate, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, derivedColumnExpr, fillReplacePayload, finalizeParams, geoWindowFromControls, insertManyColumns, normalizeGeoPointValue, parseRegexString, quotedJsonPathSegments, refActionToSql, renameGeoDistance, replaceColumnsFor, sqlStringLiteral, sqlTimeZoneLiteral } from "@atscript/db-sql-tools";
+import { buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildInsertMany, buildSelect, buildUpdate, buildVectorSearchCount, buildVectorSearchSelect, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, derivedColumnExpr, fillReplacePayload, finalizeParams, geoWindowFromControls, insertManyColumns, normalizeGeoPointValue, parseRegexString, quotedJsonPathSegments, refActionToSql, renameGeoDistance, replaceColumnsFor, sqlStringLiteral, sqlTimeZoneLiteral, vectorDistanceSource } from "@atscript/db-sql-tools";
 import { BUCKET_MAX_INSTANT, BUCKET_MIN_INSTANT } from "@uniqu/core";
 //#region src/sql-builder.ts
 /**
@@ -329,17 +329,6 @@ function buildCreateTable(table, fields, foreignKeys, options) {
 	}
 	return `CREATE TABLE IF NOT EXISTS ${quoteTableName(table)} (${colDefs.join(", ")})`;
 }
-/**
-* Offsets numbered placeholders ($1, $2, ...) in a SQL fragment by a given amount.
-* Used when WHERE params follow SET params in UPDATE statements.
-*/
-function offsetPlaceholders(fragment, offset) {
-	if (offset === 0) return fragment;
-	return {
-		sql: fragment.sql.replace(/\$(\d+)/g, (_, n) => `$${Number(n) + offset}`),
-		params: fragment.params
-	};
-}
 //#endregion
 //#region src/filter-builder.ts
 /**
@@ -1353,13 +1342,21 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		for (const index of this._table.indexes.values()) if (index.type === "fulltext") indexes.push({
 			name: index.key,
 			description: `GIN tsvector index on ${index.fields.map((f) => f.name).join(", ")}`,
-			type: "text"
-		});
-		for (const [field, vec] of this._vectorFields) indexes.push({
-			name: vec.indexName,
-			description: `vector(${vec.dimensions}) on ${field}, ${vec.similarity}`,
-			type: "vector"
+			type: "text",
+			fields: this._indexLogicalPaths(index),
+			isDefault: indexes.length === 0
 		});
+		let firstVector = true;
+		for (const [field, vec] of this._vectorFields) {
+			indexes.push({
+				name: vec.indexName,
+				description: `vector(${vec.dimensions}) on ${field}, ${vec.similarity}`,
+				type: "vector",
+				fields: [field],
+				isDefault: firstVector
+			});
+			firstVector = false;
+		}
 		return indexes;
 	}
 	async search(text, query, indexName) {
@@ -1464,7 +1461,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 				found = true;
 				break;
 			}
-			if (!found) throw new Error(`Vector index "${indexName}" not found`);
+			if (!found) throw new Error(vectorIndexNotFoundMessage(indexName));
 		} else {
 			const first = this._vectorFields.entries().next();
 			if (first.done) throw new Error("No vector fields defined");
@@ -1486,41 +1483,31 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 			vectorStr: vectorToString(vector)
 		};
 	}
-	_buildVectorSearchQuery(vector, query, indexName) {
-		const ctx = this._prepareVectorSearch(vector, query, indexName);
-		let inner = `SELECT *, (${qi(ctx.field)} ${ctx.distanceOp} $1::vector) AS _distance FROM ${quoteTableName(ctx.tableName)} WHERE ${offsetPlaceholders(finalizeParams(pgDialect, ctx.where), 1).sql}`;
-		const params = [ctx.vectorStr, ...ctx.where.params];
-		let sql = `SELECT * FROM (${inner}) _v`;
-		if (ctx.threshold !== void 0) {
-			sql += ` WHERE _distance <= $${params.length + 1}`;
-			params.push(thresholdToDistance(ctx.threshold, ctx.vec.similarity));
-		}
-		sql += ` ORDER BY _distance ASC`;
-		if (ctx.controls.$skip) {
-			sql += ` LIMIT $${params.length + 1} OFFSET $${params.length + 2}`;
-			params.push(ctx.controls.$limit || 1e3, ctx.controls.$skip);
-		} else {
-			sql += ` LIMIT $${params.length + 1}`;
-			params.push(ctx.controls.$limit || 20);
-		}
+	/** The row source + distance cap (threshold on pgvector's distance scale) of a vector search. */
+	_vectorSearchSource(ctx, withRows) {
+		const distExpr = {
+			sql: `(${qi(ctx.field)} ${ctx.distanceOp} ?::vector)`,
+			params: [ctx.vectorStr]
+		};
 		return {
-			sql,
-			params
+			source: vectorDistanceSource(pgDialect, ctx.tableName, ctx.where, distExpr, withRows),
+			maxDistance: ctx.threshold === void 0 ? void 0 : thresholdToDistance(ctx.threshold, ctx.vec.similarity)
 		};
 	}
-	_buildVectorSearchCountQuery(vector, query, indexName) {
+	_buildVectorSearchQuery(vector, query, indexName) {
 		const ctx = this._prepareVectorSearch(vector, query, indexName);
-		let inner = `SELECT (${qi(ctx.field)} ${ctx.distanceOp} $1::vector) AS _distance FROM ${quoteTableName(ctx.tableName)} WHERE ${offsetPlaceholders(finalizeParams(pgDialect, ctx.where), 1).sql}`;
-		const params = [ctx.vectorStr, ...ctx.where.params];
-		let sql = `SELECT COUNT(*) AS cnt FROM (${inner}) _v`;
-		if (ctx.threshold !== void 0) {
-			sql += ` WHERE _distance <= $${params.length + 1}`;
-			params.push(thresholdToDistance(ctx.threshold, ctx.vec.similarity));
-		}
-		return {
-			sql,
-			params
-		};
+		const { source, maxDistance } = this._vectorSearchSource(ctx, true);
+		const skip = Number(ctx.controls.$skip) || 0;
+		return buildVectorSearchSelect(pgDialect, source, {
+			select: ctx.controls.$select,
+			limit: Number(ctx.controls.$limit) || (skip ? 1e3 : 20),
+			skip,
+			maxDistance
+		});
+	}
+	_buildVectorSearchCountQuery(vector, query, indexName) {
+		const { source, maxDistance } = this._vectorSearchSource(this._prepareVectorSearch(vector, query, indexName), false);
+		return buildVectorSearchCount(pgDialect, source, { maxDistance });
 	}
 	/** Resolves threshold: query-time $threshold > schema-level @db.search.vector.threshold. */
 	_resolveVectorThreshold(controls, indexName) {
@@ -1582,10 +1569,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		};
 	}
 	_buildGeoSearchSelect(ctx) {
-		return buildGeoSearchSelect(pgDialect, ctx.tableName, ctx.where, ctx.dist, ctx.window, {
-			$limit: ctx.controls.$limit,
-			$skip: ctx.controls.$skip
-		});
+		return buildGeoSearchSelect(pgDialect, ctx.tableName, ctx.where, ctx.dist, ctx.window, ctx.controls);
 	}
 };
 /** A text / character type: the value is converted by the assignment into the column. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-postgres",
-  "version": "0.1.142",
+  "version": "0.1.143",
   "description": "PostgreSQL adapter for @atscript/db with pg (node-postgres) driver support.",
   "keywords": [
     "atscript",
@@ -55,8 +55,8 @@
     "@atscript/typescript": "^0.1.95",
     "@uniqu/core": "^0.1.11",
     "pg": ">=8.0.0",
-    "@atscript/db": "^0.1.142",
-    "@atscript/db-sql-tools": "^0.1.142"
+    "@atscript/db": "^0.1.143",
+    "@atscript/db-sql-tools": "^0.1.143"
   },
   "peerDependenciesMeta": {
     "pg": {