gnomemm r1556 - in libgdamm/branches/libgdamm-4-0: examples/simple libgda libgda/libgdamm libgda/src

[jhs svn gnome org]

Author: jhs
Date: Tue Jun 10 11:11:02 2008
New Revision: 1556
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1556&view=rev

Log:
2008-06-10  Johannes Schmid  <jhs gnome org>

	* examples/simple/main.cc:
	Started (very) simple example
	
	* libgda/libgdamm.h:
	* libgda/libgdamm/init.cc:
	* libgda/libgdamm/init.h:
	* libgda/src/connection.ccg:
	* libgda/src/connection.hg:
	Updated to build the example

Modified:
   libgdamm/branches/libgdamm-4-0/examples/simple/main.cc
   libgdamm/branches/libgdamm-4-0/libgda/libgdamm.h
   libgdamm/branches/libgdamm-4-0/libgda/libgdamm/init.cc
   libgdamm/branches/libgdamm-4-0/libgda/libgdamm/init.h
   libgdamm/branches/libgdamm-4-0/libgda/src/connection.ccg
   libgdamm/branches/libgdamm-4-0/libgda/src/connection.hg

Modified: libgdamm/branches/libgdamm-4-0/examples/simple/main.cc
==============================================================================
--- libgdamm/branches/libgdamm-4-0/examples/simple/main.cc	(original)
+++ libgdamm/branches/libgdamm-4-0/examples/simple/main.cc	Tue Jun 10 11:11:02 2008
@@ -22,129 +22,110 @@
 #include <libgdamm.h>
 #include <iostream>
 
