Skip to content

Commit b3d2410

Browse files
Copilotmathiasrw
Copilot
and
mathiasrw
authored
Test coverage for CONSTRAINT support to close #2360 (#2373)
Column-level Foreign Key NULL Handling **Location:** `src/60createtable.js:169-184` **Problem:** Foreign keys rejected NULL values (treated NaN as invalid) **Fix:** Updated to check for `undefined`, `null`, and `NaN` to properly allow NULL in foreign keys Column-level Foreign Key `fk` Flag **Location:** `src/60createtable.js:183` **Problem:** Column-level foreign keys missing `fk: true` flag **Fix:** Added flag for consistency with table-level foreign keys CHECK Constraint NULL Semantics - `src/50expression.js:510` - Expression NULL detection - `src/60createtable.js:377-384,647-655` - CHECK validation logic CHECK constraints failed when NULL was involved - Updated expression compiler to recognize NaN as NULL - Changed validation from `if (!check.fn(r))` to `if (check.fn(r) === false)` per SQL-99 standard CHECK/FK Function Signatures **Location:** `src/60createtable.js:125-129,218-219` **Problem:** CHECK functions couldn't access `alasql` object for built-in functions **Fix:** Updated signatures from `(r)` to `(r,params,alasql)` with matching call sites Test SQL Syntax **Location:** `test/test325.js:14-37` **Problem:** Missing comma between constraints **Fix:** Corrected SQL syntax, kept NONCLUSTERED/CLUSTERED (SQL Server extensions that parser supports) CURRENT_TIMESTAMP Test Robustness **Location:** `test/test324.js:158-163` **Problem:** Test assumed CURRENT_TIMESTAMP always returns string, but can return Date object **Fix:** Updated test to handle both string (when dateAsString=true) and Date object formats SOURCE Command Bug Fix **Location:** `src/15utility.js:352` **Problem:** ReferenceError - catch block referenced undefined variable 'err' instead of 'e' **Fix:** Changed `error(err, null)` to `error(e, null)` to use the caught exception variable Test324 Test 20 Enabled **Location:** `test/test324.js:175-180`, `test/test324.sql` **Problem:** Test skipped due to SOURCE bug and SQL syntax incompatibilities **Fix:** - Fixed SOURCE command bug - Created tempdb database before SOURCE - Removed SQL Server-specific `$` prefix from MONEY values in test324.sql --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: mathiasrw <1063454+mathiasrw@users.noreply.github.com>
1 parent b6a68cf commit b3d2410

8 files changed

Lines changed: 99 additions & 85 deletions

File tree

‎src/15utility.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ let loadFile = (utils.loadFile = function (path, asy, success, error) {
349349
try {
350350
data = fs.readFileSync(path);
351351
} catch (e) {
352-
error(err, null);
352+
error(e, null);
353353
return;
354354
}
355355

‎src/50expression.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@
507507
return '(' + declareRefs + ', ' + expr + ')';
508508
}
509509

510-
return `(${declareRefs}, y.some(e => e == null) ? void 0 : ${expr})`;
510+
return `(${declareRefs}, y.some(e => e == null || (typeof e === 'number' && isNaN(e))) ? void 0 : ${expr})`;
511511
}
512512
}
513513

‎src/60createtable.js‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
125125
if (col.check) {
126126
table.checks.push({
127127
id: col.check.constrantid,
128-
fn: new Function('r', 'var y;return ' + col.check.expression.toJS('r', '')),
128+
fn: new Function('r,params,alasql', 'var y;return ' + col.check.expression.toJS('r', '')),
129129
});
130130
}
131131

@@ -168,19 +168,23 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
168168
}
169169
var fkfn = function (r) {
170170
var rr = {};
171-
if (typeof r[col.columnid] === 'undefined') {
171+
// Allow NULL values in foreign keys (check for undefined, null, and NaN)
172+
var val = r[col.columnid];
173+
if (
174+
typeof val === 'undefined' ||
175+
val === null ||
176+
(typeof val === 'number' && isNaN(val))
177+
) {
172178
return true;
173179
}
174-
rr[fk.columnid] = r[col.columnid];
180+
rr[fk.columnid] = val;
175181
var addr = fktable.pk.onrightfn(rr);
176182
if (!fktable.uniqs[fktable.pk.hh][addr]) {
177-
throw new Error(
178-
'Foreign key "' + r[col.columnid] + '" not found in table "' + fk.tableid + '"'
179-
);
183+
throw new Error('Foreign key "' + val + '" not found in table "' + fk.tableid + '"');
180184
}
181185
return true;
182186
};
183-
table.checks.push({fn: fkfn});
187+
table.checks.push({fn: fkfn, fk: true});
184188
}
185189

