@tablecraft-app/plugin-postgres 1.10.4 → 1.12.0

package/index.js

@@ -10937,7 +10937,12 @@ var connectionUrlSchema = strictObject({
 		string$1(),
 		number$1(),
 		boolean()
-	]))).optional()
+	]))).optional(),
+	/**
+	* The JDBC SQL Server form, `scheme://host[\instance][:port][;name=value…]` (plan 055): parameters
+	* follow `;`, a `{…}` value may hold one, and `\instance` is the parameter `instanceName`.
+	*/
+	semicolonParams: boolean().optional()
 });
 /**
 * Which fields hold the server's address (decision 070), so the host can open an SSH tunnel and
@@ -11503,6 +11508,7 @@ var Q_QUOTE_PAIRS = /* @__PURE__ */ new Map([
 var STRING_QUOTE$1 = "'";
 var BRACKET_OPEN$1 = "[";
 var BRACKET_CLOSE$1 = "]";
+var VARIABLE_CHARS = /* @__PURE__ */ new Set(["@", "#"]);
 function isSpace(char) {
 	return char === " " || char === "	" || char === "\n" || char === "\r" || char === "\f" || char === "\v";
 }
@@ -11544,7 +11550,7 @@ var Lexer = class {
 		else if (char === "`") token = this.#quoted(at, "`", "quoted", false);
 		else if (char === BRACKET_OPEN$1 && this.options.bracketIdentifiers === true) token = this.#bracketed(at);
 		else if (char === "$" && this.options.dollarQuotes === true && this.#dollarTag(at) !== null) token = this.#dollarQuoted(at, this.#dollarTag(at) ?? "");
-		else if (isWordChar(char)) token = this.#word(at, delimiter);
+		else if (this.#isWordChar(char)) token = this.#word(at, delimiter);
 		else token = {
 			kind: "symbol",
 			from: at,
@@ -11553,6 +11559,9 @@ var Lexer = class {
 		this.position = token.to;
 		return token;
 	}
+	#isWordChar(char) {
+		return isWordChar(char) || this.options.variables === true && VARIABLE_CHARS.has(char);
+	}
 	#lineComment(from) {
 		const end = this.text.indexOf(NEWLINE$2, from);
 		return {
@@ -11648,7 +11657,7 @@ var Lexer = class {
 		const text = this.text;
 		const customDelimiter = delimiter !== ";";
 		let at = from;
-		while (at < text.length && isWordChar(text.charAt(at))) {
+		while (at < text.length && this.#isWordChar(text.charAt(at))) {
 			if (customDelimiter && at > from && text.startsWith(delimiter, at)) break;
 			at += 1;
 		}
@@ -12781,6 +12790,25 @@ function searchPathTarget(text, tokens) {
 		candidates: names
 	};
 }
+var ALTER_SESSION_PREFIX = [
+	"ALTER",
+	"SESSION",
+	"SET",
+	"CURRENT_SCHEMA",
+	"="
+];
+function alterSessionPrefix(text, tokens) {
+	return ALTER_SESSION_PREFIX.every((word, at) => wordAt$1(text, tokens, at) === word);
+}
+function alterSessionTarget(text, tokens) {
+	if (tokens.length !== ALTER_SESSION_PREFIX.length + 1 || !alterSessionPrefix(text, tokens)) return null;
+	const token = tokens[ALTER_SESSION_PREFIX.length];
+	const name = identifier$1(text, token);
+	return name === null || token?.kind === "string" ? null : {
+		kind: "schema",
+		candidates: [name]
+	};
+}
 var NAME_TOKENS = /* @__PURE__ */ new Set([
 	"word",
 	"quoted",
@@ -12836,7 +12864,8 @@ function searchPathListStart(text, tokens) {
 }
 /**
 * Where the caret at `offset` names a namespace a session-namespace statement of the dialect moves
-* to: `USE |` or the elements of `SET search_path TO a, |` and `SET SCHEMA |`. Null anywhere else,
+* to: `USE |`, `ALTER SESSION SET CURRENT_SCHEMA = |` or the elements of `SET search_path TO a, |`
+* and `SET SCHEMA |`. Null anywhere else,
 * and after a name whose closing quote is typed.
 */
 function namespaceSlotAt(text, offset, dialect) {
@@ -12872,6 +12901,17 @@ function namespaceSlotAt(text, offset, dialect) {
 				listed: []
 			};
 		}
+		if (form === "alterSessionSchema") {
+			if (prefix?.kind === "string" || before.length !== ALTER_SESSION_PREFIX.length) continue;
+			if (!alterSessionPrefix(text, before)) continue;
+			return {
+				kind: "schema",
+				from,
+				to: offset,
+				quote,
+				listed: []
+			};
+		}
 		const start = searchPathListStart(text, before);
 		if (start === null) continue;
 		if (start.single && before.length !== start.at) continue;
@@ -12896,14 +12936,25 @@ function namespaceTarget(sql, dialect) {
 	if (forms.length === 0) return null;
 	const tokens = significantTokens(sql, dialect).filter((token) => token.kind !== "delimiter");
 	for (const form of forms) {
-		const target = form === "use" ? useTarget(sql, tokens) : searchPathTarget(sql, tokens);
+		const target = TARGET_READERS[form](sql, tokens);
 		if (target !== null) return target;
 	}
 	return null;
 }
+var TARGET_READERS = {
+	use: useTarget,
+	searchPath: searchPathTarget,
+	alterSessionSchema: alterSessionTarget
+};
 var SWITCH_TARGETS = {
 	use: "topLevel",
-	searchPath: "schema"
+	searchPath: "schema",
+	alterSessionSchema: "schema"
+};
+var SWITCH_STATEMENTS = {
+	use: (quoted) => `USE ${quoted}`,
+	searchPath: (quoted) => `SET search_path TO ${quoted}`,
+	alterSessionSchema: (quoted) => `ALTER SESSION SET CURRENT_SCHEMA = ${quoted}`
 };
 /**
 * The console's namespace switch for a dialect moving its namespace by `form` (decision 060):
@@ -12917,7 +12968,7 @@ function namespaceSwitcher(form, quoteIdentifier) {
 		statement(path) {
 			const name = path.at(-1);
 			if (name === void 0) throw new PluginError("statementFailed", "A namespace switch names no namespace; pick one from the list.");
-			return form === "use" ? `USE ${quoteIdentifier(name)}` : `SET search_path TO ${quoteIdentifier(name)}`;
+			return SWITCH_STATEMENTS[form](quoteIdentifier(name));
 		}
 	};
 }
@@ -13420,6 +13471,8 @@ var BOOST = {
 	keyword: -10
 };
 var UNQUOTED_WORD = "^[A-Za-z0-9_$]*$";
+/** Where `@` and `#` start a name (`variables`), the typed `@@` stays part of what is filtered. */
+var VARIABLE_WORD = "^[@#]*[A-Za-z0-9_$]*$";
 var ALIAS_WORD_BREAK = /[^A-Za-z0-9]+|(?<=[a-z0-9])(?=[A-Z])/;
 var FALLBACK_ALIAS = "t";
 var QUOTES = /* @__PURE__ */ new Set([
@@ -13477,6 +13530,7 @@ function relationKind(relation) {
 /** The shared completion and navigation every built-in plugin spreads into its `SqlLanguage` (decision 028). */
 function sqlCompleter(options) {
 	const reserved = new Set(options.keywords.map((keyword) => keyword.toUpperCase()));
+	const unquotedWord = options.dialect.variables === true ? VARIABLE_WORD : UNQUOTED_WORD;
 	const { denotes, sameIdentifier, cteNamed, sourceNamed, serverOf, Lookup } = nameRules(options);
 	const specs = /* @__PURE__ */ new Map();
 	for (const spec of options.functions) {
@@ -13560,7 +13614,8 @@ function sqlCompleter(options) {
 	}
 	function aliasFor(name, taken) {
 		const initials = name.split(ALIAS_WORD_BREAK).filter((word) => word !== "").map((word) => word.charAt(0).toLowerCase()).join("");
-		const base = initials === "" || !options.plainIdentifier.test(initials) ? FALLBACK_ALIAS : initials;
+		const folded = options.identifierFolding === "upper" ? initials.toUpperCase() : initials;
+		const base = initials === "" || !options.plainIdentifier.test(folded) ? FALLBACK_ALIAS : initials;
 		let alias = base;
 		for (let suffix = 1; taken.has(alias) || reserved.has(alias.toUpperCase()); suffix += 1) alias = `${base}${String(suffix)}`;
 		taken.add(alias);
@@ -13585,7 +13640,7 @@ function sqlCompleter(options) {
 			if (source.qualifier.length === 0 && cteNamed(scope.query, source.name) !== void 0) continue;
 			const found = await lookup.relation(source.qualifier, source.name);
 			if (found === null) continue;
-			const near = source.alias === null ? relationReference(found.path, found.relation.name, lookup.current) : quoted(source.alias.name);
+			const near = source.alias === null ? relationReference(found.path, found.relation.name, lookup.current) : source.alias.quoted ? options.quoteIdentifier(source.alias.name) : source.alias.name;
 			for (const key of found.relation.foreignKeys) {
 				const alias = aliasFor(key.target.relation, new Set(taken));
 				const on = key.columns.map((column, at) => `${alias}.${quoted(key.target.columns[at] ?? column)} = ${near}.${quoted(column)}`).join(" AND ");
@@ -13695,7 +13750,7 @@ function sqlCompleter(options) {
 					from: slot.from,
 					to: slot.to,
 					items,
-					validFor: slot.quote === null ? UNQUOTED_WORD : null
+					validFor: slot.quote === null ? unquotedWord : null
 				};
 			}
 		}
@@ -13709,7 +13764,7 @@ function sqlCompleter(options) {
 			from: scope.prefixFrom - shift,
 			to: offset - shift,
 			items: typedQuote ? quotedLabels(items) : items,
-			validFor: typedQuote ? null : UNQUOTED_WORD
+			validFor: typedQuote ? null : unquotedWord
 		};
 	}
 	function sourceDeclaring(query, word) {
@@ -14281,6 +14336,7 @@ var PARAMETER_MARKS = /* @__PURE__ */ new Set([
 	"?"
 ]);
 var PARAMETER_START = /^[$@:]/;
+var PARAMETER_OR_TEMPORARY = /^[@#]/;
 /** Rows a statement may name without declaring them: PostgreSQL's `EXCLUDED`, a trigger's `NEW` and `OLD`. */
 var PSEUDO_RELATIONS = /* @__PURE__ */ new Set([
 	"EXCLUDED",
@@ -14399,6 +14455,7 @@ async function unresolvedRelation(view, query, source) {
 	if (view.verb === "SELECT" && view.roleOf(source) === "target") return [];
 	if (source.qualifier.length === 0 && view.rules.cteNamed(query, source.name) !== void 0) return [];
 	if (!source.name.quoted && NOT_RELATION_NAMES.has(source.name.name.toUpperCase())) return [];
+	if (!source.name.quoted && PARAMETER_OR_TEMPORARY.test(source.name.name)) return [];
 	const { lookup } = view;
 	let path = lookup.current;
 	if (source.qualifier.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablecraft-app/plugin-postgres",
-  "version": "1.10.4",
+  "version": "1.12.0",
   "description": "The PostgreSQL datasource plugin for TableCraft, downloaded by the app when a data source needs it.",
   "license": "MIT",
   "type": "module",
@@ -24,6 +24,6 @@
   },
   "tableCraft": {
     "id": "postgres",
-    "apiVersion": "1.4.0"
+    "apiVersion": "1.5.0"
   }
 }

package/table-craft-plugin.json

@@ -1,8 +1,8 @@
 {
   "id": "postgres",
   "name": "PostgreSQL",
-  "version": "1.10.4",
-  "apiVersion": "1.4.0",
+  "version": "1.12.0",
+  "apiVersion": "1.5.0",
   "entry": "index.js",
   "capabilities": [
     "sql",