Added command line options for databases connection.

diff --git a/.anjuta_sym_db.db b/.anjuta_sym_db.db
index c1e33b0e06b83921c43e7016bf42135cf655e431..583328c4d8a71eefbb76f043a9aa9ea6b1d49f2b 100644 (file)
Binary files a/.anjuta_sym_db.db and b/.anjuta_sym_db.db differ

diff --git a/.gitignore b/.gitignore
index c24714201d62251eb18d037353172209e356908e..2ac0acff7e6e67fdc39dcf5892c18d9d0f98e706 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ stamp-h1
 src/share
 *.csv
 *.rc
+mkinstalldirs

diff --git a/Makefile.am b/Makefile.am
index 8a13b38f5ea2807d7d25dc6da14710fc7772867d..45bd61861b9fd7cba38ef433cbee9ff7ce8af516 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src
+SUBDIRS = src tests
 
 distclean-local:
        if test "$(srcdir)" = "."; then :; else \

diff --git a/configure.ac b/configure.ac
index 6c320ad6b48447b0954c38766e78766d02c863a8..b8ff4dc94cc03660967f84fcf4d1475991aba50b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
+dnl ******************************
+dnl Translations
+dnl ******************************
+GETTEXT_PACKAGE=gdadbdiff
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+                   [The prefix for our gettext translation domains.])
+AM_GLIB_GNU_GETTEXT
+
 # Checks for libraries.
 PKG_CHECK_MODULES(GDADBDIFF, [libgda-4.0 >= 4.0.0])
 
@@ -53,5 +62,6 @@ AM_CONDITIONAL(PLATFORM_WIN32, [test $platform_win32 = yes])
 AC_CONFIG_FILES([
        Makefile
        src/Makefile
+       tests/Makefile
 ])
 AC_OUTPUT

diff --git a/src/main.c b/src/main.c
index a048f3b8681755c814974746d1a55c761a6b6f00..547d05353e82f5d00e09245b2b881add72f3053c 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -22,10 +22,71 @@
 
 #include <libgda/libgda.h>
 
+static gchar *ref_db_cnc = NULL;
+static gchar *db_cnc = NULL;
+
+GdaConnection *gda_conn_ref_db;
+GdaConnection *gda_conn_db;
+
+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" },
+       { NULL }
+};
+
 int
 main (int argc, char *argv[])
 {
+       GError *error;
+       GOptionContext *context;
+
+       g_type_init ();
+
+       error = NULL;
+       context = g_option_context_new ("- compare databases schema");
+       g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+       if (!g_option_context_parse (context, &argc, &argv, &error))
+               {
+                       g_error ("Option parsing failed: %s.", error->message);
+                       return 1;
+               }
+
+       if (ref_db_cnc == NULL)
+               {
+                       g_error ("You must enter on command line the reference database connection string.");
+                       return 1;
+               }
+       if (db_cnc == NULL)
+               {
+                       g_error ("You must enter on command line the database connection string.");
+                       return 1;
+               }
+
+       error = NULL;
+       gda_conn_ref_db = gda_connection_open_from_string (NULL, ref_db_cnc, NULL,
+                                              GDA_CONNECTION_OPTIONS_NONE,
+                                              &error);
+       if (gda_conn_ref_db == NULL || error != NULL)
+               {
+                       g_warning ("Could not open connection to reference database: %s.\n",
+                                  error != NULL && error->message != NULL ? error->message : "no detail");
+                       return;
+               }
+
+       error = NULL;
+       gda_conn_db = gda_connection_open_from_string (NULL, db_cnc, NULL,
+                                              GDA_CONNECTION_OPTIONS_NONE,
+                                              &error);
+       if (gda_conn_db == NULL || error != NULL)
+               {
+                       g_warning ("Could not open connection to database: %s.\n",
+                                  error != NULL && error->message != NULL ? error->message : "no detail");
+                       return;
+               }
 
+       g_object_unref (gda_conn_ref_db);
+       g_object_unref (gda_conn_db);
 
        return 0;
 }

diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644 (file)
index 0000000..d3e7a06
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = refdb.db \
+             db.db

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

diff --git a/tests/refdb.db b/tests/refdb.db
new file mode 100644 (file)
index 0000000..9831ee9
Binary files /dev/null and b/tests/refdb.db differ