Bugfixes and first test.

diff --git a/src/dbtransformer.c b/src/dbtransformer.c
index c04b0ce6fe7cbfa32983bb2f947fa0ea43036524..d6c8a2297e2bb0bc6a409cf439f9b56c03f8a157 100644 (file)
--- a/src/dbtransformer.c
+++ b/src/dbtransformer.c
@@ -20,6 +20,7 @@
        #include <config.h>
 #endif
 
+#include <libxml/xpath.h>
 #include <sql-parser/gda-sql-parser.h>
 
 #include "libdbtransformer.h"
@@ -42,6 +43,8 @@ typedef struct _DbtPrivate DbtPrivate;
 struct _DbtPrivate
        {
                GdaConnection *gda_conn;
+
+               xmlDocPtr xml_doc;
                xmlNodePtr xml_root;
        };
 
@@ -64,6 +67,7 @@ dbt_init (Dbt *dbt)
        DbtPrivate *priv = DBT_GET_PRIVATE (dbt);
 
        priv->gda_conn = NULL;
+       priv->xml_doc = NULL;
        priv->xml_root = NULL;
 }
 
@@ -95,6 +99,8 @@ dbt_get_connection_parser (Dbt *dbt)
 
        /* attach the parser object to the connection */
        g_object_set_data_full (G_OBJECT (priv->gda_conn), "parser", parser, g_object_unref);
+
+       return TRUE;
 }
 
 void
@@ -181,6 +187,12 @@ dbt_set_xml (Dbt *dbt, xmlNodePtr xml_root)
                {
                        priv->xml_root = NULL;
                }
+       else
+               {
+                       /* creation of an xmlDoc */
+                       priv->xml_doc = xmlNewDoc ("1.0");
+                       xmlDocSetRootElement (priv->xml_doc, priv->xml_root);
+               }
 }
 
 void
@@ -195,7 +207,7 @@ dbt_set_xml_from_filename (Dbt *dbt, const gchar *filename)
        g_return_if_fail (IS_DBT (dbt));
        g_return_if_fail (filename != NULL);
 
-       filen = g_strstrip (g_strdup (filen));
+       filen = g_strstrip (g_strdup (filename));
 
        g_return_if_fail (g_strcmp0 (filen, "") != 0);  
 
@@ -209,7 +221,10 @@ dbt_set_xml_from_filename (Dbt *dbt, const gchar *filename)
                        return;
                }
 
