@atscript/db-postgres 0.1.166 → 0.1.168

package/dist/index.cjs

@@ -187,6 +187,8 @@ const pgDialect = {
 		min: "BOOL_AND",
 		max: "BOOL_OR"
 	},
+	conditionalAggregate: "filter",
+	countDistinctColumns: (columns) => `COUNT(DISTINCT CASE WHEN ${columns.map((c) => `${c} IS NOT NULL`).join(" AND ")} THEN (${columns.join(", ")}) END)`,
 	/**
 	* SQLSTATE 22003 (`numeric_value_out_of_range`), a double overflow in
 	* aggregate arithmetic, is `INVALID_QUERY`; SQLSTATE 22023
@@ -819,6 +821,18 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	supportsAggregateExpressions() {
 		return true;
 	}
+	/** Conditional aggregates (`$where` on an aggregate `$select` entry). */
+	supportsConditionalAggregates() {
+		return true;
+	}
+	/** `countDistinct` over several fields. */
+	supportsDistinctFieldLists() {
+		return true;
+	}
+	/** Two-level aggregates (`$from`): the inner level is a derived table. */
+	supportsNestedAggregates() {
+		return true;
+	}
 	/** `$nulls` / `@db.sort.nulls` NULL placement — `NULLS FIRST` / `NULLS LAST`. */
 	supportsNullsPlacement() {
 		return true;
@@ -1773,6 +1787,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	async renameTable(oldName) {
 		const newName = this._table.tableName;
+		if (!await this.getObjectKind(oldName) && await this.getObjectKind(newName)) return;
 		const ddl = `ALTER TABLE ${quoteTableName(oldName)} RENAME TO ${qi(newName)}`;
 		this._log(ddl);
 		await this._exec().exec(ddl);
@@ -1802,7 +1817,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 			isUnmanaged: (name) => name.startsWith(PG_VECTOR_INDEX_PREFIX),
 			skipIndex: (index) => index.type === "geo" && !this._supportsGeo ? `[postgres] geo index "${index.name}" declared but PostGIS is not available — skipped` : void 0,
 			listExisting: async () => {
-				const rows = await this._exec().all(`SELECT i.relname AS name,
+				const rows = await this._exec().all(`SELECT i.relname AS name, pg_get_indexdef(x.indexrelid) AS def,
                   (SELECT array_agg(a.attname::text ORDER BY k.ord)
                    FROM unnest(x.indkey) WITH ORDINALITY AS k(attnum, ord)
                    JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = k.attnum
@@ -1815,15 +1830,17 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 				liveNames = new Set(rows.map((r) => r.name));
 				return rows.map((r) => ({
 					name: r.name,
-					columns: r.columns ?? void 0
+					columns: r.columns ?? void 0,
+					definition: tsConfigOfIndexDef(r.def)
 				}));
 			},
+			renderDesiredDefinition: (index) => index.type === "fulltext" ? pgTextSearchConfig(index) : void 0,
 			createIndex: async (index) => {
 				if (index.type === "fulltext") {
 					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}))`;
+					const sql = `CREATE INDEX IF NOT EXISTS ${qi(index.key)} ON ${quoteTableName(this.resolveTableName())} USING gin(to_tsvector('${pgTextSearchConfig(index)}', ${tsvectorExpr}))`;
 					this._log(sql);
 					await this._exec().exec(sql);
 					return;
@@ -1997,12 +2014,15 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		const equalities = n === void 0 ? [] : integerFields.map((f) => `${qi(f.name)} = CAST(? AS BIGINT)`);
 		let textRank;
 		if (textFields.length > 0) {
-			const tsvector = `to_tsvector('english', ${this._buildTsvectorExpr(textFields)})`;
-			parts.push(`${tsvector} @@ plainto_tsquery('english', ?)`);
-			params.push(text);
+			const config = pgTextSearchConfig(fulltextIndex);
+			const tsvector = `to_tsvector('${config}', ${this._buildTsvectorExpr(textFields)})`;
+			const { fn, term } = pgTsQuery(fulltextIndex, text);
+			const tsquery = `${fn}('${config}', ?)`;
+			parts.push(`${tsvector} @@ ${tsquery}`);
+			params.push(term);
 			textRank = {
-				sql: `${this._buildTsRankExpr(textFields, tsvector)} DESC`,
-				params: [text]
+				sql: `${this._buildTsRankExpr(textFields, tsvector, config, tsquery)} DESC`,
+				params: [term]
 			};
 		}
 		for (const eq of equalities) {
@@ -2030,8 +2050,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	* predicate keeps the unweighted indexed expression, so the GIN index serves
 	* it unchanged.
 	*/
-	_buildTsRankExpr(fields, tsvector) {
-		const query = `plainto_tsquery('english', ?)`;
+	_buildTsRankExpr(fields, tsvector, config, query) {
 		const distinct = [...new Set(fields.map(weightOf))].toSorted((a, b) => b - a);
 		if (distinct.length <= 1) return `ts_rank(${tsvector}, ${query})`;
 		const letters = [
@@ -2043,7 +2062,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		const bucketOf = (w) => Math.min(distinct.indexOf(w), 3);
 		const top = distinct[0];
 		const bucketWeights = letters.map((_, i) => distinct[Math.min(i, distinct.length - 1)] / top);
-		const vector = fields.map((f) => `setweight(to_tsvector('english', coalesce(${qi(f.name)}, '')), '${letters[bucketOf(weightOf(f))]}')`).join(" || ");
+		const vector = fields.map((f) => `setweight(to_tsvector('${config}', coalesce(${qi(f.name)}, '')), '${letters[bucketOf(weightOf(f))]}')`).join(" || ");
 		return `ts_rank('{${[...bucketWeights].toReversed().map((w) => Number(w.toFixed(6))).join(", ")}}', ${vector}, ${query})`;
 	}
 	/** Builds the tsvector SQL expression for a fulltext index's fields. Must match between index DDL and queries. */
@@ -2415,6 +2434,41 @@ function vectorToString(vector) {
 function keyColumns(detail) {
 	return (detail?.match(/Key \(([^)]+)\)=/)?.[1])?.split(",").map((c) => c.trim().replace(/^"|"$/g, ""));
 }
+/**
+* The text search configuration of a fulltext index: its
+* `@db.index.fulltext.language` (`none` → `simple`), `english` when unset.
+* Inlined into DDL and queries, so only the closed language list passes.
+*/
+function pgTextSearchConfig(index) {
+	const language = index.language;
+	if (language === void 0) return "english";
+	if (!_atscript_db.DB_FULLTEXT_LANGUAGES.includes(language)) throw new Error(`Unsupported fulltext language "${language}" on index "${index.name}"`);
+	return language === "none" ? "simple" : language;
+}
+/** The configuration of a `to_tsvector('<config>'::regconfig, …)` index definition, else `undefined`. */
+function tsConfigOfIndexDef(def) {
+	return def ? /to_tsvector\('([a-z_]+)'::regconfig/i.exec(def)?.[1] : void 0;
+}
+/**
+* The tsquery function and its text for a search: `plainto_tsquery` (every
+* word) by default; `websearch_to_tsquery` under `@db.index.fulltext.match`
+* (since 0.1.168) — `"any"` OR-s the terms (quoted phrases kept whole, no
+* `-` exclusions).
+*/
+function pgTsQuery(index, text) {
+	if (index.match === void 0) return {
+		fn: "plainto_tsquery",
+		term: text
+	};
+	if (index.match === "all") return {
+		fn: "websearch_to_tsquery",
+		term: text
+	};
+	return {
+		fn: "websearch_to_tsquery",
+		term: [...text.matchAll(/"[^"]*"|\S+/g)].map((m) => m[0].replace(/^-+/, "")).filter(Boolean).join(" or ")
+	};
+}
 /** A fulltext member's weight (`@db.index.fulltext 'idx', w`), `1` when unset. */
 function weightOf(f) {
 	return f.weight ?? 1;

package/dist/index.d.cts

@@ -176,6 +176,12 @@ declare class PostgresAdapter extends BaseDbAdapter {
   aggregateFns(): ReadonlySet<AggregateFn>;
   /** Arithmetic in an aggregate `$select` (`{ $expr }`, `{ $fn, $expr }`). */
   supportsAggregateExpressions(): boolean;
+  /** Conditional aggregates (`$where` on an aggregate `$select` entry). */
+  supportsConditionalAggregates(): boolean;
+  /** `countDistinct` over several fields. */
+  supportsDistinctFieldLists(): boolean;
+  /** Two-level aggregates (`$from`): the inner level is a derived table. */
+  supportsNestedAggregates(): boolean;
   /** `$nulls` / `@db.sort.nulls` NULL placement — `NULLS FIRST` / `NULLS LAST`. */
   supportsNullsPlacement(): boolean;
   /**

package/dist/index.d.mts

@@ -176,6 +176,12 @@ declare class PostgresAdapter extends BaseDbAdapter {
   aggregateFns(): ReadonlySet<AggregateFn>;
   /** Arithmetic in an aggregate `$select` (`{ $expr }`, `{ $fn, $expr }`). */
   supportsAggregateExpressions(): boolean;
+  /** Conditional aggregates (`$where` on an aggregate `$select` entry). */
+  supportsConditionalAggregates(): boolean;
+  /** `countDistinct` over several fields. */
+  supportsDistinctFieldLists(): boolean;
+  /** Two-level aggregates (`$from`): the inner level is a derived table. */
+  supportsNestedAggregates(): boolean;
   /** `$nulls` / `@db.sort.nulls` NULL placement — `NULLS FIRST` / `NULLS LAST`. */
   supportsNullsPlacement(): boolean;
   /**

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, ALL_ISOLATION_LEVELS, ALL_VIEW_CAPABILITIES, BaseDbAdapter, DbError, DbSpace, bucketTimeZoneUnavailable, constraintViolation, createChangeRecorder, defaultFulltextIndex, describeFulltext, fkKey, isColumnTypeChanged, resolveFulltextIndex, searchIndexNotFoundMessage, searchTermInteger, splitFulltextFields, uniqueKeyTuple, vectorIndexNotFoundMessage } from "@atscript/db";
+import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, ALL_ISOLATION_LEVELS, ALL_VIEW_CAPABILITIES, BaseDbAdapter, DB_FULLTEXT_LANGUAGES, DbError, DbSpace, bucketTimeZoneUnavailable, constraintViolation, createChangeRecorder, defaultFulltextIndex, describeFulltext, fkKey, isColumnTypeChanged, resolveFulltextIndex, searchIndexNotFoundMessage, 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, buildJsonColumnCopy, buildJsonifyText, buildKeyViolationCount, 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, searchRankOrder, sqlStringLiteral, sqlTimeZoneLiteral, stripPartitionRowNumber, unquoteSqlStringLiteral, vectorDistanceSource, writeLimitWhere } from "@atscript/db-sql-tools";
 import { BUCKET_MAX_INSTANT, BUCKET_MIN_INSTANT } from "@uniqu/core";
@@ -186,6 +186,8 @@ const pgDialect = {
 		min: "BOOL_AND",
 		max: "BOOL_OR"
 	},
+	conditionalAggregate: "filter",
+	countDistinctColumns: (columns) => `COUNT(DISTINCT CASE WHEN ${columns.map((c) => `${c} IS NOT NULL`).join(" AND ")} THEN (${columns.join(", ")}) END)`,
 	/**
 	* SQLSTATE 22003 (`numeric_value_out_of_range`), a double overflow in
 	* aggregate arithmetic, is `INVALID_QUERY`; SQLSTATE 22023
@@ -818,6 +820,18 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	supportsAggregateExpressions() {
 		return true;
 	}
+	/** Conditional aggregates (`$where` on an aggregate `$select` entry). */
+	supportsConditionalAggregates() {
+		return true;
+	}
+	/** `countDistinct` over several fields. */
+	supportsDistinctFieldLists() {
+		return true;
+	}
+	/** Two-level aggregates (`$from`): the inner level is a derived table. */
+	supportsNestedAggregates() {
+		return true;
+	}
 	/** `$nulls` / `@db.sort.nulls` NULL placement — `NULLS FIRST` / `NULLS LAST`. */
 	supportsNullsPlacement() {
 		return true;
@@ -1772,6 +1786,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	}
 	async renameTable(oldName) {
 		const newName = this._table.tableName;
+		if (!await this.getObjectKind(oldName) && await this.getObjectKind(newName)) return;
 		const ddl = `ALTER TABLE ${quoteTableName(oldName)} RENAME TO ${qi(newName)}`;
 		this._log(ddl);
 		await this._exec().exec(ddl);
@@ -1801,7 +1816,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 			isUnmanaged: (name) => name.startsWith(PG_VECTOR_INDEX_PREFIX),
 			skipIndex: (index) => index.type === "geo" && !this._supportsGeo ? `[postgres] geo index "${index.name}" declared but PostGIS is not available — skipped` : void 0,
 			listExisting: async () => {
-				const rows = await this._exec().all(`SELECT i.relname AS name,
+				const rows = await this._exec().all(`SELECT i.relname AS name, pg_get_indexdef(x.indexrelid) AS def,
                   (SELECT array_agg(a.attname::text ORDER BY k.ord)
                    FROM unnest(x.indkey) WITH ORDINALITY AS k(attnum, ord)
                    JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = k.attnum
@@ -1814,15 +1829,17 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 				liveNames = new Set(rows.map((r) => r.name));
 				return rows.map((r) => ({
 					name: r.name,
-					columns: r.columns ?? void 0
+					columns: r.columns ?? void 0,
+					definition: tsConfigOfIndexDef(r.def)
 				}));
 			},
+			renderDesiredDefinition: (index) => index.type === "fulltext" ? pgTextSearchConfig(index) : void 0,
 			createIndex: async (index) => {
 				if (index.type === "fulltext") {
 					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}))`;
+					const sql = `CREATE INDEX IF NOT EXISTS ${qi(index.key)} ON ${quoteTableName(this.resolveTableName())} USING gin(to_tsvector('${pgTextSearchConfig(index)}', ${tsvectorExpr}))`;
 					this._log(sql);
 					await this._exec().exec(sql);
 					return;
@@ -1996,12 +2013,15 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		const equalities = n === void 0 ? [] : integerFields.map((f) => `${qi(f.name)} = CAST(? AS BIGINT)`);
 		let textRank;
 		if (textFields.length > 0) {
-			const tsvector = `to_tsvector('english', ${this._buildTsvectorExpr(textFields)})`;
-			parts.push(`${tsvector} @@ plainto_tsquery('english', ?)`);
-			params.push(text);
+			const config = pgTextSearchConfig(fulltextIndex);
+			const tsvector = `to_tsvector('${config}', ${this._buildTsvectorExpr(textFields)})`;
+			const { fn, term } = pgTsQuery(fulltextIndex, text);
+			const tsquery = `${fn}('${config}', ?)`;
+			parts.push(`${tsvector} @@ ${tsquery}`);
+			params.push(term);
 			textRank = {
-				sql: `${this._buildTsRankExpr(textFields, tsvector)} DESC`,
-				params: [text]
+				sql: `${this._buildTsRankExpr(textFields, tsvector, config, tsquery)} DESC`,
+				params: [term]
 			};
 		}
 		for (const eq of equalities) {
@@ -2029,8 +2049,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	* predicate keeps the unweighted indexed expression, so the GIN index serves
 	* it unchanged.
 	*/
-	_buildTsRankExpr(fields, tsvector) {
-		const query = `plainto_tsquery('english', ?)`;
+	_buildTsRankExpr(fields, tsvector, config, query) {
 		const distinct = [...new Set(fields.map(weightOf))].toSorted((a, b) => b - a);
 		if (distinct.length <= 1) return `ts_rank(${tsvector}, ${query})`;
 		const letters = [
@@ -2042,7 +2061,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		const bucketOf = (w) => Math.min(distinct.indexOf(w), 3);
 		const top = distinct[0];
 		const bucketWeights = letters.map((_, i) => distinct[Math.min(i, distinct.length - 1)] / top);
-		const vector = fields.map((f) => `setweight(to_tsvector('english', coalesce(${qi(f.name)}, '')), '${letters[bucketOf(weightOf(f))]}')`).join(" || ");
+		const vector = fields.map((f) => `setweight(to_tsvector('${config}', coalesce(${qi(f.name)}, '')), '${letters[bucketOf(weightOf(f))]}')`).join(" || ");
 		return `ts_rank('{${[...bucketWeights].toReversed().map((w) => Number(w.toFixed(6))).join(", ")}}', ${vector}, ${query})`;
 	}
 	/** Builds the tsvector SQL expression for a fulltext index's fields. Must match between index DDL and queries. */
@@ -2414,6 +2433,41 @@ function vectorToString(vector) {
 function keyColumns(detail) {
 	return (detail?.match(/Key \(([^)]+)\)=/)?.[1])?.split(",").map((c) => c.trim().replace(/^"|"$/g, ""));
 }
+/**
+* The text search configuration of a fulltext index: its
+* `@db.index.fulltext.language` (`none` → `simple`), `english` when unset.
+* Inlined into DDL and queries, so only the closed language list passes.
+*/
+function pgTextSearchConfig(index) {
+	const language = index.language;
+	if (language === void 0) return "english";
+	if (!DB_FULLTEXT_LANGUAGES.includes(language)) throw new Error(`Unsupported fulltext language "${language}" on index "${index.name}"`);
+	return language === "none" ? "simple" : language;
+}
+/** The configuration of a `to_tsvector('<config>'::regconfig, …)` index definition, else `undefined`. */
+function tsConfigOfIndexDef(def) {
+	return def ? /to_tsvector\('([a-z_]+)'::regconfig/i.exec(def)?.[1] : void 0;
+}
+/**
+* The tsquery function and its text for a search: `plainto_tsquery` (every
+* word) by default; `websearch_to_tsquery` under `@db.index.fulltext.match`
+* (since 0.1.168) — `"any"` OR-s the terms (quoted phrases kept whole, no
+* `-` exclusions).
+*/
+function pgTsQuery(index, text) {
+	if (index.match === void 0) return {
+		fn: "plainto_tsquery",
+		term: text
+	};
+	if (index.match === "all") return {
+		fn: "websearch_to_tsquery",
+		term: text
+	};
+	return {
+		fn: "websearch_to_tsquery",
+		term: [...text.matchAll(/"[^"]*"|\S+/g)].map((m) => m[0].replace(/^-+/, "")).filter(Boolean).join(" or ")
+	};
+}
 /** A fulltext member's weight (`@db.index.fulltext 'idx', w`), `1` when unset. */
 function weightOf(f) {
 	return f.weight ?? 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-postgres",
-  "version": "0.1.166",
+  "version": "0.1.168",
   "description": "PostgreSQL adapter for @atscript/db with pg (node-postgres) driver support.",
   "keywords": [
     "atscript",
@@ -42,21 +42,23 @@
   "publishConfig": {
     "access": "public"
   },
+  "dependencies": {
+    "@atscript/db-sql-tools": "^0.1.168"
+  },
   "devDependencies": {
-    "@atscript/core": "^0.2.1",
-    "@atscript/typescript": "^0.2.1",
+    "@atscript/core": "^0.2.4",
+    "@atscript/typescript": "^0.2.4",
     "@types/pg": "^8.11.0",
-    "@uniqu/core": "^0.1.15",
+    "@uniqu/core": "^0.2.0",
     "pg": "^8.13.0",
-    "unplugin-atscript": "^0.2.1"
+    "unplugin-atscript": "^0.2.4"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.2.1",
-    "@atscript/typescript": "^0.2.1",
-    "@uniqu/core": "^0.1.15",
+    "@atscript/core": "^0.2.4",
+    "@atscript/typescript": "^0.2.4",
+    "@uniqu/core": "^0.2.0",
     "pg": ">=8.0.0",
-    "@atscript/db": "^0.1.166",
-    "@atscript/db-sql-tools": "^0.1.166"
+    "@atscript/db": "^0.1.168"
   },
   "peerDependenciesMeta": {
     "pg": {