Form funcion to get SQL query

phpmyadmin · Jul 17, 2012 · fdd851c · fdd851c
1 parent 9812f2f
commit fdd851c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 11 deletions.
diff --git a/db_qbe.php b/db_qbe.php
@@ -226,17 +226,9 @@
             rows="<?php echo ($numTableListOptions > 30) ? '15' : '7'; ?>"
             dir="<?php echo $text_dir; ?>">
 <?php
-// 1. SELECT
-echo PMA_dbQbeGetSelectClause($criteria_column_count);
-// 2. FROM
-$from_clause = PMA_dbQbeGetFromClause($criteria, $cfgRelation);
-if (! empty($from_clause)) {
-    echo 'FROM ' . htmlspecialchars($from_clause) . "\n";
-}
-// 3. WHERE
-echo PMA_dbQbeGetWhereClause($criteria_column_count, $criteria_row_count);
-// 4. ORDER BY
-echo PMA_dbQbeGetOrderByClause($criteria_column_count);
+echo PMA_dbQbeGetSQLQuery(
+    $criteria_column_count, $criteria_row_count, $criteria, $cfgRelation
+);
 ?>
     </textarea>
     </fieldset>

diff --git a/libraries/db_qbe.lib.php b/libraries/db_qbe.lib.php
@@ -954,4 +954,29 @@ function PMA_dbQbeGetFromClause($criteria, $cfgRelation)
     }
     return $from_clause;
 }
+
+/**
+ * Provides the generated SQL query
+ *
+ * @param string $criteria       Already Filled criteria
+ *
+ * @return string SQL query
+ */
+function PMA_dbQbeGetSQLQuery($criteria_column_count, $criteria_row_count, $criteria,
+    $cfgRelation
+) {
+    $sql_query = '';
+    // get SELECT clause
+    $sql_query .= PMA_dbQbeGetSelectClause($criteria_column_count);
+    // get FROM clause
+    $from_clause = PMA_dbQbeGetFromClause($criteria, $cfgRelation);
+    if (! empty($from_clause)) {
+        $sql_query .= 'FROM ' . htmlspecialchars($from_clause) . "\n";
+    }
+    // get WHERE clause
+    $sql_query .= PMA_dbQbeGetWhereClause($criteria_column_count, $criteria_row_count);
+    // get ORDER BY clause
+    $sql_query .= PMA_dbQbeGetOrderByClause($criteria_column_count);
+    return $sql_query;
+}
 ?>