Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js/pmd
diff options
context:
space:
mode:
authorMadhura Jayaratne <madhura.cj@gmail.com>2015-06-15 10:30:01 +0300
committerMadhura Jayaratne <madhura.cj@gmail.com>2015-06-15 10:30:01 +0300
commit78cbe1ca88a8ebd8c07fa7358c64f73dfebd5841 (patch)
treee7bbe9f7f089249960a8eb4edce2012249768bd4 /js/pmd
parentab7ef46b11420ee347d32d2ce060c0872b7d61f5 (diff)
Do not fail when no columns have been selected
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Diffstat (limited to 'js/pmd')
-rw-r--r--js/pmd/history.js24
1 files changed, 14 insertions, 10 deletions
diff --git a/js/pmd/history.js b/js/pmd/history.js
index 2d93ef8fd1..ca6d70023a 100644
--- a/js/pmd/history.js
+++ b/js/pmd/history.js
@@ -731,18 +731,22 @@ function build_query(formtitle, fadin)
{
var q_select = "SELECT ";
var temp;
- for (var i = 0;i < select_field.length; i++) {
- temp = check_aggregate(select_field[i]);
- if (temp !== "") {
- q_select += temp;
- temp = check_rename(select_field[i]);
- q_select += temp + ", ";
- } else {
- temp = check_rename(select_field[i]);
- q_select += select_field[i] + temp + ", ";
+ if (select_field.length > 0) {
+ for (var i = 0; i < select_field.length; i++) {
+ temp = check_aggregate(select_field[i]);
+ if (temp !== "") {
+ q_select += temp;
+ temp = check_rename(select_field[i]);
+ q_select += temp + ", ";
+ } else {
+ temp = check_rename(select_field[i]);
+ q_select += select_field[i] + temp + ", ";
+ }
}
+ q_select = q_select.substring(0, q_select.length - 2);
+ } else {
+ q_select += "* ";
}
- q_select = q_select.substring(0, q_select.length - 2);
q_select += "\nFROM " + query_from();
if (query_where() !== "") {
q_select += "\nWHERE";