Rename test database

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@905 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/examples/cds.sql b/examples/cds.sql
index ebc77267e18d7ef5858857cfc4941c87785ad97b..e7bf8021c4494e816e1a2b425f07e1bd683f2e77 100644 (file)
--- 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 71615e9eff6ac3bbddf12f4a1b008ab4c1a93e85..c49fad8177cfc1bdd87e91eaedaa906125592508 100644 (file)
--- 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 d1fe3c710ce0c88b7cf849ba3786bf6f05abf270..6263e74611ab1fe21240f130b2f0a5b25964b46f 100644 (file)
--- a/tests/0-login.html
+++ b/tests/0-login.html
@@ -34,7 +34,7 @@
 <tr>
        <td>type</td>
        <td>query</td>
-       <td>DROP DATABASE IF EXISTS selenium</td>
+       <td>DROP DATABASE IF EXISTS adminer_test</td>
 </tr>
 <tr>
        <td>clickAndWait</td>

diff --git a/tests/1-create-database.html b/tests/1-create-database.html
index 6d841511a6470768f7e8dfbc99a4ced30fb8f5a9..5ff2dc9833c3f4a5ec637410e3578cf09cbfdc57 100644 (file)
--- a/tests/1-create-database.html
+++ b/tests/1-create-database.html
@@ -24,7 +24,7 @@
 <tr>
        <td>type</td>
        <td>name</td>
-       <td>selenium</td>
+       <td>adminer_test</td>
 </tr>
 <tr>
        <td>select</td>

diff --git a/tests/10-clone.html b/tests/10-clone.html
index 43863fd5608712f1d3738338a5b35b5882c7c17c..02efa87f4eb95ceb0f76cf666ac17bda8f0351ae 100644 (file)
--- a/tests/10-clone.html
+++ b/tests/10-clone.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;select=albums</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;select=albums</td>
        <td></td>
 </tr>
 <tr>
@@ -28,7 +28,7 @@
 </tr>
 <tr>
        <td>type</td>
-       <td>fields[album]</td>
+       <td>fields[title]</td>
        <td>Black and White</td>
 </tr>
 <tr>

diff --git a/tests/11-reference.html b/tests/11-reference.html
index 184a66c0a9f7664248da58ccf07d97f6bd9a3f40..02411c53c6d7d045f637d304835ff1c96395efb0 100644 (file)
--- a/tests/11-reference.html
+++ b/tests/11-reference.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;select=albums</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;select=albums</td>
        <td></td>
 </tr>
 <tr>

diff --git a/tests/12-update.html b/tests/12-update.html
index cea1564ba993d7809c4a20a57d9adaffd9900b31..dfa19da9bb4c410787f5d96f1b61c8f199988291 100644 (file)
--- a/tests/12-update.html
+++ b/tests/12-update.html
@@ -13,12 +13,12 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;edit=albums&amp;where%5Bid%5D=2</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;edit=albums&amp;where%5Bid%5D=2</td>
        <td></td>
 </tr>
 <tr>
        <td>type</td>
-       <td>fields[album]</td>
+       <td>fields[title]</td>
        <td>Black or White</td>
 </tr>
 <tr>

diff --git a/tests/13-delete.html b/tests/13-delete.html
index d4c9d5ad9b4356718fd2e286b5bc82856c4b5579..9ecc09fb8f168c6e0dbdd04d66b48e9db06f6e21 100644 (file)
--- a/tests/13-delete.html
+++ b/tests/13-delete.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;select=albums</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;select=albums</td>
        <td></td>
 </tr>
 <tr>

diff --git a/tests/14-truncate.html b/tests/14-truncate.html
index 5fed08fdc4e1946c94ed1cae4d1e6c4ebca90fcd..176defb50489f0a2b97e1fde15fecb201ff84c7c 100644 (file)
--- a/tests/14-truncate.html
+++ b/tests/14-truncate.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;select=albums</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;select=albums</td>
        <td></td>
 </tr>
 <tr>