-       priv->xml_root = xmlDocGetRootElement (xdoc);
+       priv = DBT_GET_PRIVATE (dbt);
+
+       priv->xml_doc = xdoc;
+       priv->xml_root = xmlDocGetRootElement (priv->xml_doc);
        if (priv->xml_root == NULL)
                {
                        g_warning ("No root element in xml file.");
@@ -229,6 +244,7 @@ dbt_check_db (Dbt *dbt)
 
        GdaSqlParser *parser;
        GdaStatement *stmt;
+       GdaDataModel *dm;
        GError *error;
 
        gchar *sql;
@@ -252,39 +268,54 @@ dbt_check_db (Dbt *dbt)
        stmt = gda_sql_parser_parse_string (parser, sql, NULL, &error);
        if (stmt == NULL)
                {
-                       /* table doesn't exist */
-                       GdaServerProvider *provider;
-                       GdaServerOperation *op;
-                       gint i;
-
-                       /* create a new GdaServerOperation object */
-                       provider = gda_connection_get_provider (priv->gda_conn);
-                       op = gda_server_provider_create_operation (provider, priv->gda_conn, GDA_SERVER_OPERATION_CREATE_TABLE, NULL, &error);
-                       if (!op)
+                       g_warning ("Unable to create GdaStatement from sql: %s\n%s",
+                                  sql, error && error->message ? error->message : "No detail");
+               }
+       else
+               {
+                       dm = gda_connection_statement_execute_select (priv->gda_conn, stmt, NULL, &error);
+                       g_object_unref (stmt);
+                       if (!dm)
                                {
-                                       g_print ("CREATE TABLE operation is not supported by the provider: %s\n",
-                                                error && error->message ? error->message : "No detail");
-                                       return ret;
-                               }
-
-                       /* Set parameter's values */
-                       /* table name */
-                       gda_server_operation_set_value_at (op, "dbt_transformations", &error, "/TABLE_DEF_P/TABLE_NAME");
+                                       /* table doesn't exist */
+                                       GdaServerProvider *provider;
+                                       GdaServerOperation *op;
+                                       gint i;
+
+                                       /* create a new GdaServerOperation object */
+                                       provider = gda_connection_get_provider (priv->gda_conn);
+                                       op = gda_server_provider_create_operation (provider, priv->gda_conn, GDA_SERVER_OPERATION_CREATE_TABLE, NULL, &error);
+                                       if (!op)
+                                               {
+                                                       g_print ("CREATE TABLE operation is not supported by the provider: %s\n",
+                                                                        error && error->message ? error->message : "No detail");
+                                                       return ret;
+                                               }
+
+                                       /* Set parameter's values */
+                                       /* table name */
+                                       gda_server_operation_set_value_at (op, "dbt_transformations", &error, "/TABLE_DEF_P/TABLE_NAME");
                
-                       /* "id' field */
-                       i = 0;
-                       gda_server_operation_set_value_at (op, "id", &error, "/FIELDS_A/@COLUMN_NAME/%d", i);
-                       gda_server_operation_set_value_at (op, "integer", &error, "/FIELDS_A/@COLUMN_TYPE/%d", i);
-                       gda_server_operation_set_value_at (op, "TRUE", &error, "/FIELDS_A/@COLUMN_PKEY/%d", i);
-
-                       /* Actually execute the operation */
-                       if (!gda_server_provider_perform_operation (provider, priv->gda_conn, op, &error))
-                               {
-                                       g_print ("Error executing the operation: %s\n",
-                                                error && error->message ? error->message : "No detail");
-                                       return ret;
+                                       /* "id" field */
+                                       i = 0;
+                                       gda_server_operation_set_value_at (op, "id", &error, "/FIELDS_A/@COLUMN_NAME/%d", i);
+                                       gda_server_operation_set_value_at (op, "integer", &error, "/FIELDS_A/@COLUMN_TYPE/%d", i);
+                                       gda_server_operation_set_value_at (op, "TRUE", &error, "/FIELDS_A/@COLUMN_PKEY/%d", i);
+
+                                       /* "operation" field */
+                                       i++;
+                                       gda_server_operation_set_value_at (op, "operation", &error, "/FIELDS_A/@COLUMN_NAME/%d", i);
+                                       gda_server_operation_set_value_at (op, "text", &error, "/FIELDS_A/@COLUMN_TYPE/%d", i);
+
+                                       /* execute the operation */
+                                       if (!gda_server_provider_perform_operation (provider, priv->gda_conn, op, &error))
+                                               {
+                                                       g_print ("Error executing the operation: %s\n",
+                                                                        error && error->message ? error->message : "No detail");
+                                                       return ret;
+                                               }
+                                       g_object_unref (op);                    
                                }
-                       g_object_unref (op);                    
                }
 
        ret = TRUE;
@@ -293,9 +324,15 @@ dbt_check_db (Dbt *dbt)
 }
 
 void