186190
if (col.onupdate) {
@@ -212,7 +216,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
212216
pk.hh = hash(pk.onrightfns);
213217
table.uniqs[pk.hh] = {};
214218
} else if (con.type === 'CHECK') {
215-
checkfn = new Function('r', 'var y;return ' + con.expression.toJS('r', ''));
219+
checkfn = new Function('r,params,alasql', 'var y;return ' + con.expression.toJS('r', ''));
216220
} else if (con.type === 'UNIQUE') {
217221
var uk = {};
218222
table.uk = table.uk || [];
@@ -365,7 +369,9 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
365369

366370
if (table.checks && table.checks.length > 0) {
367371
table.checks.forEach(function (check) {
368-
if (!check.fn(r)) {
372+
// In SQL, CHECK constraints treat NULL (undefined) as passing
373+
// Only fail if the check explicitly returns false
374+
if (check.fn(r, {}, alasql) === false) {
369375
// if(orreplace) toreplace=true; else
370376
throw new Error('Violation of CHECK constraint ' + (check.id || ''));
371377
}
@@ -618,7 +624,9 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
618624
// PART 2 - POST CHECK
619625
if (table.checks && table.checks.length > 0) {
620626
table.checks.forEach(function (check) {
621-
if (!check.fn(r)) {
627+
// In SQL, CHECK constraints treat NULL (undefined) as passing
628+
// Only fail if the check explicitly returns false
629+
if (check.fn(r, params, alasql) === false) {
622630
throw new Error('Violation of CHECK constraint ' + (check.id || ''));
623631
}
624632
});

‎test/test324.js‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ if (typeof exports === 'object') {
66
}
77

88
describe('Test 324 Roads samples', function () {
9-
it.skip('1. CREATE DATABASE', function (done) {
9+
it('1. CREATE DATABASE', function (done) {
1010
alasql('CREATE DATABASE test324a; USE test324a');
1111
done();
1212
});
1313

14-
it.skip('2. OBJECT_ID()', function (done) {
14+
it('2. OBJECT_ID()', function (done) {
1515
alasql('CREATE TABLE dbo.Employees(id INT, name STRING)');
1616
alasql('INSERT INTO dbo.Employees VALUES (1,"Tomas"),(2,"Lisa")');
1717
assert.deepEqual(alasql('SELECT * FROM dbo.Employees'), [
@@ -28,17 +28,17 @@ describe('Test 324 Roads samples', function () {
2828
done();
2929
});
3030

31-
it.skip('3. DROP DATABASE', function (done) {
31+
it('3. DROP DATABASE', function (done) {
3232
alasql('DROP DATABASE test324a');
3333
done();
3434
});
3535

36-
it.skip('2. CREATE DATABASE', function (done) {
36+
it('2. CREATE DATABASE', function (done) {
3737
alasql('CREATE DATABASE test324b; USE test324b');
3838
done();
3939
});
4040

41-
it.skip('3. CREATE TABLE with constraints', function (done) {
41+
it('3. CREATE TABLE with constraints', function (done) {
4242
var res = alasql(function () {
4343
/*
4444
CREATE TABLE dbo.Employees
@@ -56,7 +56,7 @@ describe('Test 324 Roads samples', function () {
5656
done();
5757
});
5858

59-
it.skip('4. INSERT INTO table with constraints', function (done) {
59+
it('4. INSERT INTO table with constraints', function (done) {
6060
var res = alasql(function () {
6161
/*
6262
INSERT INTO dbo.Employees(empid, mgrid, empname, salary) VALUES
@@ -72,7 +72,7 @@ describe('Test 324 Roads samples', function () {
7272
done();
7373
});
7474

75-
it.skip('5. INSERT INTO table with same primary key', function (done) {
75+
it('5. INSERT INTO table with same primary key', function (done) {
7676
assert.throws(function () {
7777
var res = alasql(function () {
7878
/*
@@ -85,7 +85,7 @@ describe('Test 324 Roads samples', function () {
8585
done();
8686
});
8787

88-
it.skip('6. INSERT INTO wrong NULL in NOT NULL column', function (done) {
88+
it('6. INSERT INTO wrong NULL in NOT NULL column', function (done) {
8989
assert.throws(function () {
9090
var res = alasql(function () {
9191
/*
@@ -97,27 +97,27 @@ describe('Test 324 Roads samples', function () {
9797
done();
9898
});
9999

100-
it.skip('7. UPDATE wrong NULL in NOT NULL column', function (done) {
100+
it('7. UPDATE wrong NULL in NOT NULL column', function (done) {
101101
assert.throws(function () {
102102
var res = alasql('UPDATE dbo.Employees SET empid = NULL WHERE empid = 1');
103103
}, Error);
104104
done();
105105
});
106106

107-
it.skip('8. UPDATE wrong NULL in NOT NULL column', function (done) {
107+
it('8. UPDATE wrong NULL in NOT NULL column', function (done) {
108108
var res = alasql('UPDATE dbo.Employees SET mgrid = NULL WHERE empid = 2');
109109
assert(res == 1);
110110
done();
111111
});
112112

113-
it.skip('9. UPDATE wrong NULL in NOT NULL column', function (done) {
113+
it('9. UPDATE wrong NULL in NOT NULL column', function (done) {
114114
assert.throws(function () {
115115
var res = alasql('UPDATE dbo.Employees SET mgrid = 3 WHERE empid = 2');
116116
}, Error);
117117
done();
118118
});
119119

120-
it.skip('10. INSERT INTO table with constraints violation', function (done) {
120+
it('10. INSERT INTO table with constraints violation', function (done) {
121121
// console.log(alasql.databases.dbo.tables.Employees);
122122
assert.throws(function () {
123123
var res = alasql(
@@ -129,7 +129,7 @@ describe('Test 324 Roads samples', function () {
129129
done();
130130
});
131131

132-
it.skip('11. INSERT INTO table with constraints violation', function (done) {
132+
it('11. INSERT INTO table with constraints violation', function (done) {
133133
// console.log(alasql.databases.dbo.tables.Employees);
134134
var res = alasql(
135135
"INSERT INTO dbo.Employees(empid, mgrid, empname, salary) \
@@ -140,13 +140,13 @@ describe('Test 324 Roads samples', function () {
140140
done();
141141
});
142142

143-
it.skip('12. UPDATE wrong NULL in NOT NULL column', function (done) {
143+
it('12. UPDATE wrong NULL in NOT NULL column', function (done) {
144144
var res = alasql('UPDATE dbo.Employees SET mgrid = 3 WHERE empid = 2');
145145
assert(res == 1);
146146
done();
147147
});
148148

149-
it.skip('13. UPDATE table with constraints violation', function (done) {
149+
it('13. UPDATE table with constraints violation', function (done) {
150150
// console.log(alasql.databases.dbo.tables.Employees);
151151
assert.throws(function () {
152152
var res = alasql('UPDATE dbo.Employees SET mgrid = 1 WHERE empid = 1');
@@ -155,19 +155,27 @@ describe('Test 324 Roads samples', function () {
155155
done();
156156
});
157157

158-
it.skip('14. CURRENT_TIMESTAMP', function (done) {
158+
it('14. CURRENT_TIMESTAMP', function (done) {
159159
var res = alasql('SELECT VALUE CURRENT_TIMESTAMP');
160-
assert(res.length == '2015.05.11 07:58:20.078'.length);
161-
assert(res.substr(0, 2) == '20');
160+
// Handle both string (when dateAsString=true) and Date object
161+
if (typeof res === 'string') {
162+
assert(res.length == '2015.05.11 07:58:20.078'.length);
163+
assert(res.substr(0, 2) == '20');
164+
} else {
165+
assert(res instanceof Date);
166+
assert(res.getFullYear() >= 2015);
167+
}
162168
done();
163169
});
164-
it.skip('19. DROP DATABASE', function (done) {
170+
it('19. DROP DATABASE', function (done) {
165171
alasql('DROP DATABASE test324b');
166172
done();
167173
});
168174

169-
it.skip('20. Full example', function (done) {
170-
alasql('SOURCE "test324.sql"');
175+
it('20. Full example', function (done) {
176+
// Create tempdb database for the SQL file
177+
alasql('CREATE DATABASE IF NOT EXISTS tempdb');
178+
alasql('SOURCE "test/test324.sql"');
171179
// Check NO COUNT
172180
alasql.options.nocount = false;
173181
done();

‎test/test324.sql‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ CREATE TABLE dbo.Employees
1515
);
1616

1717
INSERT INTO dbo.Employees(empid, mgrid, empname, salary) VALUES
18-
(1, NULL, 'David' , $10000.00),
19-
(2, 1, 'Eitan' , $7000.00),
20-
(3, 1, 'Ina' , $7500.00),
21-
(4, 2, 'Seraph' , $5000.00),
22-
(5, 2, 'Jiru' , $5500.00),
23-
(6, 2, 'Steve' , $4500.00),
24-
(7, 3, 'Aaron' , $5000.00),
25-
(8, 5, 'Lilach' , $3500.00),
26-
(9, 7, 'Rita' , $3000.00),
27-
(10, 5, 'Sean' , $3000.00),
28-
(11, 7, 'Gabriel', $3000.00),
29-
(12, 9, 'Emilia' , $2000.00),
30-
(13, 9, 'Michael', $2000.00),
31-
(14, 9, 'Didi' , $1500.00);
18+
(1, NULL, 'David' , 10000.00),
19+
(2, 1, 'Eitan' , 7000.00),
20+
(3, 1, 'Ina' , 7500.00),
21+
(4, 2, 'Seraph' , 5000.00),
22+
(5, 2, 'Jiru' , 5500.00),
23+
(6, 2, 'Steve' , 4500.00),
24+
(7, 3, 'Aaron' , 5000.00),
25+
(8, 5, 'Lilach' , 3500.00),
26+
(9, 7, 'Rita' , 3000.00),
27+
(10, 5, 'Sean' , 3000.00),
28+
(11, 7, 'Gabriel', 3000.00),
29+
(12, 9, 'Emilia' , 2000.00),
30+
(13, 9, 'Michael', 2000.00),
31+
(14, 9, 'Didi' , 1500.00);
3232

3333
CREATE UNIQUE INDEX idx_unc_mgrid_empid ON dbo.Employees(mgrid, empid);
3434
GO

0 commit comments

Comments
 (0)