+using namespace Gnome;
 
 int main (int argc, char** argv)
 {
-  //Initialize libgdamm:
-  Gnome::Gda::init("libgdamm example", "0.1", argc, argv);
-
-#ifndef GLIBMM_EXCEPTIONS_ENABLED
-  std::auto_ptr<Glib::Error> error;
-#endif // !GLIBMM_EXCEPTIONS_ENABLED
-
-  Glib::RefPtr<Gnome::Gda::Client> gda_client = Gnome::Gda::Client::create();
-  if(gda_client)
-  {
-    //Get a stored data source:
-    //(Note that you might prefer to just use Gnome::Gda::Client::open_connection_from_string() instead.)
-    const Glib::ustring data_source_name = "datasource_libgdamm_example_simple";
-    Gnome::Gda::DataSourceInfo data_source = Gnome::Gda::Config::find_data_source(data_source_name);
-    if(!data_source)
-    {
-      std::cout << "Creating the DataSource, because it does not exist yet." << std::endl;
-      //Create it if it does not exist already:
-      data_source = Gnome::Gda::DataSourceInfo();
-      data_source.set_name(data_source_name);
-      data_source.set_username("murrayc");
-      data_source.set_password("murraycpw");      
-      data_source.set_description("Data Source for libgdamm simple example.");
-      data_source.set_provider("PostgreSQL");
-      data_source.set_cnc_string("DB_NAME=glom_musiccollection21");
-      
-      Gnome::Gda::Config::save_data_source(data_source);
-    }
-
-    std::cout << " Data source = " << data_source.get_name() << ", User = " << data_source.get_username() << std::endl;
-
-    Glib::RefPtr<Gnome::Gda::Connection> gda_connection;
-#ifdef GLIBMM_EXCEPTIONS_ENABLED
-    try
-    {
-      gda_connection = gda_client->open_connection(data_source.get_name(), data_source.get_username(), data_source.get_password() );
-    }
-    catch(const Glib::Exception& ex)
-    {
-      std::cerr << "Exception caught: " << ex.what() << std::endl;
-    }
-#else
-    gda_connection = gda_client->open_connection(data_source.get_name(), data_source.get_username(), data_source.get_password(), Gnome::Gda::ConnectionOptions(0), error);
-    if(error.get())
-    {
-      std::cerr << "Exception caught: " << error->what() << std::endl;
-    }
-#endif // GLIBMM_EXCEPTIONS_ENABLED
-    
-    if(!gda_connection)
-      std::cerr << "Error: Could not open connection to " << data_source.get_name();
-    else
-    {
-      //Open database:
-      //gda_connection->change_database("murrayc");
-
-      //Get data from a table:
-      Gnome::Gda::Command command("SELECT * FROM artists");
-
-      Glib::RefPtr<Gnome::Gda::DataModel> data_model;
-#ifdef GLIBMM_EXCEPTIONS_ENABLED
-      try
-      {
-        data_model = gda_connection->execute_select_command(command);
-      }
-      catch(const Glib::Exception& ex)
-      {
-       std::cerr << "Exception caught: " << ex.what() << std::endl;
-      }
-#else
-      data_model = gda_connection->execute_select_command(command, error);
-      if(error.get())
-      {
-        std::cerr << "Exception caught: " << error->what() << std::endl;
-      }
-#endif //GLIBMM_EXCEPTIONS_ENABLED
-
-      if(!data_model)
-      {
-        std::cout << "command execution failed." << std::endl;
-      }
-      else if(data_model) 
-      {
-        int columns =  data_model->get_n_columns();
-        std::cout << "    Number of columns: " << columns << std::endl;
-
-        for(int i = 0; i < columns; ++i)
-        {
-          std::cout << "      column " << i << ": " <<  data_model->get_column_title(i);
-
-          //Find out whether it's the primary key:
-          const Glib::RefPtr<Gnome::Gda::Column> field = data_model->describe_column(i);
-          bool is_primary_key = field->get_primary_key();
-          if(is_primary_key)
-            std:: cout << "  (primary key)";
-
-          std::cout << std::endl;
-        }
-
-        const int rows = data_model->get_n_rows();
-        std::cout << "    Number of rows: " << rows << std::endl;
-
-        for(int i = 0; i < rows; ++i)
-        {
-          std::cout << "      row " << i << ": ";
-
-          for(int col = 0; col < columns; ++col)
-          {
-            Gnome::Gda::Value value_name = data_model->get_value_at(col, i);
-            std::cout << value_name.to_string() << ", ";
-          }
-
-          std::cout << std::endl;   
-        }
-      }
-    }
-  } 
-
+  Gda::init();
+  Glib::RefPtr<Gda::Connection> cnc;
+  try
+  {
+    cnc = Gda::Connection::open_from_string ("SQLite", "DB_DIR=.;DB_NAME=example_db", "",
+                                                                           Gda::CONNECTION_OPTIONS_NONE);
+  }
+  catch (Glib::Error& err)
+  {
+    std::cerr << err.what() << std::endl;
+    return 1;
+  }
+  /* create an SQL parser */
+	Glib::RefPtr<Gda::SqlParser> parser = cnc->create_parser();
+	if (!parser) /* @cnc doe snot provide its own parser => use default one */
+		parser = Gda::SqlParser::create();
+  
   
   return 0;
 }
 
+/*
+ * run a non SELECT command and stops if an error occurs
+ */
+void
+run_sql_non_select (const Glib::RefPtr<Gda::Connection>& cnc, const Glib::RefPtr<Gda::SqlParser>& parser, const Glib::ustring sql)
+{
+
+	Glib::RefPtr<Gda::Statement> stmt;
+  Glib::ustring remain;
+  try
+  {
+    stmt =  parser->parse_string (sql, remain);
+  }
+  catch (Glib::Error& err)
+  {
+    std::cerr << "Error: " << err.what() << std::endl;
+    return;
+  }
+	if (!remain.empty()) 
+		std::cout << "REMAINS: "<< remain << std::endl;
+
+  int nrows;
+  try
+  {
+    Glib::RefPtr<Gda::Set> params;
+    Glib::RefPtr<Gda::Set> last_inserted_row;    
+    nrows = cnc->statement_execute_non_select (stmt, params, last_inserted_row);
+  }
+  catch (Glib::Error& err)
+  {
+    std::cerr << err.what() << std::endl;
+    return;
+  }
+}
+
+/*
+ * Create a "products" table
+ */
+void
+create_table (const Glib::RefPtr<Gda::Connection>& cnc, const Glib::RefPtr<Gda::SqlParser>& parser)
+{
+	run_sql_non_select (cnc, parser, "DROP table IF EXISTS products");
+  run_sql_non_select (cnc, parser, "CREATE table products (ref string not null primary key, "
+                                                           "name string not null, price real)");
+	run_sql_non_select (cnc, parser, "INSERT INTO products VALUES ('p1', 'chair', 2.0)");
+	run_sql_non_select (cnc, parser, "INSERT INTO products VALUES ('p2', 'table', 5.0)");
+
+	run_sql_non_select (cnc, parser, "INSERT INTO products VALUES ('p3', 'glass', 1.1)");
+}
 
