gnomemm r1851 - in libgdamm/trunk: . libgda/src
- From: murrayc svn gnome org
- To: svn-commits-list gnome org
- Subject: gnomemm r1851 - in libgdamm/trunk: . libgda/src
- Date: Sun, 14 Dec 2008 20:26:18 +0000 (UTC)
Author: murrayc
Date: Sun Dec 14 20:26:18 2008
New Revision: 1851
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1851&view=rev
Log:
2008-12-14 Murray Cumming <murrayc murrayc com>
* libgda/src/connection.ccg:
* libgda/src/connection.hg: statement_execute_select(): Add a
StatementModelUsage parameter, with a default value, so we can
specify a cursor model.
statement_execute_select_full(): Rename to statement_execute_select().
Modified:
libgdamm/trunk/ChangeLog
libgdamm/trunk/libgda/src/connection.ccg
libgdamm/trunk/libgda/src/connection.hg
Modified: libgdamm/trunk/libgda/src/connection.ccg
==============================================================================
--- libgdamm/trunk/libgda/src/connection.ccg (original)
+++ libgdamm/trunk/libgda/src/connection.ccg Sun Dec 14 20:26:18 2008
@@ -251,23 +251,24 @@
}
#ifdef GLIBMM_EXCEPTIONS_ENABLED
-Glib::RefPtr<DataModel> Connection::statement_execute_select(const Glib::RefPtr<Statement>& stmt)
+Glib::RefPtr<DataModel> Connection::statement_execute_select(const Glib::RefPtr<Statement>& stmt, StatementModelUsage model_usage)
#else
-Glib::RefPtr<DataModel> Connection::statement_execute_select(const Glib::RefPtr<Statement>& stmt, std::auto_ptr<Glib::Error>& error)
+Glib::RefPtr<DataModel> Connection::statement_execute_select(const Glib::RefPtr<Statement>& stmt, StatementModelUsage model_usage. 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);
+ return statement_execute_select(stmt, set, model_usage, types);
#else
- return statement_execute_select((stmt, set, error);
+ return statement_execute_select((stmt, set, model_usage, types, error);
#endif
}
#ifdef GLIBMM_EXCEPTIONS_ENABLED
-Glib::RefPtr<DataModel> Connection::statement_execute_select(const Glib::ustring& sql)
+Glib::RefPtr<DataModel> Connection::statement_execute_select(const Glib::ustring& sql, StatementModelUsage model_usage)
#else
-Glib::RefPtr<DataModel> Connection::statement_execute_select(const Glib::ustring& sql, std::auto_ptr<Glib::Error>& error)
+Glib::RefPtr<DataModel> Connection::statement_execute_select(const Glib::ustring& sql, StatementModelUsage model_usage, std::auto_ptr<Glib::Error>& error)
#endif // GLIBMM_EXCEPTIONS_ENABLED
{
Glib::RefPtr<SqlParser> parser = create_parser();
@@ -278,13 +279,13 @@
if(!stmt)
return Glib::RefPtr<DataModel>(0);
- return statement_execute_select(stmt);
+ return statement_execute_select(stmt, model_usage);
#else
Glib::RefPtr<Statement> stmt = parser->parse_string(sql, error);
if(error || !stmt)
return Glib::RefPtr<DataModel>(0);
- return statement_execute_select(stmt, error);
+ return statement_execute_select(stmt, model_usage, error);
#endif
}
Modified: libgdamm/trunk/libgda/src/connection.hg
==============================================================================
--- libgdamm/trunk/libgda/src/connection.hg (original)
+++ libgdamm/trunk/libgda/src/connection.hg Sun Dec 14 20:26:18 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);
- Glib::RefPtr<DataModel> statement_execute_select(const Glib::ustring& sql);
+ 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);
#else
- 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::RefPtr<Statement>& stmt, StatementModelUsage model_usage, 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_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)
+ _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)
_IGNORE(gda_connection_statement_execute_select_fullv)
_WRAP_METHOD_DOCS_ONLY(gda_connection_statement_execute_non_select)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]