Fix reindex extending support of #2184

Author: mathiasrw

src/65createindex.js

@@ -19,7 +19,6 @@ yy.CreateIndex.prototype.toString = function () {
 
 // CREATE TABLE
 yy.CreateIndex.prototype.execute = function (databaseid, params, cb) {
-	//	var self = this;
 	var db = alasql.databases[this.table.databaseid || databaseid];
 	var tableid = this.table.tableid;
 	var table = db.tables[tableid];
@@ -43,14 +42,14 @@ yy.CreateIndex.prototype.execute = function (databaseid, params, cb) {
 			for (var i = 0, ilen = table.data.length; i < ilen; i++) {
 				var addr = rightfns(table.data[i]);
 				if (!ux[addr]) {
-					ux[addr] = {num: 0};
+					ux[addr] = { num: 0 };
 				}
 				ux[addr].num++;
 			}
 		}
 	} else {
 		var hh = hash(rightfns);
-		table.inddefs[indexid] = {rightfns: rightfns, hh: hh};
+		table.inddefs[indexid] = { rightfns: rightfns, hh: hh };
 		table.indices[hh] = {};
 
 		var ix = (table.indices[hh] = {});
@@ -77,13 +76,16 @@ yy.Reindex.prototype.toString = function () {
 	return s;
 };
 
-// CREATE TABLE
+// REINDEX
 yy.Reindex.prototype.execute = function (databaseid, params, cb) {
-	//	var self = this;
-	var db = alasql.databases[databaseid];
+	var db = alasql.databases[this.databaseid || databaseid];
 	var indexid = this.indexid;
-	//	console.log(db.indices);
 	var tableid = db.indices[indexid];
+
+	if (!tableid) {
+		throw new Error('Index "' + indexid + '" not found in db "' + db.databaseid + '"');
+	}
+
 	var table = db.tables[tableid];
 	table.indexColumns();
 	var res = 1;

src/alasqlparser.jison

@@ -3021,7 +3021,9 @@ DropTrigger
 	;
 
 Reindex
-	: REINDEX Literal
+	: REINDEX Literal DOT Literal
+		{ $$ = new yy.Reindex({databaseid: $2, indexid: $4});}
+	| REINDEX Literal
 		{ $$ = new yy.Reindex({indexid:$2});}
 	;
 

src/alasqlparser.js

@@ -0,0 +1,53 @@
+import {describe, expect, test, beforeAll, afterAll} from 'bun:test';
+import alasql from '..';
+
+describe('Test 2184 CREATE INDEX with qualified table name', function () {
+	test('1. CREATE DATABASE', function (done) {
+		alasql('CREATE DATABASE test403');
+		done();
+	});
+
+	test('2. Create table and index before insert with qualified name (no USE)', function (done) {
+		alasql('CREATE TABLE test403.one (a INT)');
+		alasql('CREATE INDEX xone ON test403.one (a)');
+		alasql('INSERT INTO test403.one (a) VALUES (100), (200), (300)');
+		done();
+	});
+
+	test('3. Create table and index after insert with qualified name (no USE)', function (done) {
+		alasql('CREATE TABLE test403.two (a INT)');
+		alasql('INSERT INTO test403.two (a) VALUES (100), (200), (300)');
+		alasql('CREATE INDEX xtwo ON test403.two (a)');
+		done();
+	});
+
+	test('4. Create unique index with qualified name (before insert)', function (done) {
+		alasql('CREATE TABLE test403.three (a INT)');
+		alasql('CREATE UNIQUE INDEX xthree ON test403.three (a)');
+		alasql('INSERT INTO test403.three (a) VALUES (100), (200), (300)');
+		done();
+	});
+
+	test('5. REINDEX from test403 database', function (done) {
+		alasql('USE test403');
+		var res = alasql('REINDEX xone');
+		expect(res == 1);
+		var res = alasql('REINDEX xtwo');
+		expect(res == 1);
+		done();
+	});
+
+	test('5. REINDEX from test403 database', function (done) {
+		alasql('USE test403');
+		var res = alasql('REINDEX test403.xone');
+		expect(res == 1);
+		var res = alasql('REINDEX test403.xtwo');
+		expect(res == 1);
+		done();
+	});
+
+	test('99. DROP DATABASE', function (done) {
+		alasql('DROP DATABASE test403');
+		done();
+	});
+});