From fdd851c19caac185ebd6df06b507a3a4c0a06f6b Mon Sep 17 00:00:00 2001
From: Atul Pratap Singh <atulpratapsingh05@gmail.com>
Date: Tue, 17 Jul 2012 07:17:53 +0530
Subject: [PATCH] Form funcion to get SQL query

---
 db_qbe.php               | 14 +++-----------
 libraries/db_qbe.lib.php | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/db_qbe.php b/db_qbe.php
index df32aebe3a..cf8287e53d 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -226,17 +226,9 @@ echo PMA_dbQbeGetTablesList($tbl_names);
             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
index c5c55cabba..47b6a48f2e 100644
--- 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;
+}
 ?>