[glom/sqlbuilder] BaseDb::query_execute*(): Const corrections.

[Murray Cumming <murrayc src gnome org>]

commit d71df855bc205bf0906777f5882258de1548e118
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Oct 25 20:21:12 2009 +0100

    BaseDb::query_execute*(): Const corrections.
    
    * glom/base_db.[h|cc]: query_execute(), query_execute_select():
    Const corrections and indentation corrections.

 ChangeLog       |    7 +++++++
 glom/base_db.cc |   36 +++++++++++++++++++-----------------
 glom/base_db.h  |    8 ++++----
 3 files changed, 30 insertions(+), 21 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f431335..6b304e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-25  Murray Cumming  <murrayc murrayc com>
+
+	BaseDb::query_execute*(): Const corrections.
+  
+	* glom/base_db.[h|cc]: query_execute(), query_execute_select(): 
+	Const corrections and indentation corrections.
+
 2009-10-21  Armin Burgmeier  <armin arbur net>
 
 	* Makefile_libglom.am: Link against winsock on Windows.
diff --git a/glom/base_db.cc b/glom/base_db.cc
index 491dacb..ab402a3 100644
--- a/glom/base_db.cc
+++ b/glom/base_db.cc
@@ -266,8 +266,8 @@ Glib::RefPtr<Gnome::Gda::DataModel> Base_DB::query_execute_select(const Glib::us
 }
 
 //static:
