[glom] Fixed build issues on maemo platform with sqlite



commit 32e6a17562202e5f98e34e79ec5acba7363e5cfa
Author: Johannes Schmid <jhs gnome org>
Date:   Thu Aug 27 15:17:12 2009 +0200

    Fixed build issues on maemo platform with sqlite

 ChangeLog                                      |    5 +++++
 glom/libglom/connectionpool_backends/sqlite.cc |   11 ++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 846af47..50896d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-27  Johannes Schmid <jschmid openismus com>
+
+	* glom/libglom/connectionpool_backends/sqlite.c:
+	Fixed build issues on maemo platform
+
 2009-08-26  Murray Cumming  <murrayc murrayc com>
 
 	Fix a time parsing regression.
diff --git a/glom/libglom/connectionpool_backends/sqlite.cc b/glom/libglom/connectionpool_backends/sqlite.cc
index fba574b..ba3739e 100644
--- a/glom/libglom/connectionpool_backends/sqlite.cc
+++ b/glom/libglom/connectionpool_backends/sqlite.cc
@@ -74,7 +74,7 @@ Glib::RefPtr<Gnome::Gda::Connection> Sqlite::connect(const Glib::ustring& databa
     std::auto_ptr<Glib::Error> error;
     connection = Gnome::Gda::Connection::open_from_string("SQLite", 
       cnc_string, auth_string, 
-      Gnome::Gda::CONNECTION_OPTIONS_SQL_IDENTIFIERS_CASE_SENSITIVE, error);
+      Gnome::Gda::CONNECTION_OPTIONS_NONE /* Gnome::Gda::CONNECTION_OPTIONS_SQL_IDENTIFIERS_CASE_SENSITIVE */, error);
     if(error.get())
     {
       const Glib::Error& ex = *error.get();
@@ -118,9 +118,9 @@ bool Sqlite::create_database(const Glib::ustring& database_name, const Glib::ust
   Glib::RefPtr<Gnome::Gda::Connection> cnc = 
     Gnome::Gda::Connection::open_from_string("SQLite", 
       cnc_string, "", 
-      Gnome::Gda::CONNECTION_OPTIONS_SQL_IDENTIFIERS_CASE_SENSITIVE, error);
+      Gnome::Gda::CONNECTION_OPTIONS_NONE /* Gnome::Gda::CONNECTION_OPTIONS_SQL_IDENTIFIERS_CASE_SENSITIVE */, error);
   if(error.get() != 0)
-    return false
+    return false;
 #endif
 
   return true;
@@ -175,7 +175,12 @@ bool Sqlite::recreate_table(const Glib::RefPtr<Gnome::Gda::Connection>& connecti
 
   Glib::RefPtr<Gnome::Gda::MetaStore> store = connection->get_meta_store();
   Glib::RefPtr<Gnome::Gda::MetaStruct> metastruct = Gnome::Gda::MetaStruct::create(store, Gnome::Gda::META_STRUCT_FEATURE_NONE);
+#ifdef GLIBMM_EXCEPTIONS_ENABLED  
   GdaMetaDbObject* object = metastruct->complement(Gnome::Gda::META_DB_TABLE, Gnome::Gda::Value(), Gnome::Gda::Value(), Gnome::Gda::Value(table_name));
+#else
+  GdaMetaDbObject* object = metastruct->complement(Gnome::Gda::META_DB_TABLE, Gnome::Gda::Value(), Gnome::Gda::Value(), Gnome::Gda::Value(table_name), error);
+#endif
+  
   if(!object)
     return false;
 



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