From: Andrea Zagli <azagli@libero.it>
Date: Sat, 29 Aug 2020 14:55:15 +0000 (+0200)
Subject: Added function ::get_gda_sqlbuilder_from_hashtable.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=8453cefa2e765df23d11be7ed05c26182079379d;p=libgdaex

Added function ::get_gda_sqlbuilder_from_hashtable.
---

diff --git a/src/gdaex.c b/src/gdaex.c
index fe73fff..d3e574a 100644
--- a/src/gdaex.c
+++ b/src/gdaex.c
@@ -3693,21 +3693,16 @@ gdaex_fill_liststore_from_datamodel (GdaEx *gdaex,
 	gdaex_fill_liststore_from_datamodel_with_missing_func (gdaex, lstore, dm, cols_formatted, format_func, NULL, NULL);
 }
 
-const gchar
-*gdaex_get_sql_from_hashtable (GdaEx *gdaex,
-                               GdaExSqlType sqltype,
-                               const gchar *table_name,
-                               GHashTable *keys,
-                               GHashTable *fields)
+GdaSqlBuilder
+*gdaex_get_gda_sqlbuilder_from_hashtable (GdaEx *gdaex,
+                                          GdaExSqlType sqltype,
+                                          const gchar *table_name,
+                                          GHashTable *keys,
+                                          GHashTable *fields)
 {
-	gchar *ret;
 	gchar *_table_name;
 
-	GError *error;
 	GdaSqlBuilder *b;
-	GdaStatement *stmt;
-
-	GdaExPrivate *priv;
 
 	GHashTableIter ht_iter_fields;
 	GHashTableIter ht_iter_keys;
@@ -3721,18 +3716,14 @@ const gchar
 	GdaSqlBuilderId id_value;
 	GdaSqlBuilderId id_cond;
 
-	g_return_val_if_fail (IS_GDAEX (gdaex), "");
-	g_return_val_if_fail (table_name != NULL, "");
+	g_return_val_if_fail (IS_GDAEX (gdaex), NULL);
+	g_return_val_if_fail (table_name != NULL, NULL);
 
 	_table_name = g_strstrip (g_strdup (table_name));
-	g_return_val_if_fail (g_strcmp0 (table_name, "") != 0, "");
-
-	priv = GDAEX_GET_PRIVATE (gdaex);
+	g_return_val_if_fail (g_strcmp0 (table_name, "") != 0, NULL);
 
 	b = NULL;
 
-	ret = "";
-
 	switch (sqltype)
 		{
 			case GDAEX_SQL_SELECT:
@@ -3827,6 +3818,40 @@ const gchar
 				break;
 		}
 
+	g_free (_table_name);
+
+	return b;
+}
+
+const gchar
+*gdaex_get_sql_from_hashtable (GdaEx *gdaex,
+                               GdaExSqlType sqltype,
+                               const gchar *table_name,
+                               GHashTable *keys,
+                               GHashTable *fields)
+{
+	GError *error;
+
+	GdaSqlBuilder *b;
+	GdaStatement *stmt;
+
+	GdaExPrivate *priv;
+
+	gchar *ret;
+
+	priv = GDAEX_GET_PRIVATE (gdaex);
+
+	b = gdaex_get_gda_sqlbuilder_from_hashtable (gdaex,
+	                                             sqltype,
+	                                             table_name,
+	                                             keys,
+	                                             fields);
+
+	if (b == NULL)
+		{
+			return NULL;
+		}
+
 	error = NULL;
 	stmt = gda_sql_builder_get_statement (b, &error);
 	if (stmt == NULL || error != NULL)
@@ -3855,8 +3880,6 @@ const gchar
 			g_object_unref (b);
 		}
 
-	g_free (_table_name);
-
 	return ret;
 }
 
diff --git a/src/gdaex.h b/src/gdaex.h
index af559ae..eca4fe8 100644
--- a/src/gdaex.h
+++ b/src/gdaex.h
@@ -313,6 +313,12 @@ typedef enum
 	GDAEX_SQL_DELETE
 } GdaExSqlType;
 
+GdaSqlBuilder *gdaex_get_gda_sqlbuilder_from_hashtable (GdaEx *gdaex,
+                                                        GdaExSqlType sqltype,
+                                                        const gchar *table_name,
+                                                        GHashTable *keys,
+                                                        GHashTable *fields);
+
 const gchar *gdaex_get_sql_from_hashtable (GdaEx *gdaex,
                                            GdaExSqlType sqltype,
                                            const gchar *table_name,