diff --git a/tests/15-privileges.html b/tests/15-privileges.html
index 5f5b7519a5d5960dbfe2b81f21930feed6e4c745..ec655068b225c694e92dd0572b57b8c7765753a2 100644 (file)
--- a/tests/15-privileges.html
+++ b/tests/15-privileges.html
@@ -19,12 +19,12 @@
 <tr>
        <td>type</td>
        <td>user</td>
-       <td>selenium</td>
+       <td>adminer_test</td>
 </tr>
 <tr>
        <td>type</td>
        <td>objects[0]</td>
-       <td>selenium.*</td>
+       <td>adminer_test.*</td>
 </tr>
 <tr>
        <td>click</td>
@@ -108,7 +108,7 @@
 </tr>
 <tr>
        <td>clickAndWait</td>
-       <td>//div[@id='content']/table/tbody/tr[td[2]='selenium']/td[1]/a</td>
+       <td>//div[@id='content']/table/tbody/tr[td[2]='adminer_test']/td[1]/a</td>
        <td></td>
 </tr>
 <tr>

diff --git a/tests/17-export.html b/tests/17-export.html
index 07b5a805f316e6ccf8529fb41732ac4d21668c43..36f4010b0ae93ba60ebb79c96e3cf303b0654496 100644 (file)
--- a/tests/17-export.html
+++ b/tests/17-export.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;dump=</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;dump=</td>
        <td></td>
 </tr>
 <tr>

diff --git a/tests/18-events.html b/tests/18-events.html
index dfbd4fa2d853c27781f9aca849273de77203cded..c66da6a632518c0a3e598ed0152def96e5cf9fea 100644 (file)
--- a/tests/18-events.html
+++ b/tests/18-events.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;event=</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;event=</td>
        <td></td>
 </tr>
 <tr>

diff --git a/tests/19-procedures.html b/tests/19-procedures.html
index 3a1af7e320b45b1baf04e03affc6f501dacf9bda..0eccd296e591c5dc18cd033c5521e3e9f39b90c8 100644 (file)
--- a/tests/19-procedures.html
+++ b/tests/19-procedures.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;procedure=</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;procedure=</td>
        <td></td>
 </tr>
 <tr>
@@ -39,7 +39,7 @@
 <tr>
        <td>type</td>
        <td>fields[1.1][field]</td>
-       <td>album_name</td>
+       <td>album_title</td>
 </tr>
 <tr>
        <td>select</td>
@@ -54,7 +54,7 @@
 <tr>
        <td>type</td>
        <td>definition</td>
-       <td>BEGIN<br />SELECT id INTO @interpret FROM interprets WHERE interpret = interpret_name;<br />IF @interpret IS NULL THEN<br />&nbsp;&nbsp;&nbsp;&nbsp;INSERT INTO interprets (interpret) VALUES (interpret_name);<br />&nbsp;&nbsp;&nbsp;&nbsp;SET @interpret = LAST_INSERT_ID();<br />END IF;<br />INSERT INTO albums (interpret, album) VALUES (@interpret, album_name);<br />END</td>
+       <td>BEGIN<br />SELECT id INTO @interpret FROM interprets WHERE name = interpret_name;<br />IF @interpret IS NULL THEN<br />&nbsp;&nbsp;&nbsp;&nbsp;INSERT INTO interprets (name) VALUES (interpret_name);<br />&nbsp;&nbsp;&nbsp;&nbsp;SET @interpret = LAST_INSERT_ID();<br />END IF;<br />INSERT INTO albums (interpret, title) VALUES (@interpret, album_title);<br />END</td>
 </tr>
 <tr>
        <td>type</td>
@@ -83,7 +83,7 @@
 </tr>
 <tr>
        <td>type</td>
-       <td>fields[album_name]</td>
+       <td>fields[album_title]</td>
        <td>Dangerous</td>
 </tr>
 <tr>
