remove explain, explain analyze options from sql window. it was a nice idea, but...

who know enough to run explain can add it to thier queries. Per discussions this summer on list.

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 8766d54381ae0ac28892731e39730331fba7794c..1ae16f6e26c1902631fdbd950bb08953e2e27eca 100755 (executable)
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: Postgres.php,v 1.314 2007/11/23 17:58:47 xzilla Exp $
+ * $Id: Postgres.php,v 1.315 2007/11/30 06:04:43 xzilla Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???
@@ -4806,7 +4806,6 @@ class Postgres extends ADODB_base {
        function hasPrepare() { return false; }
        function hasProcesses() { return false; }
        function hasVariables() { return false; }
-       function hasFullExplain() { return false; }
        function hasStatsCollector() { return false; }
        function hasAlterColumnType() { return false; }
        function hasUserSessionDefaults() { return false; }

diff --git a/classes/database/Postgres73.php b/classes/database/Postgres73.php
index 34b8607746acfebb8a90eb7e4efdb5fb9059dcee..d8d962f1b8d939ab816d96f8692d84b1faba2848 100644 (file)
--- a/classes/database/Postgres73.php
+++ b/classes/database/Postgres73.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: Postgres73.php,v 1.178 2007/11/21 19:10:40 ioguix Exp $
+ * $Id: Postgres73.php,v 1.179 2007/11/30 06:04:43 xzilla Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???
@@ -1963,7 +1963,6 @@ class Postgres73 extends Postgres72 {
        function hasPrepare() { return true; }
        function hasUserSessionDefaults() { return true; }
        function hasVariables() { return true; }
-       function hasFullExplain() { return true; }
 //     function hasForeignKeysInfo() { return true; }
        function hasConstraintsInfo() { return true; }
        function hasViewColumnRename() { return true; }

diff --git a/database.php b/database.php
index c46ae7065dd8a36971152dc542e90a624f228e50..8840a85c4220de7cb94d775f848d1e6d3d31224b 100755 (executable)
--- a/database.php
+++ b/database.php
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.103 2007/11/29 23:23:56 ioguix Exp $
+        * $Id: database.php,v 1.104 2007/11/30 06:04:43 xzilla Exp $
         */
 
        // Include application functions
@@ -875,10 +875,6 @@
 
                echo "<p><input type=\"checkbox\" id=\"paginate\" name=\"paginate\"", (isset($_REQUEST['paginate']) ? ' checked="checked"' : ''), " /><label for=\"paginate\">{$lang['strpaginate']}</label></p>\n";
                echo "<p><input type=\"submit\" value=\"{$lang['strexecute']}\" />\n";
-               if ($data->hasFullExplain()) {
-                       echo "<input type=\"submit\" name=\"explain\" value=\"{$lang['strexplain']}\" />\n";
-                       echo "<input type=\"submit\" name=\"explain_analyze\" value=\"{$lang['strexplainanalyze']}\" />\n";
-               }
                echo $misc->form;
                echo "<input type=\"reset\" value=\"{$lang['strreset']}\" /></p>\n";
                echo "</form>\n";

diff --git a/sql.php b/sql.php
index def3bd3487328af92f12fdda5b834404c1f88ad3..a2175ca3af7e1a552682ba17301f77ac93470a96 100644 (file)
--- a/sql.php
+++ b/sql.php
@@ -6,7 +6,7 @@
         * how many SQL statements have been strung together with semi-colons
         * @param $query The SQL query string to execute
         *
-        * $Id: sql.php,v 1.39 2007/11/29 23:23:56 ioguix Exp $
+        * $Id: sql.php,v 1.40 2007/11/30 06:04:43 xzilla Exp $
         */
 
        // Prevent timeouts on large exports (non-safe mode only)
@@ -69,16 +69,7 @@
                        }
                }
        }
-       
-       // Determine explain version of SQL
-       if ($data->hasFullExplain() && isset($_POST['explain']) && isset($_POST['query'])) {
-               $_POST['query'] = $data->getExplainSQL($_POST['query'], false);
-               $_REQUEST['query'] = $_POST['query'];
-       }
-       elseif ($data->hasFullExplain() && isset($_POST['explain_analyze']) && isset($_POST['query'])) {
-               $_POST['query'] = $data->getExplainSQL($_POST['query'], true);
-               $_REQUEST['query'] = $_POST['query'];
-       }
+
        
        // Pagination maybe set by a get link that has it as FALSE,
        // if that's the case, unset the variable.

diff --git a/sqledit.php b/sqledit.php
index c9e9f9a998ffe194bcc7879d7a7d4cf146e8a661..4eed468c1c7f93c3b1da27c06a260a1680ff674b 100644 (file)
--- a/sqledit.php
+++ b/sqledit.php
@@ -3,7 +3,7 @@
        /**
         * Alternative SQL editing window
         *
-        * $Id: sqledit.php,v 1.36 2007/11/29 23:23:56 ioguix Exp $
+        * $Id: sqledit.php,v 1.37 2007/11/30 06:04:43 xzilla Exp $
         */
 
        // Include application functions
@@ -127,10 +127,6 @@
                echo "<label for=\"paginate\"><input type=\"checkbox\" id=\"paginate\" name=\"paginate\"", (isset($_REQUEST['paginate']) ? ' checked="checked"' : ''), " />&nbsp;{$lang['strpaginate']}</label>\n";
                
                echo "<p><input type=\"submit\" value=\"{$lang['strexecute']}\" />\n";
-               if ($data->hasFullExplain()) {
-                       echo "<input type=\"submit\" name=\"explain\" value=\"{$lang['strexplain']}\" />\n";
-                       echo "<input type=\"submit\" name=\"explain_analyze\" value=\"{$lang['strexplainanalyze']}\" />\n";
-               }
                echo "<input type=\"reset\" value=\"{$lang['strreset']}\" /></p>\n";
                echo "</form>\n";