-dbt_exec (Dbt *dbt)
+dbt_transform (Dbt *dbt)
 {
        DbtPrivate *priv;
+       xmlXPathContextPtr xpcontext;
+       xmlXPathObjectPtr xpresult;
+       xmlNodeSetPtr xnodeset;
+       xmlNodePtr xnode;
+
+       guint i;
 
        g_return_if_fail (IS_DBT (dbt));
 
@@ -308,6 +345,49 @@ dbt_exec (Dbt *dbt)
                {
                        return;
                }
+
+       xpcontext = xmlXPathNewContext (priv->xml_doc);
+       xpcontext->node = priv->xml_root;
+
+       xpresult = xmlXPathEvalExpression ((const xmlChar *)"child::dbtransformation", xpcontext);
+       if (!xmlXPathNodeSetIsEmpty (xpresult->nodesetval))
+               {
+                       GdaSqlParser *parser = g_object_get_data (G_OBJECT (priv->gda_conn), "parser");
+                       if (!parser)
+                               {
+                                       g_warning ("Invalid sql parser.");
+                                       return;
+                               }
+
+                       xnodeset = xpresult->nodesetval;
+                       for (i = 0; i < xnodeset->nodeNr; i++)
+                               {
+                                       xnode = xnodeset->nodeTab[i];
+                                       if (xmlStrcmp (xnode->name, (const xmlChar *)"sql") == 0)
+                                               {
+                                                       gchar *sql = (gchar *)xmlNodeGetContent (xnode);
+
+                                                       GdaStatement *stmt;
+                                                       GError *error = NULL;
+
+                                                       stmt = gda_sql_parser_parse_string (parser, g_strstrip (sql), NULL, &error);
+                                                       if (stmt == NULL)
+                                                               {
+                                                                       g_warning ("Unable to create GdaStatement from sql: %s\n%s",
+                                                                                  sql, error && error->message ? error->message : "No detail");
+                                                               }
+                                                       else
+                                                               {
+                                                                       guint nrows = gda_connection_statement_execute_non_select (priv->gda_conn, stmt, NULL, NULL, &error);
+                                                                       if (nrows == -1)
+                                                                               {
+                                                                                       g_warning ("NON SELECT error: %s\n", error && error->message ? error->message : "no detail");
+                                                                               }
+                                                                       g_object_unref (stmt);
+                                                               }
+                                               }
+                               }
+               }
 }
 
 /* PRIVATE */

diff --git a/src/libdbtransformer.h b/src/libdbtransformer.h
index 4bf4f8c3e0e444973fd8e82ab26fb96f0ecd7dca..a0993aa1c902844fe3ad774c642f0e5be55250e7 100644 (file)
--- a/src/libdbtransformer.h
+++ b/src/libdbtransformer.h
@@ -59,7 +59,7 @@ void dbt_set_db_connection_from_string (Dbt *dbt, const gchar *cnc_string);
 void dbt_set_xml (Dbt *dbt, xmlNodePtr xml_root);
 void dbt_set_xml_from_filename (Dbt *dbt, const gchar *filename);
 
-void dbt_exec (Dbt *dbt);
+void dbt_transform (Dbt *dbt);
 
 
 G_END_DECLS

diff --git a/tests/test.c b/tests/test.c
index 43c0f24ebba33c99b32695bde96dfd0d94a0651c..858288e277201fb15ef19699fe313c747b4825d5 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -18,10 +18,19 @@
 
 #include "libdbtransformer.h"
 
+Dbt *dbt;
+
 int
 main (int argc, char **argv)
 {
        g_type_init ();
 
+       dbt = dbt_new ();
+
+       dbt_set_db_connection_from_string (dbt, "SQLite://DB_DIR=tests;DB_NAME=test.db");
+       dbt_set_xml_from_filename (dbt, "tests/test.xml");
+
+       dbt_transform (dbt);
+
        return 0;
 }

diff --git a/tests/test.db b/tests/test.db
new file mode 100644 (file)
index 0000000..3d0c0b1
Binary files /dev/null and b/tests/test.db differ

diff --git a/tests/test.xml b/tests/test.xml
new file mode 100644 (file)
index 0000000..b28cd9a
--- /dev/null
+++ b/tests/test.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<dbtransformer>
+
+       <dbtransformation id="1">
+               <sql>
+                       CREATE TABLE clients (id integer, name varchar(50), CONSTRAINT PRIMARY KEY clients_pkey (id))
+               </sql>
+               <sql>
+                       CREATE TABLE orders (id integer, id_client integer, "date" date, CONSTRAINT PRIMARY KEY orders_pkey (id))
+               </sql>
+       </dbtransformation>
+
+       <dbtransformation id="2">
+               <sql>
+                       ALTER TABLE order ADD COLUMN (total double)
+               </sql>
+       </dbtransformation>
+
+</dbtransformer>