Let quoted column names sort via ORDER BY to fix #2039 (#2275)

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: mathiasrw <[email protected]>
Co-authored-by: Mathias Wulff <[email protected]>

Author: Copilot

src/426orderby.js

@@ -65,35 +65,27 @@ yy.Select.prototype.compileOrder = function (query, params) {
 						v = {_useColumnIndex: true, columnIndex: ord.expression.value - 1};
 					}
 				}
+			} else if (ord.expression instanceof yy.StringValue) {
+				// Treat quoted strings in ORDER BY as column references
+				var v = new yy.Column({columnid: ord.expression.value});
 			} else {
 				var v = ord.expression;
 			}
 			self.orderColumns.push(v);
 
 			var key = '$$$' + idx;
 
-			// Date conversion
+			// Date conversion - get columnid based on expression type
 			var dg = '';
-			//if(alasql.options.valueof)
+			var columnid;
 			if (ord.expression instanceof yy.Column) {
-				var columnid = ord.expression.columnid;
-				if (alasql.options.valueof) {
-					dg = '.valueOf()';
-				} else if (query.xcolumns[columnid]) {
-					var dbtypeid = query.xcolumns[columnid].dbtypeid;
-					if (
-						dbtypeid == 'DATE' ||
-						dbtypeid == 'DATETIME' ||
-						dbtypeid == 'DATETIME2' ||
-						dbtypeid == 'STRING' ||
-						dbtypeid == 'NUMBER'
-					)
-						dg = '.valueOf()';
-					// TODO Add other types mapping
-				}
+				columnid = ord.expression.columnid;
+			} else if (ord.expression instanceof yy.ParamValue) {
+				columnid = params[ord.expression.param];
+			} else if (ord.expression instanceof yy.StringValue) {
+				columnid = ord.expression.value;
 			}
-			if (ord.expression instanceof yy.ParamValue) {
-				var columnid = params[ord.expression.param];
+			if (columnid) {
 				if (alasql.options.valueof) {
 					dg = '.valueOf()';
 				} else if (query.xcolumns[columnid]) {
@@ -106,7 +98,6 @@ yy.Select.prototype.compileOrder = function (query, params) {
 						dbtypeid == 'NUMBER'
 					)
 						dg = '.valueOf()';
-					// TODO Add other types mapping
 				}
 			}
 			// COLLATE NOCASE

test/test2039.js

@@ -0,0 +1,59 @@
+if (typeof exports === 'object') {
+	var assert = require('assert');
+	var alasql = require('..');
+}
+
+describe('Test 2039 - Sorting does not occur for field names in quotation marks', function () {
+	const test = '2039';
+
+	before(function () {
+		alasql('create database test' + test);
+		alasql('use test' + test);
+	});
+
+	after(function () {
+		alasql('drop database test' + test);
+	});
+
+	it('A) Order by quoted column name should sort correctly', function () {
+		var data = [{Поле: 3}, {Поле: 1}, {Поле: 2}];
+		var res = alasql("select * from ? order by 'Поле'", [data]);
+		assert.deepEqual(res, [{Поле: 1}, {Поле: 2}, {Поле: 3}]);
+	});
+
+	it('B) Order by double-quoted column name should sort correctly', function () {
+		var data = [{Поле: 3}, {Поле: 1}, {Поле: 2}];
+		var res = alasql('select * from ? order by "Поле"', [data]);
+		assert.deepEqual(res, [{Поле: 1}, {Поле: 2}, {Поле: 3}]);
+	});
+
+	it('C) Order by quoted ASCII column name should sort correctly', function () {
+		var data = [{name: 'Charlie'}, {name: 'Alice'}, {name: 'Bob'}];
+		var res = alasql("select * from ? order by 'name'", [data]);
+		assert.deepEqual(res, [{name: 'Alice'}, {name: 'Bob'}, {name: 'Charlie'}]);
+	});
+
+	it('D) Order by quoted column name with DESC should sort correctly', function () {
+		var data = [{Поле: 1}, {Поле: 3}, {Поле: 2}];
+		var res = alasql("select * from ? order by 'Поле' DESC", [data]);
+		assert.deepEqual(res, [{Поле: 3}, {Поле: 2}, {Поле: 1}]);
+	});
+
+	it('E) Order by backtick-quoted column name should work (existing behavior)', function () {
+		var data = [{Поле: 3}, {Поле: 1}, {Поле: 2}];
+		var res = alasql('select * from ? order by `Поле`', [data]);
+		assert.deepEqual(res, [{Поле: 1}, {Поле: 2}, {Поле: 3}]);
+	});
+
+	it('F) Order by bracket-quoted column name should work (existing behavior)', function () {
+		var data = [{'Primary column': 3}, {'Primary column': 1}, {'Primary column': 2}];
+		var res = alasql('select * from ? order by [Primary column]', [data]);
+		assert.deepEqual(res, [{'Primary column': 1}, {'Primary column': 2}, {'Primary column': 3}]);
+	});
+
+	it('G) Order by quoted column name with spaces should sort correctly', function () {
+		var data = [{'my field': 3}, {'my field': 1}, {'my field': 2}];
+		var res = alasql("select * from ? order by 'my field'", [data]);
+		assert.deepEqual(res, [{'my field': 1}, {'my field': 2}, {'my field': 3}]);
+	});
+});