Fix CI/CD (#2291)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mathiasrw <1063454+mathiasrw@users.noreply.github.com>

Author: Copilot

src/50expression.js

@@ -189,6 +189,8 @@
 
 	const toTypeNumberOps = new Set(['-', '*', '/', '%', '^']);
 	const toTypeStringOps = new Set(['||']);
+	// Regex to detect identifiers that need bracket wrapping (spaces, dots, hyphens, square brackets)
+	const re_needsBrackets = /[\s.\-\[\]]/;
 	const toTypeBoolOps = new Set([
 		'AND',
 		'OR',
@@ -688,18 +690,34 @@
 			assign(this, params);
 		}
 
-		toString() {
-			let s = this.columnid;
+		// Check if identifier needs to be wrapped in brackets
+		// (numeric values, or contains spaces, dots, or other special characters)
+		static needsBrackets(id) {
+			if (id == null) return false;
+			// Numeric indices need brackets
+			if (id == +id) return true;
+			// Check for special characters that require brackets
+			return re_needsBrackets.test(id);
+		}
 
-			if (this.columnid == +this.columnid) {
-				s = '[' + this.columnid + ']';
+		static wrapId(id) {
+			if (Column.needsBrackets(id)) {
+				return '[' + id + ']';
 			}
+			return id;
+		}
+
+		toString() {
+			const colNeedsBrackets = Column.needsBrackets(this.columnid);
+			let s = colNeedsBrackets ? '[' + this.columnid + ']' : this.columnid;
 
 			if (this.tableid) {
-				s = this.tableid + (this.columnid === +this.columnid ? '' : '.') + s;
+				// Omit dot separator when columnid is wrapped in brackets (e.g., table[1] not table.[1])
+				const separator = colNeedsBrackets ? '' : '.';
+				s = Column.wrapId(this.tableid) + separator + s;
 
 				if (this.databaseid) {
-					s = this.databaseid + '.' + s;
+					s = Column.wrapId(this.databaseid) + '.' + s;
 				}
 			}
 

src/alasqlparser.jison

@@ -356,7 +356,7 @@ Literal
 			else $$ = $1.toLowerCase();
 		}
 	| BRALITERAL
-		{ $$ = {val:doubleq($1.substr(1,$1.length-2)), wrap:$1.substr(0,1)}; }
+		{ $$ = doubleq($1.substr(1,$1.length-2)); }
 	| error NonReserved
 		{ $$ = $2.toLowerCase() }
 	;

src/alasqlparser.js

@@ -0,0 +1,52 @@
+if (typeof exports === 'object') {
+	var assert = require('assert');
+	var alasql = require('..');
+}
+
+/*
+  Test for issue #1740 - Parse() then AST.toString() doesn't restore square brackets on column name
+  https://github.com/AlaSQL/alasql/issues/1740
+  
+  If a column name requires square brackets (e.g. due to a space or a period in the column name),
+  toString() on the AST should preserve the brackets.
+*/
+
+describe('Test 1740 - AST.toString() preserves square brackets on column names', function () {
+	it('A) Column with space in name', function () {
+		var sql = 'SELECT [Foo Bar] FROM tbl';
+		var ast = alasql.parse(sql);
+		assert.equal(ast.toString(), sql);
+	});
+
+	it('B) Column with dot in name', function () {
+		var sql = 'SELECT [Foo.Bar] FROM tbl';
+		var ast = alasql.parse(sql);
+		assert.equal(ast.toString(), sql);
+	});
+
+	it('C) Column with hyphen in name', function () {
+		var sql = 'SELECT [Foo-Bar] FROM tbl';
+		var ast = alasql.parse(sql);
+		assert.equal(ast.toString(), sql);
+	});
+
+	it('D) Numeric column index preserves brackets', function () {
+		var sql = 'SELECT [1] FROM tbl';
+		var ast = alasql.parse(sql);
+		assert.equal(ast.toString(), sql);
+	});
+
+	it('E) Table.column with bracket notation (dot omitted for numeric index)', function () {
+		// When using table alias with numeric column index, the dot is omitted in toString()
+		// Input: d.[1] -> Output: d[1]
+		var sql = 'SELECT d.[1] FROM tbl AS d';
+		var ast = alasql.parse(sql);
+		assert.equal(ast.toString(), 'SELECT d[1] FROM tbl AS d');
+	});
+
+	it('F) Normal column names without special characters', function () {
+		var sql = 'SELECT normalColumn FROM tbl';
+		var ast = alasql.parse(sql);
+		assert.equal(ast.toString(), sql);
+	});
+});