@@ -98,7 +98,7 @@
 </tr>
 <tr>
        <td>clickAndWait</td>
-       <td>link=selenium</td>
+       <td>link=adminer_test</td>
        <td></td>
 </tr>
 <tr>

diff --git a/tests/2-create-table.html b/tests/2-create-table.html
index bf30f2eaa66c399015bcbdd64622d2d055a9b59d..087954c604dd3b337b7f64e300ee90455adb1b22 100644 (file)
--- a/tests/2-create-table.html
+++ b/tests/2-create-table.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium</td>
+       <td>/adminer/adminer/?db=adminer_test</td>
        <td></td>
 </tr>
 <tr>
@@ -49,7 +49,7 @@
 <tr>
        <td>type</td>
        <td>fields[1.1][field]</td>
-       <td>interpret</td>
+       <td>name</td>
 </tr>
 <tr>
        <td>select</td>

diff --git a/tests/20-partitioning.html b/tests/20-partitioning.html
index 2e459cecfd08c1b909766b6eed6be4267dbc2e01..b19ab1eb43fae6f1053455f3339c7c39d886f855 100644 (file)
--- a/tests/20-partitioning.html
+++ b/tests/20-partitioning.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;table=interprets</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;table=interprets</td>
        <td></td>
 </tr>
 <tr>

diff --git a/tests/22-history.html b/tests/22-history.html
index 5434198464bb7301d9108ed8a5c21f51e3cdf4f5..e6645957150099dd25c1209503efb2cce6aaafde 100644 (file)
--- a/tests/22-history.html
+++ b/tests/22-history.html
@@ -18,7 +18,7 @@
 </tr>
 <tr>
        <td>verifyTextPresent</td>
-       <td>DROP DATABASE IF EXISTS selenium</td>
+       <td>DROP DATABASE IF EXISTS adminer_test</td>
        <td></td>
 </tr>
 

diff --git a/tests/23-editor.html b/tests/23-editor.html
index 489a670b728e534bbd2f69ecd2e8afe00361b1a0..49807d75d56d4657757170cee758b98d5c57510d 100644 (file)
--- a/tests/23-editor.html
+++ b/tests/23-editor.html
@@ -17,7 +17,7 @@
        <td></td>
 </tr>
 <tr>
-       <td>click</td>
+       <td>clickAndWait</td>
        <td>link=Interprets</td>
        <td></td>
 </tr>
@@ -28,7 +28,7 @@
 </tr>
 <tr>
        <td>type</td>
-       <td>fields[interpret]</td>
+       <td>fields[name]</td>
        <td>Michael Jackson</td>
 </tr>
 <tr>
@@ -53,11 +53,11 @@
 </tr>
 <tr>
        <td>type</td>
-       <td>fields[album]</td>
+       <td>fields[title]</td>
        <td>Dangerous</td>
 </tr>
 <tr>
-       <td>click</td>
+       <td>clickAndWait</td>
        <td>//input[@value='Save']</td>
        <td></td>
 </tr>

diff --git a/tests/3-create-index.html b/tests/3-create-index.html
index a232515f0d266cf96f6090ae311ab94160b3d247..dcb5020d7b97b2cb2a89c6752b04287837be2fcd 100644 (file)
--- a/tests/3-create-index.html
+++ b/tests/3-create-index.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;table=interprets</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;table=interprets</td>
        <td></td>
 </tr>
 <tr>
@@ -29,7 +29,7 @@
 <tr>
        <td>select</td>
        <td>indexes[1][columns][1]</td>
-       <td>label=interpret</td>
+       <td>label=name</td>
 </tr>
 <tr>
        <td>clickAndWait</td>

diff --git a/tests/4-create-table-2.html b/tests/4-create-table-2.html
index ca98ba7e671bf5d2eb19c5bc9c7021674bdd73ee..48c2b0851994d82681a64b7c58d05027cc654209 100644 (file)
--- a/tests/4-create-table-2.html
+++ b/tests/4-create-table-2.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;table=interprets&amp;lang=en</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;table=interprets&amp;lang=en</td>
        <td></td>
 </tr>
 <tr>
