[glom] Comment out use of gda_sql_identifier_remove_quotes().



commit 948532a6a066267e7d2db323780018cdcb3028cc
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Aug 25 14:25:12 2009 +0200

    Comment out use of gda_sql_identifier_remove_quotes().
    
    * glom/base_db.cc: remove_quotes(): Comment out use of
    gda_sql_identifier_remove_quotes() with a stdcerr warning because
    it is deprecated and I get a weird undefined reference error and we
    need to change how we use this anyway. To fix the build.

 ChangeLog       |    9 +++++++++
 glom/base_db.cc |    7 ++++++-
 2 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 77c155d..73a2e49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-25  Murray Cumming  <murrayc murrayc com>
+
+	Comment out use of gda_sql_identifier_remove_quotes().
+
+	* glom/base_db.cc: remove_quotes(): Comment out use of 
+	gda_sql_identifier_remove_quotes() with a stdcerr warning because 
+	it is deprecated and I get a weird undefined reference error and we 
+	need to change how we use this anyway. To fix the build.
+
 2009-08-25  Johannes Schmid <jschmid openismus com>
 
 	Fixed remaing maemo build problems
diff --git a/glom/base_db.cc b/glom/base_db.cc
index 7280546..3c1e6f2 100644
--- a/glom/base_db.cc
+++ b/glom/base_db.cc
@@ -52,7 +52,8 @@
 //#include <libgnomeui/gnome-app-helper.h>
 
 //#include <libgdamm/metastore.h> //For MetaStoreError
-#include <sql-parser/gda-sql-parser.h> //For gda_sql_identifier_remove_quotes().
+//#undef GDA_DISABLE_DEPRECATED
+//#include <sql-parser/gda-statement-struct-util.h> //For gda_sql_identifier_remove_quotes().
 
 #ifdef GLOM_ENABLE_MAEMO
 #include <hildonmm/note.h>
@@ -406,11 +407,14 @@ static Glib::ustring remove_quotes(const Glib::ustring& str)
   if(posQuoteEnd != (str.size() - 1))
     return str;
   
+  std::cerr << "Glom: remove_quotes(): Unimplemented quote removal for string: " << str << std::endl;
   //Actually remove the quotes:
+/* Removed because gda_sql_identifier_remove_quotes() is not even defined in recent libgda builds. 
   gchar* quoted = g_strdup(str.c_str());
   //std::cout << "  quoted=" << quoted << std::endl;
 // Hack because we need a newer libgdamm version
 #ifndef GLOM_ENABLE_MAEMO
+  //TODO: This is deprecated, so avoid using it:
   gchar* unquoted = gda_sql_identifier_remove_quotes(quoted); //Changes quoted. unquoted is the same string so should not be freed.  
   //std::cout << "  unquoted= " << unquoted << std::endl;
   if(unquoted)
@@ -418,6 +422,7 @@ static Glib::ustring remove_quotes(const Glib::ustring& str)
 #endif
       
   g_free(quoted);
+*/
 
   return str;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]