From e55afcf6fefd1af840ee3049ec05870c7d7467c8 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sun, 16 Sep 2012 09:30:21 +0200 Subject: [PATCH] Added command line options for databases connection. --- .anjuta_sym_db.db | Bin 34816 -> 34816 bytes .gitignore | 1 + Makefile.am | 2 +- configure.ac | 10 ++++++++ src/main.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ tests/Makefile.am | 2 ++ tests/db.db | Bin 0 -> 2048 bytes tests/refdb.db | Bin 0 -> 2048 bytes 8 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 tests/Makefile.am create mode 100644 tests/db.db create mode 100644 tests/refdb.db diff --git a/.anjuta_sym_db.db b/.anjuta_sym_db.db index c1e33b0e06b83921c43e7016bf42135cf655e431..583328c4d8a71eefbb76f043a9aa9ea6b1d49f2b 100644 GIT binary patch delta 1188 zcmZ`&O-vI(6rP!Hce`6!p#*5!QVk*&Qxg|rY7StVN>Ac zV^hh{NM#bLF;Wq2Z~5jDSB+hw!#20D8J-Ite}d4m(znIe{CJQd%?5^8Y^ z??s2`$Yq>DLJhl-&2-k%Zbl<`UpCV-L%VblbxdpF8e?4bIyvWRIzAMNMM6MBfz z(}{3oBt9H{6i$mm;gTS-$4>QNYL9)lAMt(}Y@V2Xo z`xd@*T^Q_EDN5_HQDPDAi4m++f`UbcJbvQ`7V!xySi@Q_a}P6EWuD4P>77heXmOk? z?~FCcevR{^Ra@+`i_B#)B!}EWUlr2BDmQ9eONJA=uU>Agj6fBur)0Z_Y^M5R`I;oD z0-Hv!ZRQ;fU(s$867#C&4cfTzH8i0Y)iH<(Y%}a(o6z52w^8SrSdrfg+OIefpsw0t zc!pK6g;UtUD`Vy|AH-ds(yDoVhpb`|^YB3BEvSCQUxh0%JQi!An(kyX=ea+d@!fYT zE{*!Jq>qU&wxM)dX)#=fVpX|uR`F=wHd7kYSJjsJohKftLBR&YU+m&1Hn2~^tz$j! zP*>20T_!W^(;`9TlCi*8=xoyCr%wU$_ zWM`J-EUwH=%Fp3uW0nOm?ZUH8VFCD^LL^SbmcQ z3kw?~^CzHVHVbOJV3y!vWMPoyNGr`tF3HT#gXsLi!2D&ipw27i&0m~(O&~VEWMF=| zSy1FY^X8Y;(jX)LFfjiC8vmYI5NI1SGY2O`?|TO3_dt`MG7Ac@0Nn*M7-TsBF)>Gb diff --git a/.gitignore b/.gitignore index c247142..2ac0acf 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ stamp-h1 src/share *.csv *.rc +mkinstalldirs diff --git a/Makefile.am b/Makefile.am index 8a13b38..45bd618 100644 --- 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 6c320ad..b8ff4dc 100644 --- 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 a048f3b..547d053 100644 --- a/src/main.c +++ b/src/main.c @@ -22,10 +22,71 @@ #include +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 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 index 0000000000000000000000000000000000000000..9831ee9ed9ac7c1e57b3a448a1750eb81d7c9e3d GIT binary patch literal 2048 zcmWFz^vNtqRY=P(%1ta$FlJz3U}R))P*7lCU|`$&}+ zsEUy}kO7EB!Dt8!?+|FzVPqGVmS$|yFG)pJ literal 0 HcmV?d00001 diff --git a/tests/refdb.db b/tests/refdb.db new file mode 100644 index 0000000000000000000000000000000000000000..9831ee9ed9ac7c1e57b3a448a1750eb81d7c9e3d GIT binary patch literal 2048 zcmWFz^vNtqRY=P(%1ta$FlJz3U}R))P*7lCU|`$&}+ zsEUy}kO7EB!Dt8!?+|FzVPqGVmS$|yFG)pJ literal 0 HcmV?d00001 -- 2.49.0