@@ -54,7 +54,7 @@
 <tr>
        <td>type</td>
        <td>fields[1.11][field]</td>
-       <td>album</td>
+       <td>title</td>
 </tr>
 <tr>
        <td>select</td>

diff --git a/tests/5-foreign-key.html b/tests/5-foreign-key.html
index 1eabcee895974d759fc47528eb16aedea773b739..1992e3a9d8cbbdb20c1f1fb760318788e15ef435 100644 (file)
--- a/tests/5-foreign-key.html
+++ b/tests/5-foreign-key.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;table=albums</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;table=albums</td>
        <td></td>
 </tr>
 <tr>

diff --git a/tests/6-alter-table.html b/tests/6-alter-table.html
index 37703ab0d4aab986b67fe460ed2f54f8a0c33209..d983a90007a987dafc7015691f47ed3d576e3023 100644 (file)
--- a/tests/6-alter-table.html
+++ b/tests/6-alter-table.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;table=interprets</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;table=interprets</td>
        <td></td>
 </tr>
 <tr>

diff --git a/tests/7-create-trigger.html b/tests/7-create-trigger.html
index 92e1c3a18b3368966483c89a3d346b58dba725e8..8fae68f3d393a845b8b0a840f195fa2197027252 100644 (file)
--- a/tests/7-create-trigger.html
+++ b/tests/7-create-trigger.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;trigger=albums</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;trigger=albums</td>
        <td></td>
 </tr>
 <tr>
@@ -24,7 +24,7 @@
 <tr>
        <td>type</td>
        <td>Statement</td>
-       <td>UPDATE interprets SET albums = albums + 1 WHERE interpret = NEW.interpret</td>
+       <td>UPDATE interprets SET albums = albums + 1 WHERE id = NEW.interpret</td>
 </tr>
 <tr>
        <td>clickAndWait</td>

diff --git a/tests/8-create-view.html b/tests/8-create-view.html
index 98a9457ad110b83a04b901a9768eb1db3280587c..ce8e4a445d9e31268e9cb562cd381f049fb51351 100644 (file)
--- a/tests/8-create-view.html
+++ b/tests/8-create-view.html
@@ -13,13 +13,13 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;view=</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;view=</td>
        <td></td>
 </tr>
 <tr>
        <td>type</td>
        <td>select</td>
-       <td>SELECT albums.id, albums.album, interprets.interpret<br />FROM albums<br />LEFT JOIN interprets ON albums.interpret = interprets.id</td>
+       <td>SELECT albums.id, albums.title, interprets.name<br />FROM albums<br />LEFT JOIN interprets ON albums.interpret = interprets.id</td>
 </tr>
 <tr>
        <td>type</td>

diff --git a/tests/9-insert.html b/tests/9-insert.html
index ce639aacde7893ad8c93a4744305e774220a3b3f..60eebf6c5b6936b75c8cdb00f1af3364824fcc22 100644 (file)
--- a/tests/9-insert.html
+++ b/tests/9-insert.html
@@ -13,12 +13,12 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;edit=interprets</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;edit=interprets</td>
        <td></td>
 </tr>
 <tr>
        <td>type</td>
-       <td>fields[interpret]</td>
+       <td>fields[name]</td>
        <td>Michael Jackson</td>
 </tr>
 <tr>
@@ -33,7 +33,7 @@
 </tr>
 <tr>
        <td>open</td>
-       <td>/adminer/adminer/?db=selenium&amp;edit=albums</td>
+       <td>/adminer/adminer/?db=adminer_test&amp;edit=albums</td>
        <td></td>
 </tr>
 <tr>
@@ -43,7 +43,7 @@
 </tr>
 <tr>
        <td>type</td>
-       <td>fields[album]</td>
+       <td>fields[title]</td>
        <td>Dangerous</td>
 </tr>
 <tr>