Added command line table (to copy only specified tables/views).

diff --git a/.anjuta_sym_db.db b/.anjuta_sym_db.db
index 76de4102e41d84f1db60630974d7507fa49200dc..381d89a322b0ef0aaddd1c589ec2e3633ab038ef 100644 (file)
Binary files a/.anjuta_sym_db.db and b/.anjuta_sym_db.db differ

diff --git a/src/main.c b/src/main.c
index f8bf60fa1b61f61dce4441f86b32ac9b641c6470..ae30f1aaa929caccc84dff8cdc080993fe68878d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -24,12 +24,15 @@
 
 static gchar *ref_db_cnc = NULL;
 static gchar *db_cnc = NULL;
+static gchar **tables_to_copy = NULL;
 static gboolean drop_tables = FALSE;
 static gchar *output_file = NULL;
 static gboolean verbose = FALSE;
 
-static GdaConnection *gda_conn_ref_db;
-static GdaConnection *gda_conn_db;
+static GdaConnection *gda_conn_ref_db = NULL;
+static GdaConnection *gda_conn_db = NULL;
+
+static GHashTable *ht_tables_to_copy = NULL;
 
 static xmlDoc *xdoc;
 static xmlNode *xroot;
@@ -38,6 +41,7 @@ static GOptionEntry entries[] =
 {
        { "ref-db-cnc", 0, 0, G_OPTION_ARG_STRING, &ref_db_cnc, "Reference database connection string", "CNC_STRING" },
        { "db-cnc", 0, 0, G_OPTION_ARG_STRING, &db_cnc, "Database connection string", "CNC_STRING" },
+       { "table", 0, 0, G_OPTION_ARG_STRING_ARRAY, &tables_to_copy, "The table/view's name to copy (can be used multiple times)", "TABLE_NAME" },
        { "drop-tables", 0, 0, G_OPTION_ARG_NONE, &drop_tables, "Drop tables before creating new ones", NULL },
        { "output-file", 0, 0, G_OPTION_ARG_FILENAME, &output_file, "Ouput the whole operation in an xmlfile", "FILENAME" },
        { "verbose", 0, 0, G_OPTION_ARG_NONE, &verbose, "Verbose", NULL },
@@ -404,6 +408,17 @@ read_tables ()
                                        table->sqlbuilder = NULL;
                                        table->fields = NULL;
 
+                                       if (ht_tables_to_copy != NULL)
+                                               {
+                                                       if (!g_hash_table_lookup (ht_tables_to_copy,
+                                                                                 table->name))
+                                                               {
+                                                                       g_free (table->name);
+                                                                       g_free (table);
+                                                                       continue;
+                                                               }
+                                               }
+
                                        g_printf ("\tTable: %s\n",
                                                  table->name);
 
@@ -520,6 +535,15 @@ read_views ()
                        for (row = 0; row < rows; row++)
                                {
                                        view_name = g_strdup (gda_value_stringify (gda_data_model_get_value_at (dm_views, 0, row, NULL)));
+                                       if (ht_tables_to_copy != NULL)
+                                               {
+                                                       if (!g_hash_table_lookup (ht_tables_to_copy,
+                                                                                 view_name))
+                                                               {
+                                                                       g_free (view_name);
+                                                                       continue;
+                                                               }
+                                               }
 
                                        g_printf ("\tView: %s\n",
                                                  view_name);
@@ -699,6 +723,24 @@ main (int argc, char *argv[])
                        return;
                }
 
+       if (tables_to_copy != NULL)
+               {
+                       guint i;
+                       guint l;
+
+                       l = g_strv_length (tables_to_copy);
+                       if (l > 0)
+                               {
+                                       ht_tables_to_copy = g_hash_table_new (g_str_hash, g_str_equal);
+                               }
+                       for (i = 0; i < l; i++)
+                               {
+                                       g_hash_table_insert (ht_tables_to_copy,
+                                                            tables_to_copy[i],
+                                                            tables_to_copy[i]);
+                               }
+               }
+
        if (output_file != NULL)
                {
                        /* initialize output file */

diff --git a/tests/db.db b/tests/db.db
index 3acae74c67fb1993f874253949d4aa9a3f8b9ce9..8f7cd10fa4e04102bc1cb31e361e6d3110df5914 100644 (file)
Binary files a/tests/db.db and b/tests/db.db differ