gnomemm r1857 - in libgdamm/trunk: . libgda/src

[murrayc svn gnome org]

Author: murrayc
Date: Mon Dec 15 10:10:45 2008
New Revision: 1857
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1857&view=rev

Log:
2008-12-15  Murray Cumming  <murrayc murrayc com>

* libgda/src/connection.ccg:
* libgda/src/connection.hg: Reverted my last change because it is 
causing weird column-index warnings in Glom. I will try again. 

Modified:
   libgdamm/trunk/ChangeLog
   libgdamm/trunk/libgda/src/connection.ccg
   libgdamm/trunk/libgda/src/connection.hg
   libgdamm/trunk/libgda/src/statement.hg

Modified: libgdamm/trunk/libgda/src/connection.ccg
==============================================================================
--- libgdamm/trunk/libgda/src/connection.ccg	(original)
+++ libgdamm/trunk/libgda/src/connection.ccg	Mon Dec 15 10:10:45 2008
@@ -91,7 +91,6 @@
   GdaSet* lir = 0;
   Glib::RefPtr<Glib::Object> retval = Glib::wrap(
     gda_connection_statement_execute(gobj(), cmd->gobj(), Glib::unwrap(params), (GdaStatementModelUsage)model_usage, &lir, &gerror));
-
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -99,10 +98,10 @@
   if(gerror)
     error = ::Glib::Error::throw_exception(gerror);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
-
-  if(lir)
+  if (lir)
+  {
     last_inserted_row = Glib::wrap(lir);
-
+  }
   return retval;
 }
 
@@ -115,7 +114,6 @@
   GError* gerror = 0;
   Glib::RefPtr<Glib::Object> retval = Glib::wrap(
     gda_connection_statement_execute(gobj(), Glib::unwrap(stmt), 0, (GdaStatementModelUsage)model_usage, 0, &gerror));
-
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -123,7 +121,6 @@
   if(gerror)
     error = ::Glib::Error::throw_exception(gerror);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
-
   return retval;
 }
 
@@ -134,23 +131,20 @@
 #endif // GLIBMM_EXCEPTIONS_ENABLED
 {
   Glib::RefPtr<SqlParser> parser = create_parser();
-  if(parser)
+  if (parser)
   {
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
     Glib::RefPtr<Statement> stmt = parser->parse_string(sql);
-    if(!stmt)
+    if (!stmt)
       return Glib::RefPtr<Object>(0);
-
     return statement_execute (stmt, model_usage);
 #else
     Glib::RefPtr<Statement> stmt = parser->parse_string(sql, error);
-    if(error || !stmt)
+    if (error || !stmt)
       return Glib::RefPtr<Object>(0);
-
     return statement_execute (stmt, model_usage, error);
 #endif
   }
-
   std::cerr << "Gda::Connection::statement_execute(): Couldn't create parser" << std::endl;
   return Glib::RefPtr<Object>(0);
 }
@@ -163,8 +157,7 @@
 {
   GError* gerror = 0;
   GdaSet* lir = 0;
-  const int retval = gda_connection_statement_execute_non_select(gobj(), Glib::unwrap(cmd), Glib::unwrap(params), &lir, &gerror);
-
+  int retval = gda_connection_statement_execute_non_select(gobj(), Glib::unwrap(cmd), Glib::unwrap(params), &lir, &gerror);
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -172,10 +165,10 @@
   if(gerror)
     error = ::Glib::Error::throw_exception(gerror);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
-
-  if(lir)
+  if (lir)
+  {
     last_inserted_row = Glib::wrap(lir);
-
+  }
   return retval;
 }
 