-Glib::RefPtr<Gnome::Gda::DataModel> Base_DB::query_execute_select(const Glib::RefPtr<Gnome::Gda::SqlBuilder>& builder,
-                                                                  const Glib::RefPtr<Gnome::Gda::Set>& params)
+Glib::RefPtr<Gnome::Gda::DataModel> Base_DB::query_execute_select(const Glib::RefPtr<const Gnome::Gda::SqlBuilder>& builder,
+                                                                  const Glib::RefPtr<const Gnome::Gda::Set>& params)
 {
   Glib::RefPtr<Gnome::Gda::DataModel> result;
 
@@ -464,8 +464,8 @@ bool Base_DB::query_execute(const Glib::ustring& strQuery,
 }
 
 //static:
-bool Base_DB::query_execute(const Glib::RefPtr<Gnome::Gda::SqlBuilder>& builder,
-                            const Glib::RefPtr<Gnome::Gda::Set>& params)
+bool Base_DB::query_execute(const Glib::RefPtr<const Gnome::Gda::SqlBuilder>& builder,
+                            const Glib::RefPtr<const Gnome::Gda::Set>& params)
 {
   #ifdef GLIBMM_EXCEPTIONS_ENABLED
   sharedptr<SharedConnection> sharedconnection = connect_to_server();
@@ -1085,20 +1085,22 @@ Gnome::Gda::Value Base_DB::auto_increment_insert_first_if_necessary(const Glib::
     std::cerr << "Glom: Base_DB::auto_increment_insert_first_if_necessary(): The current user may not edit the autoincrements table. Any user who has create rights for a table should have edit rights to the autoincrements table." << std::endl;
   }
   
-  Glib::RefPtr<Gnome::Gda::SqlBuilder> builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
+  Glib::RefPtr<Gnome::Gda::SqlBuilder> builder = 
+    Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_SELECT);
   builder->add_field(builder->add_id(GLOM_STANDARD_TABLE_AUTOINCREMENTS_TABLE_NAME ".next_value"));
   builder->select_add_target(builder->add_id(GLOM_STANDARD_TABLE_AUTOINCREMENTS_TABLE_NAME));
-  builder->set_where(builder->add_cond(Gnome::Gda::SQL_OPERATOR_TYPE_AND,
-                                       builder->add_cond(Gnome::Gda::SQL_OPERATOR_TYPE_EQ,
-                                                         builder->add_id(GLOM_STANDARD_TABLE_AUTOINCREMENTS_FIELD_TABLE_NAME),
-                                                         builder->add_expr(Gnome::Gda::Value(table_name))),
-                                       builder->add_cond(Gnome::Gda::SQL_OPERATOR_TYPE_EQ,
-                                                         builder->add_id(GLOM_STANDARD_TABLE_AUTOINCREMENTS_FIELD_FIELD_NAME),
-                                                         builder->add_expr(Gnome::Gda::Value(field_name)))));
+  builder->set_where(
+    builder->add_cond(Gnome::Gda::SQL_OPERATOR_TYPE_AND,
+      builder->add_cond(Gnome::Gda::SQL_OPERATOR_TYPE_EQ,
+        builder->add_id(GLOM_STANDARD_TABLE_AUTOINCREMENTS_FIELD_TABLE_NAME),
+        builder->add_expr(Gnome::Gda::Value(table_name))),
+      builder->add_cond(Gnome::Gda::SQL_OPERATOR_TYPE_EQ,
+        builder->add_id(GLOM_STANDARD_TABLE_AUTOINCREMENTS_FIELD_FIELD_NAME),
+        builder->add_expr(Gnome::Gda::Value(field_name)))));
   
-  Glib::RefPtr<Gnome::Gda::DataModel> datamodel = query_execute_select(builder);
+  const Glib::RefPtr<const Gnome::Gda::DataModel> datamodel = query_execute_select(builder);
   if(!datamodel || (datamodel->get_n_rows() == 0))
-  {                       
+  {
     //Start with zero:
     builder.reset();
 
@@ -1106,11 +1108,11 @@ Gnome::Gda::Value Base_DB::auto_increment_insert_first_if_necessary(const Glib::
     builder = Gnome::Gda::SqlBuilder::create(Gnome::Gda::SQL_STATEMENT_INSERT);
     builder->set_table(GLOM_STANDARD_TABLE_AUTOINCREMENTS_TABLE_NAME);
     builder->add_field(builder->add_id(GLOM_STANDARD_TABLE_AUTOINCREMENTS_FIELD_TABLE_NAME),
-                       builder->add_expr(Gnome::Gda::Value(table_name)));
+      builder->add_expr(Gnome::Gda::Value(table_name)));
     builder->add_field(builder->add_id(GLOM_STANDARD_TABLE_AUTOINCREMENTS_FIELD_FIELD_NAME),
-                       builder->add_expr(Gnome::Gda::Value(field_name)));
+      builder->add_expr(Gnome::Gda::Value(field_name)));
     builder->add_field(builder->add_id(GLOM_STANDARD_TABLE_AUTOINCREMENTS_FIELD_NEXT_VALUE),
-                       builder->add_expr(Gnome::Gda::Value(0)));
+      builder->add_expr(Gnome::Gda::Value(0)));
 
     const bool test = query_execute(builder);
     if(!test)
diff --git a/glom/base_db.h b/glom/base_db.h
index cd0cf1d..7a674eb 100644
--- a/glom/base_db.h
+++ b/glom/base_db.h
@@ -83,8 +83,8 @@ public:
    */
   static Glib::RefPtr<Gnome::Gda::DataModel> query_execute_select(const Glib::ustring& strQuery, 
                                                                   const Glib::RefPtr<Gnome::Gda::Set>& params = Glib::RefPtr<Gnome::Gda::Set>(0));
-  static Glib::RefPtr<Gnome::Gda::DataModel> query_execute_select(const Glib::RefPtr<Gnome::Gda::SqlBuilder>& builder,
-                                                                  const Glib::RefPtr<Gnome::Gda::Set>& params = Glib::RefPtr<Gnome::Gda::Set>(0));
+  static Glib::RefPtr<Gnome::Gda::DataModel> query_execute_select(const Glib::RefPtr<const Gnome::Gda::SqlBuilder>& builder,
+                                                                  const Glib::RefPtr<const Gnome::Gda::Set>& params = Glib::RefPtr<const Gnome::Gda::Set>(0));
 
 
   /** Execute a SQL non-select command, returning true if it succeeded.
@@ -92,8 +92,8 @@ public:
    */
   static bool query_execute(const Glib::ustring& strQuery,
                             const Glib::RefPtr<Gnome::Gda::Set>& params = Glib::RefPtr<Gnome::Gda::Set>(0));
-  static bool query_execute(const Glib::RefPtr<Gnome::Gda::SqlBuilder>& builder,
-                            const Glib::RefPtr<Gnome::Gda::Set>& params = Glib::RefPtr<Gnome::Gda::Set>(0));
+  static bool query_execute(const Glib::RefPtr<const Gnome::Gda::SqlBuilder>& builder,
+                            const Glib::RefPtr<const Gnome::Gda::Set>& params = Glib::RefPtr<const Gnome::Gda::Set>(0));
   
   static int count_rows_returned_by(const Glib::ustring& sql_query);