+/* 
+ * display the contents of the 'products' table 
+ */
+void
+display_products_contents (const Glib::RefPtr<Gda::Connection>& cnc, const Glib::RefPtr<Gda::SqlParser>& parser)
+{
+	const Glib::ustring sql = "SELECT ref, name, price FROM products";
+  Glib::ustring remain;
+	Glib::RefPtr<Gda::Statement> stmt;
+  try
+  {
+    stmt =  parser->parse_string (sql, remain);
+  }
+  catch (Glib::Error& err)
+  {
+    std::cerr << "Error: " << err.what() << std::endl;
+    return;
+  }
+  Glib::RefPtr<Gda::Set> params;
+	Glib::RefPtr<Gda::DataModel> data_model;
+  try
+  {
+    data_model = cnc->statement_execute_select (stmt, params);
+  }
+  catch (Glib::Error& err)
+  { 
+    std::cout << "Could not get the contents of the 'products' table: " 
+      << err.what() << std::endl;
+    return;
+  }
+  std::cout << data_model->dump_as_string() << std::endl;
+}

Modified: libgdamm/branches/libgdamm-4-0/libgda/libgdamm.h
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/libgdamm.h	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/libgdamm.h	Tue Jun 10 11:11:02 2008
@@ -33,18 +33,28 @@
 #include <glibmm.h>
 
 #include <libgdamm/init.h>
-#include <libgdamm/client.h>
+#include <libgdamm/batch.h>
+#include <libgdamm/column.h>
 #include <libgdamm/config.h>
 #include <libgdamm/connection.h>
-#include <libgdamm/datamodel.h>
 #include <libgdamm/connectionevent.h>
+#include <libgdamm/datahandler.h>
+#include <libgdamm/datamodel.h>
 #include <libgdamm/datamodelarray.h>
 #include <libgdamm/datamodelquery.h>
-#include <libgdamm/query.h>
-#include <libgdamm/queryfieldagg.h>
-#include <libgdamm/queryfieldall.h>
-#include <libgdamm/queryfieldfield.h>
-#include <libgdamm/queryfieldvalue.h>
+#include <libgdamm/datamodelimport.h>
+#include <libgdamm/datamodeliter.h>
+#include <libgdamm/datamodelrow.h>
+#include <libgdamm/dataproxy.h>
+#include <libgdamm/holder.h>
+#include <libgdamm/metastore.h>
+#include <libgdamm/metastruct.h>
+#include <libgdamm/row.h>
 #include <libgdamm/serveroperation.h>
+#include <libgdamm/serverprovider.h>
+#include <libgdamm/set.h>
+#include <libgdamm/sqlparser.h>
+#include <libgdamm/statement.h>
+#include <libgdamm/transactionstatus.h>
 
 #endif /* #ifndef LIBGDAMM_H */