@@ -204,16 +197,16 @@
 #endif // GLIBMM_EXCEPTIONS_ENABLED
 {
   Glib::RefPtr<SqlParser> parser = create_parser();
-  if(parser)
+  if (parser)
   {
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
     Glib::RefPtr<Statement> stmt = parser->parse_string(sql);
-    if(!stmt)
+    if (!stmt)
       return 0;
     return statement_execute_non_select(stmt);
 #else
     Glib::RefPtr<Statement> stmt = parser->parse_string(sql, error);
-    if(error || !stmt)
+    if (error || !stmt)
       return 0;
     return statement_execute_non_select(stmt, error);
 #endif
@@ -251,44 +244,40 @@
 }
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-Glib::RefPtr<DataModel> Connection::statement_execute_select(const Glib::RefPtr<Statement>& stmt, StatementModelUsage model_usage)
+Glib::RefPtr<DataModel> Connection::statement_execute_select(const Glib::RefPtr<Statement>& stmt)
 #else
-Glib::RefPtr<DataModel> Connection::statement_execute_select(const Glib::RefPtr<Statement>& stmt, StatementModelUsage model_usage. std::auto_ptr<Glib::Error>& error)
+Glib::RefPtr<DataModel> Connection::statement_execute_select(const Glib::RefPtr<Statement>& stmt, std::auto_ptr<Glib::Error>& error)
 #endif
 {
   Glib::RefPtr<Set> set;
-  std::list<GType> types;
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  return statement_execute_select(stmt, set, model_usage, types);
+  return statement_execute_select (stmt, set);
 #else
-  return statement_execute_select((stmt, set, model_usage, types, error);
+  return statement_execute_select (stmt, set, error);
 #endif
 }
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-Glib::RefPtr<DataModel> Connection::statement_execute_select(const Glib::ustring& sql, StatementModelUsage model_usage)
+Glib::RefPtr<DataModel> Connection::statement_execute_select(const Glib::ustring& sql)
 #else
-Glib::RefPtr<DataModel> Connection::statement_execute_select(const Glib::ustring& sql, StatementModelUsage model_usage, std::auto_ptr<Glib::Error>& error)
+Glib::RefPtr<DataModel> Connection::statement_execute_select(const Glib::ustring& sql, std::auto_ptr<Glib::Error>& error)
 #endif // GLIBMM_EXCEPTIONS_ENABLED
 {
   Glib::RefPtr<SqlParser> parser = create_parser();
-  if(parser)
+  if (parser)
   {
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
     Glib::RefPtr<Statement> stmt = parser->parse_string(sql);
-    if(!stmt)
+    if (!stmt)
       return Glib::RefPtr<DataModel>(0);
-
-    return statement_execute_select(stmt, model_usage);
+    return statement_execute_select (stmt);
 #else
     Glib::RefPtr<Statement> stmt = parser->parse_string(sql, error);
-    if(error || !stmt)
+    if (error || !stmt)
       return Glib::RefPtr<DataModel>(0);
-
-    return statement_execute_select(stmt, model_usage, error);
+    return statement_execute_select (stmt, error);
 #endif
   }
-
   std::cerr << "Gda::Connection::statement_execute(): Couldn't create parser" << std::endl;
   return Glib::RefPtr<DataModel>(0);
 }

Modified: libgdamm/trunk/libgda/src/connection.hg
==============================================================================
--- libgdamm/trunk/libgda/src/connection.hg	(original)
+++ libgdamm/trunk/libgda/src/connection.hg	Mon Dec 15 10:10:45 2008
@@ -131,15 +131,15 @@
   _WRAP_METHOD(Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<Statement>& stmt, const Glib::RefPtr<Set>& params), gda_connection_statement_execute_select, errthrow)
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<Statement>& stmt, StatementModelUsage model_usage = STATEMENT_MODEL_RANDOM_ACCESS);
-  Glib::RefPtr<DataModel> statement_execute_select(const Glib::ustring& sql, StatementModelUsage model_usage = STATEMENT_MODEL_RANDOM_ACCESS);
+  Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<Statement>& stmt);
+  Glib::RefPtr<DataModel> statement_execute_select(const Glib::ustring& sql);
 #else
-  Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<Statement>& stmt, StatementModelUsage model_usage, std::auto_ptr<Glib::Error>& error);
+  Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<Statement>& stmt, std::auto_ptr<Glib::Error>& error);
   Glib::RefPtr<DataModel> statement_execute_select(const Glib::ustring& sql, std::auto_ptr<Glib::Error>& error);
 #endif  
 
   #m4 _CONVERSION(`const Glib::ArrayHandle<GType>&', `GType*', `const_cast<GType*>(($3).data())')
-  _WRAP_METHOD(Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<Statement>& stmt, const Glib::RefPtr<Set>& params, StatementModelUsage model_usage, const Glib::ArrayHandle<GType>& col_types), gda_connection_statement_execute_select_full, errthrow)
+  _WRAP_METHOD(Glib::RefPtr<DataModel> statement_execute_select_full(const Glib::RefPtr<Statement>& stmt, const Glib::RefPtr<Set>& params, StatementModelUsage model_usage, const Glib::ArrayHandle<GType>& col_types), gda_connection_statement_execute_select_full, errthrow)
   _IGNORE(gda_connection_statement_execute_select_fullv)
   
   _WRAP_METHOD_DOCS_ONLY(gda_connection_statement_execute_non_select)

Modified: libgdamm/trunk/libgda/src/statement.hg
==============================================================================
--- libgdamm/trunk/libgda/src/statement.hg	(original)
+++ libgdamm/trunk/libgda/src/statement.hg	Mon Dec 15 10:10:45 2008
@@ -34,9 +34,9 @@
 
 class Connection;
 
-_WRAP_ENUM(SqlStatementType, GdaSqlStatementType)
-_WRAP_ENUM(StatementModelUsage, GdaStatementModelUsage)
-_WRAP_ENUM(StatementSqlFlag, GdaStatementSqlFlag)
+_WRAP_ENUM (SqlStatementType, GdaSqlStatementType)
+_WRAP_ENUM (StatementModelUsage, GdaStatementModelUsage)
+_WRAP_ENUM (StatementSqlFlag, GdaStatementSqlFlag)
 
 /** Single SQL statement.
  *