Separate view()

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

diff --git a/createv.inc.php b/createv.inc.php
index ef6ecaec3b36c1b7960d8216013562ee1f3c9e50..ed8754f7f6c8b930c19ced5a6da232422a39a897 100644 (file)
--- a/createv.inc.php
+++ b/createv.inc.php
@@ -15,7 +15,7 @@ if ($_POST) {
        $row = $_POST;
        echo "<p class='error'>" . lang('Unable to operate view') . ": " . htmlspecialchars($error) . "</p>\n";
 } elseif (strlen($_GET["createv"])) {
-       $row = array("name" => $_GET["createv"], "select" => preg_replace('~^.* AS ~U', '', $mysql->result($mysql->query("SHOW CREATE VIEW " . idf_escape($_GET["createv"])), 1)));
+       $row = view($_GET["createv"]);
 } else {
        $row = array();
 }

diff --git a/functions.inc.php b/functions.inc.php
index 3b48c0cd2de6a21aeec43ca5d033585e0e223a4f..f03c53be195add2ca77a24b8ccf525690400d07f 100644 (file)
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -111,6 +111,11 @@ function foreign_keys($table) {
        return $return;
 }
 
+function view($name) {
+       global $mysql;
+       return array("name" => $name, "select" => preg_replace('~^(?:[^`]+|`[^`]*`)* AS ~U', '', $mysql->result($mysql->query("SHOW CREATE VIEW " . idf_escape($name)), 1)));
+}
+
 function unique_idf($row, $indexes) {
        foreach ($indexes as $index) {
                if ($index["type"] == "PRIMARY" || $index["type"] == "UNIQUE") {

diff --git a/view.inc.php b/view.inc.php
index 77f9c07bbc17d1a28b55801fead4abb0663cc910..c4d8ec7cfe3e52ee418e16846e2a6cce60fd59a0 100644 (file)
--- a/view.inc.php
+++ b/view.inc.php
@@ -1,4 +1,5 @@
 <?php
 page_header(lang('View') . ": " . htmlspecialchars($_GET["view"]));
-echo "<pre class='jush-sql'>" . htmlspecialchars(preg_replace('~^.* AS ~U', '', $mysql->result($mysql->query("SHOW CREATE VIEW " . idf_escape($_GET["view"])), 1))) . "</pre>\n";
+$view = view($_GET["view"]);
+echo "<pre class='jush-sql'>" . htmlspecialchars($view["select"]) . "</pre>\n";
 echo '<p><a href="' . htmlspecialchars($SELF) . 'createv=' . urlencode($_GET["view"]) . '">' . lang('Alter view') . "</a></p>\n";