From: Andrea Zagli <azagli@libero.it>
Date: Wed, 28 Aug 2019 19:15:11 +0000 (+0200)
Subject: Changes for libgda5.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=HEAD;p=gdadbcopy

Changes for libgda5.
---

diff --git a/.gitignore b/.gitignore
index 68ee39f..34614ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ src/share
 mkinstalldirs
 ChangeLog
 gdadbcopy*.tar.gz
+compile
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index a63acbc..66434a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 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)
diff --git a/src/main.c b/src/main.c
index eb0b46e..6fad334 100644
--- 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
@@ -20,6 +20,8 @@
 	#include <config.h>
 #endif
 
+#include <glib/gprintf.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;
-			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)
 				{
@@ -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,
-	                                  NULL, NULL, 
+	                                  NULL, NULL,
 	                                  gval, &error);
 
 	gda_value_free (gval);
@@ -910,7 +912,7 @@ read_views ()
 							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.",
@@ -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,
-					                                  NULL, NULL, 
+					                                  NULL, NULL,
 					                                  gval, &error);
 
 					gda_value_free (gval);
@@ -992,7 +994,7 @@ read_views ()
 						}
 
 					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.",
@@ -1001,7 +1003,7 @@ read_views ()
 						}
 
 					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.",
@@ -1049,8 +1051,6 @@ main (int argc, char *argv[])
 	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);