Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f02549
Initial plan
Copilot Dec 15, 2025
9b838c5
Enable test269.js output format modifiers and fix column ordering
Copilot Dec 15, 2025
4ac50ec
Enable test270.js RECORDSET tests (25/27 passing, 2 skipped due to du…
Copilot Dec 17, 2025
9f57ed3
Simplify column ordering fix - use first complete row's key order
Copilot Dec 17, 2025
9c60089
Fix code formatting with prettier
Copilot Dec 21, 2025
5d15d41
Simplify column ordering logic per code review
Copilot Dec 22, 2025
36a3769
Optimize column collection loop to avoid redundant iterations
Copilot Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 52 additions & 18 deletions src/40select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,16 +530,37 @@ function modify(query, res) {
// 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--) {
var maxKeys = [];
var maxKeyCount = 0;

// Scan the data to find all column names and track the row with most keys
// This helps handle sparse data from OUTER JOINs where some rows may be missing columns
for (var i = 0; i < Math.min(res.length, alasql.options.columnlookup || 10); i++) {
Comment thread
mathiasrw marked this conversation as resolved.
Outdated
var rowKeys = Object.keys(res[i]);
if (rowKeys.length > maxKeyCount) {
maxKeyCount = rowKeys.length;
maxKeys = rowKeys;
}
for (var key in res[i]) {
allcol[key] = true;
}
Comment thread
mathiasrw marked this conversation as resolved.
Outdated
}

// Create columns from data
var dataColumns = Object.keys(allcol).map(function (columnid) {
return {columnid: columnid};

// Use the order from the row with most keys, then add any missing keys
var dataColumns = [];
var addedKeys = {};

// First, add keys from the row with most keys (in their natural order)
maxKeys.forEach(function(key) {
dataColumns.push({columnid: key});
addedKeys[key] = true;
});

// Then add any remaining keys that weren't in that row
Object.keys(allcol).forEach(function(key) {
if (!addedKeys[key]) {
dataColumns.push({columnid: key});
}
});

// If we don't have any columns yet, just use the data columns
Expand Down Expand Up @@ -589,7 +610,8 @@ function modify(query, res) {
switch (modifier) {
case 'VALUE':
if (res.length === 0) return undefined;
const keyValue = columns && columns.length > 0 ? columns[0].columnid : Object.keys(res[0])[0];
// Use the first key from the actual data object to ensure correct order
const keyValue = Object.keys(res[0])[0];
return res[0][keyValue];

case 'ROW':
Expand All @@ -599,12 +621,8 @@ function modify(query, res) {
case 'COLUMN':
if (res.length === 0) return [];

let key;
if (columns && columns.length > 0) {
key = columns[0].columnid;
} else {
key = Object.keys(res[0])[0];
}
// Use the first key from the actual data object to ensure correct order
const key = Object.keys(res[0])[0];

let ar = [];
for (var i = 0, ilen = res.length; i < ilen; i++) {
Expand All @@ -620,12 +638,28 @@ function modify(query, res) {

case 'MATRIX':
if (res.length === 0) return undefined;
return res.map(row => columns.map(col => row[col.columnid]));
// Use columns array if available and non-empty, otherwise collect from data
let matrixKeys;
if (columns && columns.length > 0) {
matrixKeys = columns.map(col => col.columnid);
} else {
// Collect all unique keys from all rows to handle sparse data
const allKeys = {};
res.forEach(row => {
Object.keys(row).forEach(k => {
allKeys[k] = true;
});
});
matrixKeys = Object.keys(allKeys);
}
return res.map(row => matrixKeys.map(k => row[k]));

case 'INDEX':
if (res.length === 0) return undefined;
const keyIndex = columns && columns.length > 0 ? columns[0].columnid : Object.keys(res[0])[0];
const valIndex = columns && columns.length > 1 ? columns[1].columnid : Object.keys(res[0])[1];
// Use the keys from the actual data object to ensure correct order
const dataKeys = Object.keys(res[0]);
const keyIndex = dataKeys[0];
const valIndex = dataKeys[1];
return res.reduce((acc, row) => ({...acc, [row[keyIndex]]: row[valIndex]}), {});

case 'RECORDSET':
Expand All @@ -634,8 +668,8 @@ function modify(query, res) {

case 'TEXTSTRING':
if (res.length === 0) return undefined;
const keyTextString =
columns && columns.length > 0 ? columns[0].columnid : Object.keys(res[0])[0];
// Use the first key from the actual data object to ensure correct order
const keyTextString = Object.keys(res[0])[0];
return res.map(row => row[keyTextString]).join('\n');

case 'ALASQL_DETAILS':
Expand Down
23 changes: 11 additions & 12 deletions src/424select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
22 changes: 11 additions & 11 deletions test/test269.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, [
Expand All @@ -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);
Expand All @@ -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(
Expand All @@ -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);
Expand All @@ -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();
Expand Down
Loading