[WIP] Add support for SQL-99 output format modifiers

src/40select.js

@@ -529,18 +529,41 @@ function modify(query, res) {
 	// If dirtyColumns is true, we need to merge columns from data with existing columns
 	// This happens when SELECT * is used with dynamic data sources (like parameters)
 	if (query.dirtyColumns && res.length > 0) {
-		var allcol = {};
-		// First, scan the data to find all column names
-		for (var i = Math.min(res.length, alasql.options.columnlookup || 10) - 1; 0 <= i; i--) {
-			for (var key in res[i]) {
-				allcol[key] = true;
+		// Use Object.keys from the first complete row to preserve column order
+		// For sparse data (OUTER JOINs), find the row with the most keys
+		var maxKeys = Object.keys(res[0]);
+		var maxKeyCount = maxKeys.length;
+		var allcolSet = {};
+		var maxRows = Math.min(res.length, alasql.options.columnlookup || 10);
+
+		for (var i = 0; i < maxRows; i++) {
+			var rowKeys = Object.keys(res[i]);
+			if (rowKeys.length > maxKeyCount) {
+				maxKeyCount = rowKeys.length;
+				maxKeys = rowKeys;
+			}
+			// Collect all keys from this row (reuse rowKeys we already have)
+			for (var j = 0; j < rowKeys.length; j++) {
+				allcolSet[rowKeys[j]] = true;
 			}
 		}
 
-		// Create columns from data
-		var dataColumns = Object.keys(allcol).map(function (columnid) {
-			return {columnid: columnid};
-		});
+		// Build columns array: start with maxKeys, then add any missing keys
+		var dataColumns = [];
+		var addedKeys = {};
+
+		// Add keys from the row with most columns first (preserves natural order)
+		for (var k = 0; k < maxKeys.length; k++) {
+			dataColumns.push({columnid: maxKeys[k]});
+			addedKeys[maxKeys[k]] = true;
+		}
+
+		// Add any remaining keys not in maxKeys
+		for (var key in allcolSet) {
+			if (!addedKeys[key]) {
+				dataColumns.push({columnid: key});
+			}
+		}
 
 		// If we don't have any columns yet, just use the data columns
 		if (!columns || columns.length === 0) {

src/424select.js

@@ -75,6 +75,17 @@ function compileSelectStar(query, aliases, joinstar) {
 							value: value,
 							key: key,
 						};
+
+						// Only add to query.columns for new columns (not duplicates)
+						var coldef = {
+							columnid: tcol.columnid,
+							dbtypeid: tcol.dbtypeid,
+							dbsize: tcol.dbsize,
+							dbprecision: tcol.dbprecision,
+							dbenum: tcol.dbenum,
+						};
+						query.columns.push(coldef);
+						query.xcolumns[coldef.columnid] = coldef;
 					} else {
 						var newValue =
 							value + ' !== undefined ? ' + value + ' : ' + columnIds[tcol.columnid].value;
@@ -84,18 +95,6 @@ function compileSelectStar(query, aliases, joinstar) {
 				}
 
 				query.selectColumns[escapedColumnId] = true;
-
-				//			console.log('ok',tcol);
-
-				var coldef = {
-					columnid: tcol.columnid,
-					dbtypeid: tcol.dbtypeid,
-					dbsize: tcol.dbsize,
-					dbprecision: tcol.dbprecision,
-					dbenum: tcol.dbenum,
-				};
-				query.columns.push(coldef);
-				query.xcolumns[coldef.columnid] = coldef;
 			});
 			//console.log(999,columns);
 		} else {

test/test269.js

@@ -25,12 +25,12 @@ describe('Test 269 options', function () {
 		{b: 40, c: 400},
 	];
 
-	it.skip('1. Create database', function (done) {
+	it('1. Create database', function (done) {
 		alasql('CREATE DATABASE test269; USE test269');
 		done();
 	});
 
-	it.skip('2. by default', function (done) {
+	it('2. by default', function (done) {
 		alasql.options.modifier = undefined;
 		var res = alasql('SELECT t1.*,t2.* FROM ? t1 OUTER JOIN ? t2 USING b', [data1, data2]);
 		assert.deepEqual(res, [
@@ -43,31 +43,31 @@ describe('Test 269 options', function () {
 		done();
 	});
 
-	it.skip('3. VALUE', function (done) {
+	it('3. VALUE', function (done) {
 		alasql.options.modifier = 'VALUE';
 		var res = alasql('SELECT t1.*,t2.* FROM ? t1 OUTER JOIN ? t2 USING b', [data1, data2]);
 		assert.deepEqual(res, 1);
 
 		done();
 	});
 
-	it.skip('4. ROW', function (done) {
+	it('4. ROW', function (done) {
 		alasql.options.modifier = 'ROW';
 		var res = alasql('SELECT t1.*,t2.* FROM ? t1 OUTER JOIN ? t2 USING b', [data1, data2]);
 		assert.deepEqual(res, [1, 10, 100]);
 
 		done();
 	});
 
-	it.skip('5. COLUMN', function (done) {
+	it('5. COLUMN', function (done) {
 		alasql.options.modifier = 'COLUMN';
 		var res = alasql('SELECT t1.*,t2.* FROM ? t1 OUTER JOIN ? t2 USING b', [data1, data2]);
 		assert.deepEqual(res, [1, 2, 3, undefined]);
 
 		done();
 	});
 
-	it.skip('6. MATRIX', function (done) {
+	it('6. MATRIX', function (done) {
 		alasql.options.modifier = 'MATRIX';
 		var res = alasql('SELECT t1.*,t2.* FROM ? t1 OUTER JOIN ? t2 USING b', [data1, data2]);
 		//console.log(res);
@@ -82,7 +82,7 @@ describe('Test 269 options', function () {
 		done();
 	});
 
-	it.skip('6a. MATRIX', function (done) {
+	it('6a. MATRIX', function (done) {
 		alasql.options.modifier = 'MATRIX';
 		//    alasql.options.modifier = 'RECORDSET';
 		var res = alasql(
@@ -102,7 +102,7 @@ describe('Test 269 options', function () {
 		done();
 	});
 
-	it.skip('7. RECORDSET', function (done) {
+	it('7. RECORDSET', function (done) {
 		alasql.options.modifier = 'RECORDSET';
 		var res = alasql('SELECT t1.*,t2.* FROM ? t1 OUTER JOIN ? t2 USING b', [data1, data2]);
 		//console.log(res);
@@ -119,23 +119,23 @@ describe('Test 269 options', function () {
 		done();
 	});
 
-	it.skip('8. INDEX', function (done) {
+	it('8. INDEX', function (done) {
 		alasql.options.modifier = 'INDEX';
 		var res = alasql('SELECT t1.*,t2.* FROM ? t1 OUTER JOIN ? t2 USING b', [data1, data2]);
 		assert.deepEqual(res, {1: 10, 2: 20, 3: 30, undefined: 40});
 
 		done();
 	});
 
-	it.skip('9. TEXTSTRING', function (done) {
+	it('9. TEXTSTRING', function (done) {
 		alasql.options.modifier = 'TEXTSTRING';
 		var res = alasql('SELECT t1.*,t2.* FROM ? t1 OUTER JOIN ? t2 USING b', [data1, data2]);
 		assert.deepEqual(res, '1\n2\n3\n');
 
 		done();
 	});
 
-	it.skip('99. Drop phase', function (done) {
+	it('99. Drop phase', function (done) {
 		delete alasql.options.modifier;
 		alasql('DROP DATABASE test269');
 		done();