diff --git a/examples/cds.sql b/examples/cds.sql index ebc77267..e7bf8021 100644 --- a/examples/cds.sql +++ b/examples/cds.sql @@ -1,5 +1,6 @@ -CREATE DATABASE selenium COLLATE utf8_czech_ci; -USE selenium; +DROP DATABASE IF EXISTS adminer_test; +CREATE DATABASE adminer_test COLLATE utf8_czech_ci; +USE adminer_test; CREATE TABLE interprets ( id int NOT NULL auto_increment, @@ -10,7 +11,7 @@ CREATE TABLE interprets ( CREATE TABLE albums ( id int NOT NULL auto_increment, interpret int NOT NULL COMMENT 'Interpret', - name varchar(100) NOT NULL COMMENT 'Name', + title varchar(100) NOT NULL COMMENT 'Title', FOREIGN KEY (interpret) REFERENCES interprets(id), PRIMARY KEY (id) ) ENGINE=InnoDB COMMENT='Albums'; diff --git a/examples/editor-cds/index.php b/examples/editor-cds/index.php index 71615e9e..c49fad81 100644 --- a/examples/editor-cds/index.php +++ b/examples/editor-cds/index.php @@ -19,7 +19,7 @@ class Adminer { function database() { // will be escaped by Adminer - return 'selenium'; + return 'adminer_test'; } function login($login, $password) { diff --git a/tests/0-login.html b/tests/0-login.html index d1fe3c71..6263e746 100644 --- a/tests/0-login.html +++ b/tests/0-login.html @@ -34,7 +34,7 @@ type query - DROP DATABASE IF EXISTS selenium + DROP DATABASE IF EXISTS adminer_test clickAndWait diff --git a/tests/1-create-database.html b/tests/1-create-database.html index 6d841511..5ff2dc98 100644 --- a/tests/1-create-database.html +++ b/tests/1-create-database.html @@ -24,7 +24,7 @@ type name - selenium + adminer_test select diff --git a/tests/10-clone.html b/tests/10-clone.html index 43863fd5..02efa87f 100644 --- a/tests/10-clone.html +++ b/tests/10-clone.html @@ -13,7 +13,7 @@ open - /adminer/adminer/?db=selenium&select=albums + /adminer/adminer/?db=adminer_test&select=albums @@ -28,7 +28,7 @@ type - fields[album] + fields[title] Black and White diff --git a/tests/11-reference.html b/tests/11-reference.html index 184a66c0..02411c53 100644 --- a/tests/11-reference.html +++ b/tests/11-reference.html @@ -13,7 +13,7 @@ open - /adminer/adminer/?db=selenium&select=albums + /adminer/adminer/?db=adminer_test&select=albums diff --git a/tests/12-update.html b/tests/12-update.html index cea1564b..dfa19da9 100644 --- a/tests/12-update.html +++ b/tests/12-update.html @@ -13,12 +13,12 @@ open - /adminer/adminer/?db=selenium&edit=albums&where%5Bid%5D=2 + /adminer/adminer/?db=adminer_test&edit=albums&where%5Bid%5D=2 type - fields[album] + fields[title] Black or White diff --git a/tests/13-delete.html b/tests/13-delete.html index d4c9d5ad..9ecc09fb 100644 --- a/tests/13-delete.html +++ b/tests/13-delete.html @@ -13,7 +13,7 @@ open - /adminer/adminer/?db=selenium&select=albums + /adminer/adminer/?db=adminer_test&select=albums diff --git a/tests/14-truncate.html b/tests/14-truncate.html index 5fed08fd..176defb5 100644 --- a/tests/14-truncate.html +++ b/tests/14-truncate.html @@ -13,7 +13,7 @@ open - /adminer/adminer/?db=selenium&select=albums + /adminer/adminer/?db=adminer_test&select=albums diff --git a/tests/15-privileges.html b/tests/15-privileges.html index 5f5b7519..ec655068 100644 --- a/tests/15-privileges.html +++ b/tests/15-privileges.html @@ -19,12 +19,12 @@ type user - selenium + adminer_test type objects[0] - selenium.* + adminer_test.* click @@ -108,7 +108,7 @@ clickAndWait - //div[@id='content']/table/tbody/tr[td[2]='selenium']/td[1]/a + //div[@id='content']/table/tbody/tr[td[2]='adminer_test']/td[1]/a diff --git a/tests/17-export.html b/tests/17-export.html index 07b5a805..36f4010b 100644 --- a/tests/17-export.html +++ b/tests/17-export.html @@ -13,7 +13,7 @@ open - /adminer/adminer/?db=selenium&dump= + /adminer/adminer/?db=adminer_test&dump= diff --git a/tests/18-events.html b/tests/18-events.html index dfbd4fa2..c66da6a6 100644 --- a/tests/18-events.html +++ b/tests/18-events.html @@ -13,7 +13,7 @@ open - /adminer/adminer/?db=selenium&event= + /adminer/adminer/?db=adminer_test&event= diff --git a/tests/19-procedures.html b/tests/19-procedures.html index 3a1af7e3..0eccd296 100644 --- a/tests/19-procedures.html +++ b/tests/19-procedures.html @@ -13,7 +13,7 @@ open - /adminer/adminer/?db=selenium&procedure= + /adminer/adminer/?db=adminer_test&procedure= @@ -39,7 +39,7 @@ type fields[1.1][field] - album_name + album_title select @@ -54,7 +54,7 @@ type definition - BEGIN
SELECT id INTO @interpret FROM interprets WHERE interpret = interpret_name;
IF @interpret IS NULL THEN
    INSERT INTO interprets (interpret) VALUES (interpret_name);
    SET @interpret = LAST_INSERT_ID();
END IF;
INSERT INTO albums (interpret, album) VALUES (@interpret, album_name);
END + BEGIN
SELECT id INTO @interpret FROM interprets WHERE name = interpret_name;
IF @interpret IS NULL THEN
    INSERT INTO interprets (name) VALUES (interpret_name);
    SET @interpret = LAST_INSERT_ID();
END IF;
INSERT INTO albums (interpret, title) VALUES (@interpret, album_title);
END type @@ -83,7 +83,7 @@ type - fields[album_name] + fields[album_title] Dangerous @@ -98,7 +98,7 @@ clickAndWait - link=selenium + link=adminer_test diff --git a/tests/2-create-table.html b/tests/2-create-table.html index bf30f2ea..087954c6 100644 --- a/tests/2-create-table.html +++ b/tests/2-create-table.html @@ -13,7 +13,7 @@ open - /adminer/adminer/?db=selenium + /adminer/adminer/?db=adminer_test @@ -49,7 +49,7 @@ type fields[1.1][field] - interpret + name select diff --git a/tests/20-partitioning.html b/tests/20-partitioning.html index 2e459cec..b19ab1eb 100644 --- a/tests/20-partitioning.html +++ b/tests/20-partitioning.html @@ -13,7 +13,7 @@ open - /adminer/adminer/?db=selenium&table=interprets + /adminer/adminer/?db=adminer_test&table=interprets diff --git a/tests/22-history.html b/tests/22-history.html index 54341984..e6645957 100644 --- a/tests/22-history.html +++ b/tests/22-history.html @@ -18,7 +18,7 @@ verifyTextPresent - DROP DATABASE IF EXISTS selenium + DROP DATABASE IF EXISTS adminer_test diff --git a/tests/23-editor.html b/tests/23-editor.html index 489a670b..49807d75 100644 --- a/tests/23-editor.html +++ b/tests/23-editor.html @@ -17,7 +17,7 @@ - click + clickAndWait link=Interprets @@ -28,7 +28,7 @@ type - fields[interpret] + fields[name] Michael Jackson @@ -53,11 +53,11 @@ type - fields[album] + fields[title] Dangerous - click + clickAndWait //input[@value='Save'] diff --git a/tests/3-create-index.html b/tests/3-create-index.html index a232515f..dcb5020d 100644 --- a/tests/3-create-index.html +++ b/tests/3-create-index.html @@ -13,7 +13,7 @@ open - /adminer/adminer/?db=selenium&table=interprets + /adminer/adminer/?db=adminer_test&table=interprets @@ -29,7 +29,7 @@ select indexes[1][columns][1] - label=interpret + label=name clickAndWait diff --git a/tests/4-create-table-2.html b/tests/4-create-table-2.html index ca98ba7e..48c2b085 100644 --- a/tests/4-create-table-2.html +++ b/tests/4-create-table-2.html @@ -13,7 +13,7 @@ open - /adminer/adminer/?db=selenium&table=interprets&lang=en + /adminer/adminer/?db=adminer_test&table=interprets&lang=en @@ -54,7 +54,7 @@ type fields[1.11][field] - album + title select diff --git a/tests/5-foreign-key.html b/tests/5-foreign-key.html index 1eabcee8..1992e3a9 100644 --- a/tests/5-foreign-key.html +++ b/tests/5-foreign-key.html @@ -13,7 +13,7 @@ open - /adminer/adminer/?db=selenium&table=albums + /adminer/adminer/?db=adminer_test&table=albums diff --git a/tests/6-alter-table.html b/tests/6-alter-table.html index 37703ab0..d983a900 100644 --- a/tests/6-alter-table.html +++ b/tests/6-alter-table.html @@ -13,7 +13,7 @@ open - /adminer/adminer/?db=selenium&table=interprets + /adminer/adminer/?db=adminer_test&table=interprets diff --git a/tests/7-create-trigger.html b/tests/7-create-trigger.html index 92e1c3a1..8fae68f3 100644 --- a/tests/7-create-trigger.html +++ b/tests/7-create-trigger.html @@ -13,7 +13,7 @@ open - /adminer/adminer/?db=selenium&trigger=albums + /adminer/adminer/?db=adminer_test&trigger=albums @@ -24,7 +24,7 @@ type Statement - UPDATE interprets SET albums = albums + 1 WHERE interpret = NEW.interpret + UPDATE interprets SET albums = albums + 1 WHERE id = NEW.interpret clickAndWait diff --git a/tests/8-create-view.html b/tests/8-create-view.html index 98a9457a..ce8e4a44 100644 --- a/tests/8-create-view.html +++ b/tests/8-create-view.html @@ -13,13 +13,13 @@ open - /adminer/adminer/?db=selenium&view= + /adminer/adminer/?db=adminer_test&view= type select - SELECT albums.id, albums.album, interprets.interpret
FROM albums
LEFT JOIN interprets ON albums.interpret = interprets.id + SELECT albums.id, albums.title, interprets.name
FROM albums
LEFT JOIN interprets ON albums.interpret = interprets.id type diff --git a/tests/9-insert.html b/tests/9-insert.html index ce639aac..60eebf6c 100644 --- a/tests/9-insert.html +++ b/tests/9-insert.html @@ -13,12 +13,12 @@ open - /adminer/adminer/?db=selenium&edit=interprets + /adminer/adminer/?db=adminer_test&edit=interprets type - fields[interpret] + fields[name] Michael Jackson @@ -33,7 +33,7 @@ open - /adminer/adminer/?db=selenium&edit=albums + /adminer/adminer/?db=adminer_test&edit=albums @@ -43,7 +43,7 @@ type - fields[album] + fields[title] Dangerous