From d2276d5ddab9f3f0bc6a47cf0a713f7c5a08e417 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 18 Sep 2011 12:10:46 +0530 Subject: [PATCH] Avoid b'null' and b'' for bit fields. No space before comma and single space after comma in SQL query --- js/tbl_zoom_plot.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index 3e760df5bd..65fad7ef59 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -383,18 +383,20 @@ $(document).ready(function() { if (key != 'where_clause') { sql_query += '`' + key + '`=' ; var value = newValues[key]; - if (sqlTypes[key] != null) { - if (sqlTypes[key] == 'bit') { - sql_query += 'b\'' + value + '\' ,'; + if (sqlTypes[key] != null && value != null) { + if (sqlTypes[key] == 'bit' && value != '') { + sql_query += 'b\'' + value + '\', '; + } else { + sql_query += '\'\', '; } } else if (!isNumeric(value) && value != null) { - sql_query += '\'' + value + '\' ,'; + sql_query += '\'' + value + '\', '; } else { - sql_query += value + ' ,'; + sql_query += value + ', '; } } } - sql_query = sql_query.substring(0, sql_query.length - 1); + sql_query = sql_query.substring(0, sql_query.length - 2); sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']); //Post SQL query to sql.php