Changes for libgda5.

diff --git a/.gitignore b/.gitignore
index 68ee39fbef12a1f2aac66c123198cc0b814b9bf0..34614ef6a39848db449668797e9a9f057ef94510 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ src/share
 mkinstalldirs
 ChangeLog
 gdadbcopy*.tar.gz
 mkinstalldirs
 ChangeLog
 gdadbcopy*.tar.gz

+compile
\ No newline at end of file

diff --git a/configure.ac b/configure.ac
index a63acbcc1b55c0d0689077e933ff2313bcefa96a..66434a3b9369b6043ed8ec3e2ed79b167a1fa065 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 AM_GLIB_GNU_GETTEXT
 
 # Checks for libraries.
 AM_GLIB_GNU_GETTEXT
 
 # Checks for libraries.

-PKG_CHECK_MODULES(GDADBCOPY, [libgda-4.0 >= 4.0.0])
+PKG_CHECK_MODULES(GDADBCOPY, [libgda-5.0 >= 5.0.0])

 
 AC_SUBST(GDADBCOPY_CFLAGS)
 AC_SUBST(GDADBCOPY_LIBS)
 
 AC_SUBST(GDADBCOPY_CFLAGS)
 AC_SUBST(GDADBCOPY_LIBS)

diff --git a/src/main.c b/src/main.c
index eb0b46e8750c0eda261091f04012e0e7cf77f0d3..6fad3344999ccfc00616d764d03bcc0ab3186d1d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2012 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2012-2019 Andrea Zagli <azagli@libero.it>

  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by


@@ -20,6 +20,8 @@
        #include <config.h>
 #endif
 
        #include <config.h>
 #endif
 

+#include <glib/gprintf.h>
+

 #include <libgda/libgda.h>
 #include <sql-parser/gda-sql-parser.h>
 
 #include <libgda/libgda.h>
 #include <sql-parser/gda-sql-parser.h>
 


@@ -132,9 +134,9 @@ copy_data ()
                        sql = g_strdup_printf ("SELECT * FROM %s",
                                               table->name);
                        error = NULL;
                        sql = g_strdup_printf ("SELECT * FROM %s",
                                               table->name);
                        error = NULL;

-                       dm = gda_execute_select_command (gda_conn_ref_db,
-                                                        sql,
-                                                        &error);
+                       dm = gda_connection_execute_select_command (gda_conn_ref_db,
+                                                                   sql,
+                                                                   &error);

                        g_free (sql);
                        if (dm != NULL && error == NULL)
                                {
                        g_free (sql);
                        if (dm != NULL && error == NULL)
                                {


@@ -432,7 +434,7 @@ read_fields (Table *table, GdaServerOperation *op)
        store = gda_connection_get_meta_store (gda_conn_ref_db);
        mstruct = gda_meta_struct_new (store, GDA_META_STRUCT_FEATURE_NONE);
        dbo = gda_meta_struct_complement (mstruct, GDA_META_DB_TABLE,
        store = gda_connection_get_meta_store (gda_conn_ref_db);
        mstruct = gda_meta_struct_new (store, GDA_META_STRUCT_FEATURE_NONE);
        dbo = gda_meta_struct_complement (mstruct, GDA_META_DB_TABLE,

-                                         NULL, NULL, 
+                                         NULL, NULL,

                                          gval, &error);
 
        gda_value_free (gval);
                                          gval, &error);
 
        gda_value_free (gval);


@@ -910,7 +912,7 @@ read_views ()
                                                        else
                                                                {
                                                                        error = NULL;
                                                        else
                                                                {
                                                                        error = NULL;

-                                                                       if (!gda_server_operation_set_value_at (op, view_name, &error, 
+                                                                       if (!gda_server_operation_set_value_at (op, view_name, &error,

                                                                                                                "/VIEW_DESC_P/VIEW_NAME"))
                                                                                {
                                                                                        g_warning ("Error on setting GdaServerOperation's value: %s.",
                                                                                                                "/VIEW_DESC_P/VIEW_NAME"))
                                                                                {
                                                                                        g_warning ("Error on setting GdaServerOperation's value: %s.",


@@ -941,7 +943,7 @@ read_views ()
                                        store = gda_connection_get_meta_store (gda_conn_ref_db);
                                        mstruct = gda_meta_struct_new (store, GDA_META_STRUCT_FEATURE_NONE);
                                        dbo = gda_meta_struct_complement (mstruct, GDA_META_DB_VIEW,
                                        store = gda_connection_get_meta_store (gda_conn_ref_db);
                                        mstruct = gda_meta_struct_new (store, GDA_META_STRUCT_FEATURE_NONE);
                                        dbo = gda_meta_struct_complement (mstruct, GDA_META_DB_VIEW,

-                                                                         NULL, NULL, 
+                                                                         NULL, NULL,

                                                                          gval, &error);
 
                                        gda_value_free (gval);
                                                                          gval, &error);
 
                                        gda_value_free (gval);


@@ -992,7 +994,7 @@ read_views ()
                                                }
 
                                        error = NULL;
                                                }
 
                                        error = NULL;

-                                       if (!gda_server_operation_set_value_at (op, view_name, &error, 
+                                       if (!gda_server_operation_set_value_at (op, view_name, &error,

                                                                                "/VIEW_DEF_P/VIEW_NAME"))
                                                {
                                                        g_warning ("Error on setting GdaServerOperation's value: %s.",
                                                                                "/VIEW_DEF_P/VIEW_NAME"))
                                                {
                                                        g_warning ("Error on setting GdaServerOperation's value: %s.",


@@ -1001,7 +1003,7 @@ read_views ()
                                                }
 
                                        error = NULL;
                                                }
 
                                        error = NULL;

-                                       if (!gda_server_operation_set_value_at (op, view_def, &error, 
+                                       if (!gda_server_operation_set_value_at (op, view_def, &error,

                                                                                "/VIEW_DEF_P/VIEW_DEF"))
                                                {
                                                        g_warning ("Error on setting GdaServerOperation's value: %s.",
                                                                                "/VIEW_DEF_P/VIEW_DEF"))
                                                {
                                                        g_warning ("Error on setting GdaServerOperation's value: %s.",


@@ -1049,8 +1051,6 @@ main (int argc, char *argv[])
        GError *error;
        GOptionContext *context;
 
        GError *error;
        GOptionContext *context;
 

-       g_type_init ();
-

        error = NULL;
        context = g_option_context_new ("- copy from a database to another one");
        g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
        error = NULL;
        context = g_option_context_new ("- copy from a database to another one");
        g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);