The branch, master has been updated
via 75091e52fde4633f990a60a5f70ffa58aeb623da (commit)
via 612f8f3d67aea31debdc7df83bc6628997e6aade (commit)
via ab1a2394c3df043d81080792028ed739338674f5 (commit)
via 15ef12542eaf64f63d25846c522477c695c7647f (commit)
via b8c45c434a6fecef3c5f065df8e649d86c546123 (commit)
from c16138f9fd9b7c88ee412c0ef43419ef100ad0d8 (commit)
- Log -----------------------------------------------------------------
commit 75091e52fde4633f990a60a5f70ffa58aeb623da
Merge: c16138f9fd9b7c88ee412c0ef43419ef100ad0d8
612f8f3d67aea31debdc7df83bc6628997e6aade
Author: Madhura Jayaratne <[email protected]>
Date: Sat Jun 4 00:36:51 2011 +0530
Merge branch 'QA_3_4'
Conflicts:
po/af.po
po/ar.po
po/az.po
po/be.po
po/[email protected]
po/bg.po
po/bn.po
po/bs.po
po/ca.po
po/cs.po
po/cy.po
po/da.po
po/de.po
po/el.po
po/en_GB.po
po/es.po
po/et.po
po/eu.po
po/fa.po
po/fi.po
po/fr.po
po/gl.po
po/he.po
po/hi.po
po/hr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/ka.po
po/ko.po
po/lt.po
po/lv.po
po/mk.po
po/ml.po
po/mn.po
po/ms.po
po/nb.po
po/nl.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/si.po
po/sk.po
po/sl.po
po/sq.po
po/sr.po
po/[email protected]
po/sv.po
po/ta.po
po/te.po
po/th.po
po/tr.po
po/tt.po
po/ug.po
po/uk.po
po/ur.po
po/uz.po
po/[email protected]
po/zh_CN.po
po/zh_TW.po
-----------------------------------------------------------------------
Summary of changes:
js/sql.js | 12 ++++++++++--
libraries/display_tbl.lib.php | 7 ++++++-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/js/sql.js b/js/sql.js
index e4f8323..31afe84 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -888,16 +888,20 @@ $(document).ready(function() {
*/
var is_null = $this_field.find('input:checkbox').is(':checked');
var value;
+ var addQuotes = true;
if (is_null) {
sql_query += ' `' + field_name + "`=NULL , ";
need_to_post = true;
} else {
- if($this_field.is(":not(.relation, .enum, .set)")) {
+ if($this_field.is(":not(.relation, .enum, .set, .bit)")) {
this_field_params[field_name] =
$this_field.find('textarea').val();
if($this_field.is('.transformed')) {
$.extend(transform_fields, this_field_params);
}
+ } else if ($this_field.is('.bit')) {
+ this_field_params[field_name] = '0b' +
$this_field.find('textarea').val();
+ addQuotes = false;
} else if ($this_field.is('.set')) {
$test_element = $this_field.find('select');
this_field_params[field_name] =
$test_element.map(function(){
@@ -924,7 +928,11 @@ $(document).ready(function() {
new_clause += '`' + window.parent.table + '`.' + '`' +
field_name + "` = '" + this_field_params[field_name].replace(/'/g,"''") + "'" +
' AND ';
}
if (this_field_params[field_name] !=
$this_field.data('original_data')) {
- sql_query += ' `' + field_name + "`='" +
this_field_params[field_name].replace(/'/g, "''") + "' , ";
+ if (addQuotes == true) {
+ sql_query += ' `' + field_name + "`='" +
this_field_params[field_name].replace(/'/g, "''") + "', ";
+ } else {
+ sql_query += ' `' + field_name + "`=" +
this_field_params[field_name].replace(/'/g, "''") + ", ";
+ }
need_to_post = true;
}
}
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index c9e04f3..08b3ea1 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1033,6 +1033,11 @@ function PMA_addClass($class, $condition_field, $meta,
$nowrap, $is_field_trunca
$set_class = ' set';
}
+ $bit_class = '';
+ if(strpos($meta->type, 'bit') !== false) {
+ $bit_class = ' bit';
+ }
+
$mime_type_class = '';
if(isset($meta->mimetype)) {
$mime_type_class = ' ' . preg_replace('/\//', '_', $meta->mimetype);
@@ -1041,7 +1046,7 @@ function PMA_addClass($class, $condition_field, $meta,
$nowrap, $is_field_trunca
$result = $class . ($condition_field ? ' condition' : '') . $nowrap
. ' ' . ($is_field_truncated ? ' truncated' : '')
. ($transform_function != $default_function ? ' transformed' : '')
- . $enum_class . $set_class . $mime_type_class;
+ . $enum_class . $set_class . $bit_class . $mime_type_class;
return $result;
}
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Discover what all the cheering's about.
Get your free trial download today.
http://p.sf.net/sfu/quest-dev2dev2
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
