diff --git a/src/box/sql.c b/src/box/sql.c
index 783f9c497ec82a5c5437ba8d7cefd2eee4b7ad62..df74301d2ab8f0259eca2c5483e289d40bacb6ec 100644
--- a/src/box/sql.c
+++ b/src/box/sql.c
@@ -1626,13 +1626,21 @@ sql_space_by_token(const struct Token *name)
char *name_str = sql_name_from_token(name);
struct space *res = space_by_name0(name_str);
sql_xfree(name_str);
+ if (res != NULL || name->z[0] == '"')
+ return res;
+ char *old_name_str = sql_legacy_name_new(name->z, name->n);
+ res = space_by_name0(old_name_str);
+ sql_xfree(old_name_str);
return res;
}
const struct space *
sql_space_by_src(const struct SrcList_item *src)
{
- return space_by_name0(src->zName);
+ struct space *res = space_by_name0(src->zName);
+ if (res != NULL || src->legacy_name == NULL)
+ return res;
+ return space_by_name0(src->legacy_name);
}
/**
diff --git a/src/box/sql/build.c b/src/box/sql/build.c
index b5bb5bd0b0ca39eb130432b9c58203479d309a9a..bccd2567af176092b0d2578bffc39178646053d8 100644
--- a/src/box/sql/build.c
+++ b/src/box/sql/build.c
@@ -1822,8 +1822,16 @@ sql_create_foreign_key(struct Parse *parse_context)
* self-referenced, but in this case parent (which is
* also child) table will definitely exist.
*/
- is_self_referenced = !is_alter_add_constr &&
- strcmp(parent_name, space->def->name) == 0;
+ if (!is_alter_add_constr) {
+ const char *space_name = space->def->name;
+ is_self_referenced = strcmp(parent_name, space_name) == 0;
+ if (!is_self_referenced && parent->z[0] != '"') {
+ char *old_name = sql_legacy_name_new(parent->z,
+ parent->n);
+ is_self_referenced = strcmp(old_name, space_name) == 0;
+ sql_xfree(old_name);
+ }
+ }
const struct space *parent_space = sql_space_by_token(parent);
if (parent_space == NULL && !is_self_referenced) {
diag_set(ClientError, ER_NO_SUCH_SPACE, parent_name);
@@ -3003,8 +3011,13 @@ sql_src_list_append(struct SrcList *list, struct Token *name_token)
list = new_list;
}
struct SrcList_item *item = &list->a[list->nSrc - 1];
- if (name_token != NULL)
+ if (name_token != NULL) {
item->zName = sql_name_from_token(name_token);
+ if (name_token->z[0] != '"') {
+ item->legacy_name = sql_legacy_name_new(name_token->z,
+ name_token->n);
+ }
+ }
return list;
}
@@ -3036,6 +3049,7 @@ sqlSrcListDelete(struct SrcList *pList)
for (pItem = pList->a, i = 0; i < pList->nSrc; i++, pItem++) {
sql_xfree(pItem->zName);
sql_xfree(pItem->zAlias);
+ sql_xfree(pItem->legacy_name);
if (pItem->fg.isIndexedBy)
sql_xfree(pItem->u1.zIndexedBy);
if (pItem->fg.isTabFunc)
diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c
index 2d62ffae2de35972e5a892c3897ed08a6a1a601f..c95b50fa45e626064bcf40235280d7dfdcf702ef 100644
--- a/src/box/sql/expr.c
+++ b/src/box/sql/expr.c
@@ -1659,6 +1659,7 @@ sqlSrcListDup(struct SrcList *p, int flags)
struct SrcList_item *pOldItem = &p->a[i];
pNewItem->zName = sql_xstrdup(pOldItem->zName);
pNewItem->zAlias = sql_xstrdup(pOldItem->zAlias);
+ pNewItem->legacy_name = sql_xstrdup(pOldItem->legacy_name);
pNewItem->fg = pOldItem->fg;
pNewItem->iCursor = pOldItem->iCursor;
pNewItem->addrFillSub = pOldItem->addrFillSub;
diff --git a/src/box/sql/select.c b/src/box/sql/select.c
index c456771b4f0d8bf7f88b2b23028aa658c7bc43c7..65c4a4eaa99c144ffb049b104815f161b3f2e203 100644
--- a/src/box/sql/select.c
+++ b/src/box/sql/select.c
@@ -4172,8 +4172,10 @@ flattenSubquery(Parse * pParse, /* Parsing context */
*/
sql_xfree(pSubitem->zName);
sql_xfree(pSubitem->zAlias);
+ sql_xfree(pSubitem->legacy_name);
pSubitem->zName = 0;
pSubitem->zAlias = 0;
+ pSubitem->legacy_name = NULL;
pSubitem->pSelect = 0;
/* Deletion of the pSubitem->space will be done when a corresponding
diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h
index 5beaf11a70a439331a4d01d8d1fcd5bae9369921..62a44e1cf61924d6c6b6051b3ef1329251233c8c 100644
--- a/src/box/sql/sqlInt.h
+++ b/src/box/sql/sqlInt.h
@@ -1593,6 +1593,8 @@ struct SrcList {
struct SrcList_item {
char *zName; /* Name of the table */
char *zAlias; /* The "B" part of a "A AS B" phrase. zName is the "A" */
+ /** Normalized name for the second lookup. */
+ char *legacy_name;
/** A space corresponding to zName */
struct space *space;
Select *pSelect; /* A SELECT statement used in place of a table name */
@@ -3091,15 +3093,17 @@ sql_tt_name_from_token(const struct Token *t)
}
/**
- * Return space with name defined by the token. Return NULL if the space was not
- * found.
+ * Return space with name defined by the token. A second lookup will be
+ * performed if the space is not found on the first try and token is not start
+ * with double quote. Return NULL if the space was not found.
*/
const struct space *
sql_space_by_token(const struct Token *name);
/**
- * Return space with name defined by the element of struct SrcList. Return NULL
- * if the space was not found.
+ * Return space with name defined by the element of struct SrcList. A second
+ * lookup will be performed if the space is not found on the first try and field
+ * legacy_name of the src is not NULL. Return NULL if the space was not found.
*/
const struct space *
sql_space_by_src(const struct SrcList_item *src);
diff --git a/src/box/sql/trigger.c b/src/box/sql/trigger.c
index 085f3163fb571956cd8c14fbdea291b89326f673..91eaee062eedfe941c230587dd2306c310fb67d6 100644
--- a/src/box/sql/trigger.c
+++ b/src/box/sql/trigger.c
@@ -82,6 +82,11 @@ sql_trigger_begin(struct Parse *parse)
const char *table_name = alter_def->entity_name->a[0].zName;
uint32_t space_id = box_space_id_by_name(table_name,
strlen(table_name));
+ if (space_id == BOX_ID_NIL &&
+ alter_def->entity_name->a[0].legacy_name != NULL) {
+ char *old_name = alter_def->entity_name->a[0].legacy_name;
+ space_id = box_space_id_by_name(old_name, strlen(old_name));
+ }
if (space_id == BOX_ID_NIL) {
diag_set(ClientError, ER_NO_SUCH_SPACE, table_name);
goto set_tarantool_error_and_cleanup;
diff --git a/test/sql-luatest/gh_4467_sql_id_backwards_compatibility_test.lua b/test/sql-luatest/gh_4467_sql_id_backwards_compatibility_test.lua
index 3c917b3171018484978dd5fba461b099336d99a3..9ff8d22d21ee7a7b7456bc0ea38375a43cc73085 100644
--- a/test/sql-luatest/gh_4467_sql_id_backwards_compatibility_test.lua
+++ b/test/sql-luatest/gh_4467_sql_id_backwards_compatibility_test.lua
@@ -112,6 +112,18 @@ g.test_create_tuple_foreign_key = function()
REFERENCES tab(second));]])
t.assert(box.space.tab.foreign_key.one ~= nil);
box.space.tab:drop()
+
+ -- Make sure table name is looked up twice in tuple FK creation clause.
+ box.execute([[CREATE TABLE ASD(QWE INT PRIMARY KEY);]])
+ local sql = [[CREATE TABLE ASD1(QWE1 INT PRIMARY KEY, ZXC1 INT,
+ CONSTRAINT f1 FOREIGN KEY (ZXC1) REFERENCES Asd(QWE),
+ CONSTRAINT f2 FOREIGN KEY (ZXC1) REFERENCES asD1(QWE1));]]
+ t.assert_equals(box.execute(sql), {row_count = 1})
+ local foreign_key = box.space.ASD1.foreign_key
+ t.assert_equals(foreign_key.f1.space, box.space.ASD.id)
+ t.assert_equals(foreign_key.f2.space, box.space.ASD1.id)
+ box.space.ASD1:drop()
+ box.space.ASD:drop()
end)
end
@@ -123,6 +135,18 @@ g.test_create_field_foreign_key = function()
CONSTRAINT one REFERENCES tab(second));]])
t.assert(box.space.tab:format()[2].foreign_key.one ~= nil);
box.space.tab:drop()
+
+ -- Make sure table name is looked up twice in field FK creation clause.
+ box.execute([[CREATE TABLE ASD(QWE INT PRIMARY KEY);]])
+ local sql = [[CREATE TABLE ASD1(QWE1 INT PRIMARY KEY, ZXC1 INT
+ CONSTRAINT f1 REFERENCES Asd(QWE)
+ CONSTRAINT f2 REFERENCES asD1(QWE1));]]
+ t.assert_equals(box.execute(sql), {row_count = 1})
+ local foreign_key = box.space.ASD1:format()[2].foreign_key
+ t.assert_equals(foreign_key.f1.space, box.space.ASD.id)
+ t.assert_equals(foreign_key.f2.space, box.space.ASD1.id)
+ box.space.ASD1:drop()
+ box.space.ASD:drop()
end)
end
@@ -171,6 +195,12 @@ g.test_drop_table = function()
t.assert(box.space.Tab ~= nil);
box.execute([[DROP TABLE Tab;]])
t.assert(box.space.Tab == nil);
+
+ -- Make sure table name is looked up twice in DROP TABLE.
+ box.execute([[CREATE TABLE ASD(QWE INT PRIMARY KEY);]])
+ t.assert(box.space.ASD ~= nil);
+ box.execute([[DROP TABLE AsD;]])
+ t.assert(box.space.ASD == nil);
end)
end
@@ -181,6 +211,12 @@ g.test_select_from = function()
box.space.Tab:insert({123})
t.assert_equals(box.execute([[SELECT * FROM Tab;]]).rows, {{123}});
box.space.Tab:drop()
+
+ -- Make sure table name is looked up twice in SELECT FROM.
+ box.execute([[CREATE TABLE ASD(QWE INT PRIMARY KEY);]])
+ box.space.ASD:insert({3})
+ t.assert_equals(box.execute([[SELECT * FROM ASd;]]).rows, {{3}});
+ box.space.ASD:drop()
end)
end
@@ -192,6 +228,12 @@ g.test_drop_view = function()
t.assert(box.space.Vw ~= nil);
box.execute([[DROP VIEW Vw;]])
t.assert(box.space.Vw == nil);
+
+ -- Make sure table name is looked up twice in DROP VIEW.
+ box.execute([[CREATE VIEW VASD AS SELECT * from Tab;]])
+ t.assert(box.space.VASD ~= nil);
+ box.execute([[DROP VIEW vAsD;]])
+ t.assert(box.space.VASD == nil);
box.space.Tab:drop()
end)
end
@@ -216,6 +258,14 @@ g.test_delete_from = function()
t.assert_equals(box.execute([[DELETE FROM Tab;]]), {row_count = 1});
t.assert_equals(box.space.Tab:count(), 0)
box.space.Tab:drop()
+
+ -- Make sure table name is looked up twice in DELETE FROM.
+ box.execute([[CREATE TABLE ASD(QWE INT PRIMARY KEY);]])
+ box.space.ASD:insert({3})
+ t.assert_equals(box.space.ASD:count(), 1)
+ t.assert_equals(box.execute([[DELETE FROM asD;]]), {row_count = 1});
+ t.assert_equals(box.space.ASD:count(), 0)
+ box.space.ASD:drop()
end)
end
@@ -228,6 +278,14 @@ g.test_truncate = function()
t.assert_equals(box.execute([[TRUNCATE TABLE Tab;]]), {row_count = 0});
t.assert_equals(box.space.Tab:count(), 0)
box.space.Tab:drop()
+
+ -- Make sure table name is looked up twice in TRUNCATE.
+ box.execute([[CREATE TABLE ASD(QWE INT PRIMARY KEY);]])
+ box.space.ASD:insert({3})
+ t.assert_equals(box.space.ASD:count(), 1)
+ t.assert_equals(box.execute([[TRUNCATE TABLE Asd;]]), {row_count = 0});
+ t.assert_equals(box.space.ASD:count(), 0)
+ box.space.ASD:drop()
end)
end
@@ -243,6 +301,17 @@ g.test_update = function()
t.assert_equals(box.execute(sql), {row_count = 1});
t.assert_equals(box.space.Tab:select(), {{3, 11, -1}})
box.space.Tab:drop()
+
+ -- Make sure table name is looked up twice in UPDATE.
+ box.execute([[CREATE TABLE ASD(PK INT PRIMARY KEY, QWE INT, ZXC INT);]])
+ box.space.ASD:insert({3, 5, 7})
+ sql = [[UPDATE aSd SET QWE = 1, ZXC = 9;]]
+ t.assert_equals(box.execute(sql), {row_count = 1});
+ t.assert_equals(box.space.ASD:select(), {{3, 1, 9}})
+ sql = [[UPDATE asd SET (QWE, ZXC) = (11, -1);]]
+ t.assert_equals(box.execute(sql), {row_count = 1});
+ t.assert_equals(box.space.ASD:select(), {{3, 11, -1}})
+ box.space.ASD:drop()
end)
end
@@ -253,6 +322,12 @@ g.test_insert = function()
box.execute([[INSERT INTO Tab(Pk, Zxc) VALUES (123, 321);]])
t.assert_equals(box.space.Tab:select(), {{123, nil, 321}})
box.space.Tab:drop()
+
+ -- Make sure table name is looked up twice in INSERT.
+ box.execute([[CREATE TABLE ASD(PK INT PRIMARY KEY, QWE INT, ZXC INT);]])
+ box.execute([[INSERT INTO asd(PK, ZXC) VALUES (123, 321);]])
+ t.assert_equals(box.space.ASD:select(), {{123, nil, 321}})
+ box.space.ASD:drop()
end)
end
@@ -265,6 +340,13 @@ g.test_create_index = function()
t.assert_equals(box.execute(sql), {row_count = 1})
t.assert(box.space.Tab.index.In1 ~= nil)
box.space.Tab:drop()
+
+ -- Make sure table name is looked up twice in CREATE INDEX.
+ box.execute([[CREATE TABLE ASD(PK INT PRIMARY KEY, QWE INT, ZXC INT);]])
+ sql = [[CREATE INDEX IND ON Asd(ZXC, QWE);]]
+ t.assert_equals(box.execute(sql), {row_count = 1})
+ t.assert(box.space.ASD.index.IND ~= nil)
+ box.space.ASD:drop()
end)
end
@@ -278,6 +360,15 @@ g.test_drop_index = function()
t.assert_equals(box.execute(sql), {row_count = 1})
t.assert(box.space.Tab.index.In1 == nil)
box.space.Tab:drop()
+
+ -- Make sure table name is looked up twice in DROP INDEX.
+ box.execute([[CREATE TABLE ASD(PK INT PRIMARY KEY, QWE INT, ZXC INT);]])
+ box.execute([[CREATE INDEX IND ON aSd(ZXC, QWE);]])
+ t.assert(box.space.ASD.index.IND ~= nil)
+ sql = [[DROP INDEX IND ON asD;]]
+ t.assert_equals(box.execute(sql), {row_count = 1})
+ t.assert(box.space.ASD.index.IND == nil)
+ box.space.ASD:drop()
end)
end
@@ -290,6 +381,14 @@ g.test_pragma = function()
{1, 1, 'Qwe', 0, 'BINARY', 'integer'}}
t.assert_equals(box.execute([[PRAGMA index_info(Tab.In1);]]).rows, exp)
box.space.Tab:drop()
+
+ -- Make sure table name is looked up twice in PRAGMA.
+ box.execute([[CREATE TABLE ASD(PK INT PRIMARY KEY, QWE INT, ZXC INT);]])
+ box.execute([[CREATE INDEX IND ON asD(ZXC, QWE);]])
+ local exp = {{0, 2, 'ZXC', 0, 'BINARY', 'integer'},
+ {1, 1, 'QWE', 0, 'BINARY', 'integer'}}
+ t.assert_equals(box.execute([[PRAGMA index_info(aSD.IND);]]).rows, exp)
+ box.space.ASD:drop()
end)
end
@@ -300,6 +399,12 @@ g.test_show_create_table = function()
local _, err = box.execute([[SHOW CREATE TABLE Tab;]])
t.assert(err == nil)
box.space.Tab:drop()
+
+ -- Make sure table name is looked up twice in SHOW CREATE TABLE.
+ box.execute([[CREATE TABLE ASD(PK INT PRIMARY KEY);]])
+ _, err = box.execute([[SHOW CREATE TABLE ASd;]])
+ t.assert(err == nil)
+ box.space.ASD:drop()
end)
end
@@ -312,6 +417,14 @@ g.test_create_trigger = function()
t.assert_equals(box.execute(sql), {row_count = 1})
t.assert(box.space._trigger:get{'Tr1'} ~= nil)
box.space.Tab:drop()
+
+ -- Make sure table name is looked up twice in CREATE TRIGGER.
+ box.execute([[CREATE TABLE ASD(PK INT PRIMARY KEY);]])
+ sql = [[CREATE TRIGGER TR2 AFTER INSERT ON asd FOR EACH ROW
+ BEGIN SELECT 1; END;]]
+ t.assert_equals(box.execute(sql), {row_count = 1})
+ t.assert(box.space._trigger:get{'TR2'} ~= nil)
+ box.space.ASD:drop()
end)
end
@@ -338,6 +451,15 @@ g.test_rename = function()
t.assert(box.space.Tab == nil)
t.assert(box.space.Bat ~= nil)
box.space.Bat:drop()
+
+ -- Make sure table name is looked up twice in RENAME.
+ box.execute([[CREATE TABLE ASD(PK INT PRIMARY KEY);]])
+ t.assert(box.space.ASD ~= nil)
+ t.assert(box.space.DSA == nil)
+ box.execute([[ALTER TABLE Asd RENAME TO DSA;]])
+ t.assert(box.space.ASD == nil)
+ t.assert(box.space.DSA ~= nil)
+ box.space.DSA:drop()
end)
end
@@ -350,6 +472,14 @@ g.test_add_column = function()
t.assert_equals(#box.space.Tab:format(), 2)
t.assert_equals(box.space.Tab:format()[2].name, 'Two')
box.space.Tab:drop()
+
+ -- Make sure table name is looked up twice in ADD COLUMN.
+ box.execute([[CREATE TABLE ASD(PK INT PRIMARY KEY);]])
+ t.assert_equals(#box.space.ASD:format(), 1)
+ box.execute([[ALTER TABLE aSD ADD COLUMN TWO INT;]])
+ t.assert_equals(#box.space.ASD:format(), 2)
+ t.assert_equals(box.space.ASD:format()[2].name, 'TWO')
+ box.space.ASD:drop()
end)
end
@@ -384,6 +514,36 @@ g.test_add_constraint = function()
t.assert(box.space.Tab.foreign_key.Four ~= nil)
box.space.Tab:drop()
box.func.check_Tab_Three:drop()
+
+ -- Make sure table name is looked up twice in ADD CONSTRAINT.
+ box.execute([[CREATE TABLE ASD(FIRST INT PRIMARY KEY, SECOND INT);]])
+ box.space.ASD.index[0]:drop()
+ t.assert(box.space.ASD.index[0] == nil)
+ t.assert(box.space.ASD.constraint == nil)
+ t.assert(box.space.ASD.foreign_key == nil)
+ box.execute([[ALTER TABLE AsD ADD CONSTRAINT ONE PRIMARY KEY (FIRST);]])
+ t.assert_equals(box.space.ASD.index[0].name, 'ONE')
+ t.assert(box.space.ASD.index[1] == nil)
+ t.assert(box.space.ASD.constraint == nil)
+ t.assert(box.space.ASD.foreign_key == nil)
+ box.execute([[ALTER TABLE ASd ADD CONSTRAINT TWO UNIQUE (SECOND);]])
+ t.assert_equals(box.space.ASD.index[0].name, 'ONE')
+ t.assert_equals(box.space.ASD.index[1].name, 'TWO')
+ t.assert(box.space.ASD.constraint == nil)
+ t.assert(box.space.ASD.foreign_key == nil)
+ box.execute([[ALTER TABLE asD ADD CONSTRAINT THREE CHECK (FIRST < 5);]])
+ t.assert_equals(box.space.ASD.index[0].name, 'ONE')
+ t.assert_equals(box.space.ASD.index[1].name, 'TWO')
+ t.assert(box.space.ASD.constraint.THREE ~= nil)
+ t.assert(box.space.ASD.foreign_key == nil)
+ box.execute([[ALTER TABLE Asd ADD CONSTRAINT FOUR FOREIGN KEY (SECOND)
+ REFERENCES aSd(FIRST);]])
+ t.assert_equals(box.space.ASD.index[0].name, 'ONE')
+ t.assert_equals(box.space.ASD.index[1].name, 'TWO')
+ t.assert(box.space.ASD.constraint.THREE ~= nil)
+ t.assert(box.space.ASD.foreign_key.FOUR ~= nil)
+ box.space.ASD:drop()
+ box.func.check_ASD_THREE:drop()
end)
end
@@ -425,5 +585,41 @@ g.test_drop_constraint = function()
t.assert(box.space.Tab.foreign_key == nil)
box.space.Tab:drop()
box.func.check_Tab_Three:drop()
+
+ -- Make sure table name is looked up twice in DROP CONSTRAINT.
+ box.execute([[CREATE TABLE ASD(FIRST INT PRIMARY KEY, SECOND INT);]])
+ box.space.ASD.index[0]:drop()
+ box.execute([[ALTER TABLE AsD ADD CONSTRAINT ONE PRIMARY KEY (FIRST);]])
+ box.execute([[ALTER TABLE ASd ADD CONSTRAINT TWO UNIQUE (SECOND);]])
+ box.execute([[ALTER TABLE asD ADD CONSTRAINT THREE CHECK (FIRST < 5);]])
+ box.execute([[ALTER TABLE Asd ADD CONSTRAINT FOUR FOREIGN KEY (SECOND)
+ REFERENCES aSd(FIRST);]])
+ t.assert_equals(box.space.ASD.index[0].name, 'ONE')
+ t.assert_equals(box.space.ASD.index[1].name, 'TWO')
+ t.assert(box.space.ASD.constraint.THREE ~= nil)
+ t.assert(box.space.ASD.foreign_key.FOUR ~= nil)
+
+ box.execute([[ALTER TABLE Asd DROP CONSTRAINT FOUR;]])
+ t.assert_equals(box.space.ASD.index[0].name, 'ONE')
+ t.assert_equals(box.space.ASD.index[1].name, 'TWO')
+ t.assert(box.space.ASD.constraint.THREE ~= nil)
+ t.assert(box.space.ASD.foreign_key == nil)
+ box.execute([[ALTER TABLE aSd DROP CONSTRAINT THREE;]])
+ t.assert_equals(box.space.ASD.index[0].name, 'ONE')
+ t.assert_equals(box.space.ASD.index[1].name, 'TWO')
+ t.assert(box.space.ASD.constraint == nil)
+ t.assert(box.space.ASD.foreign_key == nil)
+ box.execute([[ALTER TABLE asD DROP CONSTRAINT TWO;]])
+ t.assert_equals(box.space.ASD.index[0].name, 'ONE')
+ t.assert(box.space.ASD.index[1] == nil)
+ t.assert(box.space.ASD.constraint == nil)
+ t.assert(box.space.ASD.foreign_key == nil)
+ box.execute([[ALTER TABLE AsD DROP CONSTRAINT ONE;]])
+ t.assert(box.space.ASD.index[0] == nil)
+ t.assert(box.space.ASD.index[1] == nil)
+ t.assert(box.space.ASD.constraint == nil)
+ t.assert(box.space.ASD.foreign_key == nil)
+ box.space.ASD:drop()
+ box.func.check_ASD_THREE:drop()
end)
end