mysql-workbench: diable broken auto completion in fedora >= 17

2 files changed, 103 insertions, 1 deletions

diff --git a/mysql-workbench-5.2.42-noautocc.patch b/mysql-workbench-5.2.42-noautocc.patch
new file mode 100644
index 0000000..a945f3c
--- /dev/null
+++ b/mysql-workbench-5.2.42-noautocc.patch
@@ -0,0 +1,96 @@
+diff -up mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp.auto mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp
+--- mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp.auto	2012-08-28 07:23:58.733977928 +0200
++++ mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp	2012-08-28 07:26:52.679449570 +0200
+@@ -485,7 +485,11 @@ static bool validate_save_edits(wb::WBCo
+ 
+ static bool validate_list_members(wb::WBContextSQLIDE *sqlide)
+ {
++#if 0
+   return sqlide->get_grt_manager()->get_app_option_int("DbSqlEditor:CodeCompletionEnabled") != 0;
++#else
++  return false;
++#endif
+ }
+ 
+ //--------------------------------------------------------------------------------------------------
+diff -up mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.auto mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp
+--- mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.auto	2012-08-28 07:23:50.240956043 +0200
++++ mysql-workbench-gpl-5.2.42-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp	2012-08-28 07:25:59.442301869 +0200
+@@ -902,6 +902,7 @@ grt::StringRef SqlEditorForm::do_connect
+     model->catalog(catalog);
+   }
+    
++#if 0
+   if (_grtm->get_app_option_int("DbSqlEditor:CodeCompletionEnabled") == 1)
+   {
+     std::string cache_dir = _grtm->get_user_datadir() + "/cache/";
+@@ -921,6 +922,7 @@ grt::StringRef SqlEditorForm::do_connect
+     }
+   }
+   else
++#endif
+     log_debug("Code completion is disabled, so no name cache is created\n");
+   
+   return grt::StringRef();
+diff -up mysql-workbench-gpl-5.2.42-src/backend/wbprivate/workbench/wb_context.cpp.auto mysql-workbench-gpl-5.2.42-src/backend/wbprivate/workbench/wb_context.cpp
+--- mysql-workbench-gpl-5.2.42-src/backend/wbprivate/workbench/wb_context.cpp.auto	2012-08-28 07:24:08.635003637 +0200
++++ mysql-workbench-gpl-5.2.42-src/backend/wbprivate/workbench/wb_context.cpp	2012-08-28 07:27:24.959539941 +0200
+@@ -1551,8 +1551,8 @@ void WBContext::set_default_options(grt:
+   set_default(options, "SqlEditor::SyntaxCheck::MaxErrCount", 100);
+ 
+   // DB SQL editor
+-  options.gset("DbSqlEditor:CodeCompletionEnabled", 1);
+-  options.gset("DbSqlEditor:AutoStartCodeCompletion", 1);
++  options.gset("DbSqlEditor:CodeCompletionEnabled", 0);
++  options.gset("DbSqlEditor:AutoStartCodeCompletion", 0);
+   options.gset("DbSqlEditor:ProgressStatusUpdateInterval", 500); // in ms
+   options.gset("DbSqlEditor:KeepAliveInterval", 600); // in seconds
+   options.gset("DbSqlEditor:ReadTimeOut", 600); // in seconds
+diff -up mysql-workbench-gpl-5.2.42-src/backend/wbpublic/sqlide/sql_editor_be.cpp.auto mysql-workbench-gpl-5.2.42-src/backend/wbpublic/sqlide/sql_editor_be.cpp
+--- mysql-workbench-gpl-5.2.42-src/backend/wbpublic/sqlide/sql_editor_be.cpp.auto	2012-08-28 07:24:21.657037748 +0200
++++ mysql-workbench-gpl-5.2.42-src/backend/wbpublic/sqlide/sql_editor_be.cpp	2012-08-28 07:28:23.988706289 +0200
+@@ -880,14 +880,22 @@ void Sql_editor::set_sql_check_enabled(b
+ 
+ bool Sql_editor::code_completion_enabled()
+ {
++#if 0
+   return d->_grtm->get_app_option_int("DbSqlEditor:CodeCompletionEnabled") == 1;
++#else
++  return false;
++#endif
+ }
+ 
+ //--------------------------------------------------------------------------------------------------
+ 
+ bool Sql_editor::auto_start_code_completion()
+ {
++#if 0
+   return d->_grtm->get_app_option_int("DbSqlEditor:AutoStartCodeCompletion") == 1;
++#else
++  return false;
++#endif
+ }
+ 
+ //--------------------------------------------------------------------------------------------------
+diff -up mysql-workbench-gpl-5.2.42-src/frontend/common/preferences_form.cpp.auto mysql-workbench-gpl-5.2.42-src/frontend/common/preferences_form.cpp
+--- mysql-workbench-gpl-5.2.42-src/frontend/common/preferences_form.cpp.auto	2012-08-28 07:24:35.712074907 +0200
++++ mysql-workbench-gpl-5.2.42-src/frontend/common/preferences_form.cpp	2012-08-28 07:43:53.125210902 +0200
+@@ -618,6 +618,10 @@ void PreferencesForm::create_sqlide_page
+     
+     // Code completion settings is a horizontal box with two check boxes.
+     {
++      // Hack: force value to 0
++      _wbui->set_wb_options_value(_model_id, "DbSqlEditor:CodeCompletionEnabled", "0", grt::IntegerType);
++      _wbui->set_wb_options_value(_model_id, "DbSqlEditor:AutoStartCodeCompletion", "0", grt::IntegerType);
++
+       mforms::Box *cc_box = mforms::manage(new mforms::Box(true));
+       vbox->add(cc_box, false);
+       mforms::CheckBox *auto_start_check = new_checkbox_option("DbSqlEditor:AutoStartCodeCompletion");
+@@ -629,6 +633,7 @@ void PreferencesForm::create_sqlide_page
+         check->set_text(_("Enable Code Completion in Editors"));
+         check->set_tooltip(_(
+                              "If enabled SQL editors display a code completion list when pressing the defined hotkey"));
++        check->set_enabled(false); // Hack disable this checkbox
+         cc_box->add(check, false);
+         
+         // Set initial enabled state of the auto-cc checkbox depending on whether
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index f1d5261..5167e0b 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -11,7 +11,7 @@
 Summary:   A MySQL visual database modeling, administration and querying tool
 Name:      mysql-workbench
 Version:   5.2.42
-Release:   1%{?dist}
+Release:   2%{?dist}
 Group:     Applications/Databases
 License:   GPLv2 with exceptions
 
@@ -33,6 +33,8 @@ Patch3:    %{name}-5.2.41-tinyxml.patch
 Patch4:    %{name}-5.2.41-antlr.patch
 # http://bugs.mysql.com/63705
 Patch5:    %{name}-5.2.41-glib.patch
+# Disable broken AutoCompletion feature
+Patch6:    %{name}-5.2.42-noautocc.patch
 
 # don't use bundled documentation, redirect to online doc
 Patch9:    %{name}-5.2.41-nodocs.patch
@@ -139,6 +141,7 @@ rm -rf ext/antlr-runtime
 %endif
 
 %patch5 -p1 -b .glib
+%patch6 -p1 -b .noautocc
 %patch9 -p1 -b .nodocs
 
 touch -r COPYING .timestamp4rpm
@@ -229,6 +232,9 @@ fi
 
 
 %changelog
+* Tue Aug 28 2012 Remi Collet <remi@fedoraproject.org> 5.2.42-2
+- diable broken auto completion (#851283)
+
 * Tue Aug 14 2012 Remi Collet <remi@fedoraproject.org> 5.2.42-1
 - update to 5.2.42 Community (OSS) Edition (GPL)
   http://dev.mysql.com/doc/workbench/en/wb-news-5-2-42.html