]> git.joonet.de Git - adminer.git/commitdiff
projects / adminer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5d7071a)
Procedures test
authorjakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Fri, 3 Oct 2008 16:05:03 +0000 (16:05 +0000)
committerjakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Fri, 3 Oct 2008 16:05:03 +0000 (16:05 +0000)
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@518 7c3ca157-0c34-0410-bff1-cbf682f78f5c

editing.inc.php patch | blob | history
tests/19-procedures.html [new file with mode: 0644] patch | blob
tests/selenium.html patch | blob | history

diff --git a/editing.inc.php b/editing.inc.php
index 0eefaf91ba5b38827a63227e280528c697d0b1a7..cbac8fa54e4ed62eb6a8b67aabc8596fdcc81ab8 100644 (file)
--- a/editing.inc.php
+++ b/editing.inc.php
@@ -112,7 +112,7 @@ function edit_fields($fields, $collations, $type = "TABLE") {
        $column_comments = false;
        foreach ($fields as $i => $field) {
                $i++;
-               $display = ($_POST["add"][$i-1] || (isset($field["field"]) && !$_POST["drop_col"][$i]));
+               $display = (isset($_POST["add"][$i-1]) || (isset($field["field"]) && !$_POST["drop_col"][$i]));
                ?>
 <tr<?php echo ($display ? "" : " style='display: none;'"); ?>>
 <?php if ($type == "PROCEDURE") { ?><td><select name="fields[<?php echo $i; ?>][inout]"><?php echo optionlist($inout, $field["inout"]); ?></select></td><?php } ?>
diff --git a/tests/19-procedures.html b/tests/19-procedures.html
new file mode 100644 (file)
index 0000000..45959ba
--- /dev/null
+++ b/tests/19-procedures.html
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>Procedures</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Procedures</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/phpMinAdmin/?db=selenium&amp;procedure=</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>add[0]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>fields[1][field]</td>
+       <td>interpret_name</td>
+</tr>
+<tr>
+       <td>select</td>
+       <td>fields[1][type]</td>
+       <td>label=varchar</td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>add[1]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>fields[1][length]</td>
+       <td>50</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>fields[1.1][field]</td>
+       <td>album_name</td>
+</tr>
+<tr>
+       <td>select</td>
+       <td>fields[1.1][type]</td>
+       <td>label=varchar</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>fields[1.1][length]</td>
+       <td>50</td>
+</tr>
+<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>
+</tr>
+<tr>
+       <td>type</td>
+       <td>name</td>
+       <td>insert_album</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>//input[@value='Save']</td>
+       <td></td>
+</tr>
+<tr>
+       <td>verifyTextPresent</td>
+       <td>Routine has been created.</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=insert_album</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>fields[0]</td>
+       <td>Michael Jackson</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>fields[1]</td>
+       <td>Dangerous</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>//input[@value='Call']</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertTextPresent</td>
+       <td>Routine has been called, 1 row affected.</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=selenium</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=Alter</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>drop</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertConfirmation</td>
+       <td>Are you sure?</td>
+       <td></td>
+</tr>
+<tr>
+       <td>verifyTextPresent</td>
+       <td>Routine has been dropped.</td>
+       <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/selenium.html b/tests/selenium.html
index 57d5f552b1749978e0d94f75331401ec4a9bfdf3..b1ad560db7e83aa8464732b7948ae957b7919e37 100644 (file)
--- a/tests/selenium.html
+++ b/tests/selenium.html
@@ -27,6 +27,7 @@
 <tr><td><a href="16-processlist.html">Process list</a></td></tr>
 <tr><td><a href="17-export.html">Export</a></td></tr>
 <tr><td><a href="18-events.html">Events</a></td></tr>
+<tr><td><a href="19-procedures.html">Procedures</a></td></tr>
 <tr><td><a href="logout.html">Logout</a></td></tr>
 </tbody></table>
 </body>
Sources of adminer, a webclient for database management systems.