Modified: libgdamm/branches/libgdamm-4-0/libgda/libgdamm/init.cc
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/libgdamm/init.cc	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/libgdamm/init.cc	Tue Jun 10 11:11:02 2008
@@ -33,7 +33,7 @@
 namespace Gda
 {
 
-void init(const Glib::ustring& app_id, const Glib::ustring& version, int nargs, gchar *args[])
+void init()
 {
   Glib::init(); //Sets up the g type system and the Glib::wrap() table.
   wrap_init(); //Tells the Glib::wrap() table about the libgnomecanvasmm classes.

Modified: libgdamm/branches/libgdamm-4-0/libgda/libgdamm/init.h
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/libgdamm/init.h	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/libgdamm/init.h	Tue Jun 10 11:11:02 2008
@@ -31,7 +31,7 @@
 namespace Gda
 {
 
-void init(const Glib::ustring& app_id, const Glib::ustring& version, int nargs, gchar *args[]);
+void init();
 
 } //namespace Gda
 } //namespace Gnome

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/connection.ccg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/connection.ccg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/connection.ccg	Tue Jun 10 11:11:02 2008
@@ -43,6 +43,36 @@
   }
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+Glib::RefPtr<Connection> Connection::open_from_string (const Glib::ustring& provider_name,
+                                                       const Glib::ustring& cnc_string,
+                                                       const Glib::ustring& auth_string,
+                                                       ConnectionOptions options)
+#else
+Glib::RefPtr<Connection> Connection::open_from_string (const Glib::ustring& provider_name,
+                                                       const Glib::ustring& cnc_string,
+                                                       const Glib::ustring& auth_string,
+                                                       ConnectionOptions options,
+                                                       std::auto_ptr<Glib::Error>& error)
+#endif
+{
+  GError* gerror = 0;
+  Glib::RefPtr<Connection> retval = Glib::wrap(gda_connection_open_from_string (provider_name.c_str(),
+                                                                                cnc_string.c_str(),
+                                                                                auth_string.c_str(),
+                                                                                (GdaConnectionOptions)options,
+                                                                                &gerror));
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
+  return retval;
+}
+
 void Connection::close()
 {
   //gda_connection_close() does an unref, but we don't want that:

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/connection.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/connection.hg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/connection.hg	Tue Jun 10 11:11:02 2008
@@ -71,6 +71,21 @@
 public:
   _WRAP_CREATE()
 
+  /* This throws an error which we don't want to do in a constructor */
+  _WRAP_METHOD_DOCS_ONLY(gda_connection_open_from_string)
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  static Glib::RefPtr<Connection> open_from_string (const Glib::ustring& provider_name,
+                                                    const Glib::ustring& cnc_string,
+                                                    const Glib::ustring& auth_string,
+                                                    ConnectionOptions options);
+#else
+  static Glib::RefPtr<Connection> open_from_string (const Glib::ustring& provider_name,
+                                                    const Glib::ustring& cnc_string,
+                                                    const Glib::ustring& auth_string,
+                                                    ConnectionOptions options,
+                                                    std::auto_ptr<Glib::Error>& error);
+#endif
+
   _WRAP_METHOD(bool open(), gda_connection_open, errthrow)
 
   /** Closes the connection to the underlying data source, but first emits the "conn_to_close" signal.
@@ -162,7 +177,8 @@
   //_WRAP_METHOD(Glib::RefPtr<DataModel> get_meta_store_data (...), gda_connection_get_meta_store_data)
   _WRAP_METHOD(Glib::RefPtr<MetaStore> get_meta_store(), gda_connection_get_meta_store);
 
-  _WRAP_METHOD(Glib::RefPtr<Glib::Object> batch_execute(const Glib::RefPtr<Batch>& batch, const Glib::RefPtr<Set>& params, StatementModelUsage model_usage), gda_connection_batch_execute, errthrow)
+  _IGNORE (gda_connection_batch_execute) // has no implementation
+  //_WRAP_METHOD(Glib::RefPtr<Glib::Object> batch_execute(const Glib::RefPtr<Batch>& batch, const Glib::RefPtr<Set>& params, StatementModelUsage model_usage), gda_connection_batch_execute, errthrow)
   _WRAP_METHOD(Glib::RefPtr<ServerOperation> create_operation (ServerOperationType type, const Glib::RefPtr<Set>& options), gda_connection_create_operation, errthrow)
   _WRAP_METHOD(bool perform_operation (const Glib::RefPtr<ServerOperation>& op), gda_connection_perform_operation, errthrow)