Added functions ::get_*_from_json.

diff --git a/.gitignore b/.gitignore
index a052ce4ab22a6a0e64c34f6157105140bc4841a5..dc1a5f7182385c79dbc2d1885790a20c11ba0b3f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@ tests/*.exe
 tests/select
 tests/getsql
 tests/getsqlfromhashtable
+tests/getsqlfromjson
 tests/sqlbuilder
 tests/metastore
 *~

diff --git a/src/gdaex.c b/src/gdaex.c
index d3e574a75a3604561d105417dd4e7f29a60503f8..2aed5d2a2f6ee5f87270a345739a3f97b44fac34 100644 (file)
--- a/src/gdaex.c
+++ b/src/gdaex.c
@@ -3883,6 +3883,46 @@ const gchar
        return ret;
 }
 
+GdaSqlBuilder
+*gdaex_get_gda_sqlbuilder_from_json (GdaEx *gdaex,
+                                     GdaExSqlType sqltype,
+                                     const gchar *table_name,
+                                     JsonNode *keys,
+                                     JsonNode *fields)
+{
+       GHashTable *ht_keys;
+       GHashTable *ht_fields;
+
+       ht_keys = zak_utils_json_to_hashtable_gvalue (keys);
+       ht_fields = zak_utils_json_to_hashtable_gvalue (fields);
+
+       return gdaex_get_gda_sqlbuilder_from_hashtable (gdaex,
+                                                       sqltype,
+                                                       table_name,
+                                                       ht_keys,
+                                                       ht_fields);
+}
+
+const gchar
+*gdaex_get_sql_from_json (GdaEx *gdaex,
+                          GdaExSqlType sqltype,
+                          const gchar *table_name,
+                          JsonNode *keys,
+                          JsonNode *fields)
+{
+       GHashTable *ht_keys;
+       GHashTable *ht_fields;
+
+       ht_keys = zak_utils_json_to_hashtable_gvalue (keys);
+       ht_fields = zak_utils_json_to_hashtable_gvalue (fields);
+
+       return gdaex_get_sql_from_hashtable (gdaex,
+                                            sqltype,
+                                            table_name,
+                                            ht_keys,
+                                            ht_fields);
+}
+
 guint
 gdaex_get_new_id (GdaEx *gdaex,
                   const gchar *table_name,

diff --git a/src/gdaex.h b/src/gdaex.h
index eca4fe89c76aaf57c7f80ff2f37b2bc727f3a7a0..5779625daa05b9ff421d13ae082c6d096473e0b9 100644 (file)
--- a/src/gdaex.h
+++ b/src/gdaex.h
@@ -325,6 +325,18 @@ const gchar *gdaex_get_sql_from_hashtable (GdaEx *gdaex,
                                            GHashTable *keys,
                                            GHashTable *fields);
 
+GdaSqlBuilder *gdaex_get_gda_sqlbuilder_from_json (GdaEx *gdaex,
+                                                   GdaExSqlType sqltype,
+                                                   const gchar *table_name,
+                                                   JsonNode *keys,
+                                                   JsonNode *fields);
+
+const gchar *gdaex_get_sql_from_json (GdaEx *gdaex,
+                                      GdaExSqlType sqltype,
+                                      const gchar *table_name,
+                                      JsonNode *keys,
+                                      JsonNode *fields);
+
 guint gdaex_get_new_id (GdaEx *gdaex,
                         const gchar *table_name,
                         const gchar *id_field_name,

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a6fa7813c9d9edab45ddf0994fc20253c85c0b57..cfd672fb793bd72f93ed6b5b842a80c65dc2fd7a 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,6 +11,7 @@ noinst_PROGRAMS = \
                   doubletosql \
                   fill_liststore \
                   getsqlfromhashtable \
+                  getsqlfromjson \
                   metastore \
                   query_editor \
                   select \

diff --git a/tests/getsqlfromhashtable.c b/tests/getsqlfromhashtable.c
index 5e6505d4d33e96ad492803048a871ad4c57d6c3d..d131b30309131bb4dc7ba968416d2740fd4a78db 100644 (file)
--- a/tests/getsqlfromhashtable.c
+++ b/tests/getsqlfromhashtable.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2019 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2013-2020 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
@@ -37,7 +37,7 @@ main (int argc, char **argv)
 
        gtk_init (&argc, &argv);
 
-       gdaex = gdaex_new_from_string (argv[1]);
+       gdaex = gdaex_new_from_string (g_strdup_printf ("SQLite://DB_DIR=%s;DB_NAME=grid.db", TESTSDIR));
        if (gdaex == NULL)
                {
                        g_error ("Unable to connect to the db.");

diff --git a/tests/getsqlfromjson.c b/tests/getsqlfromjson.c
new file mode 100644 (file)
index 0000000..ee8fa32
--- /dev/null
+++ b/tests/getsqlfromjson.c
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2020 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
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <glib/gprintf.h>
+
+#include <gtk/gtk.h>
+
+#include <libzakutils/libzakutils.h>
+#include <libzakutilsjsonxml/libzakutilsjsonxml.h>
+
+#include <libgdaex.h>
+
+void
+foreach (gpointer key,
+         gpointer value,
+         gpointer user_data)
+{
+       g_printf ("%s: %s\n",
+                 (gchar *)key,
+                 (gchar *)g_value_get_string (value));
+}
+
+
+int
+main (int argc, char **argv)
+{
+       GdaEx *gdaex;
+
+       gchar *keys;
+       gchar *fields;
+
+       JsonParser *parser;
+       JsonNode *jnode_keys;
+       JsonNode *jnode_fields;
+
+       GHashTable *ht_fields;
+       GHashTable *ht_keys;
+
+       gtk_init (&argc, &argv);
+
+       gdaex = gdaex_new_from_string (g_strdup_printf ("SQLite://DB_DIR=%s;DB_NAME=grid.db", TESTSDIR));
+       if (gdaex == NULL)
+               {
+                       g_error ("Unable to connect to the db.");
+               }
+
+       fields = g_strdup ("{\"id\": \"100\","
+                          "\"name\": \"v_name\","
+                          "\"surname\": \"v_surname\","
+                          "\"birthday\": \"2010-08-23\","
+                          "\"address\": \"rue morgue, 44\","
+                          "\"incoming\": \"1342.81\"}");
+
+       parser = json_parser_new ();
+
+       if (!json_parser_load_from_data (parser, fields, -1, NULL))
+               {
+                       return 0;
+               }
+
+       jnode_fields = json_parser_get_root (parser);
+
+       ht_fields = zak_utils_json_to_hashtable_gvalue (jnode_fields);
+
+       g_hash_table_foreach (ht_fields, foreach, NULL);
+
+       g_message ("%s", gdaex_get_sql_from_json (gdaex, GDAEX_SQL_SELECT, "clients", NULL, jnode_fields));
+       g_message ("%s", gdaex_get_sql_from_hashtable (gdaex, GDAEX_SQL_SELECT, "clients", NULL, ht_fields));
+
+       g_message ("%s", gdaex_get_sql_from_json (gdaex, GDAEX_SQL_INSERT, "clients", NULL, jnode_fields));
+       g_message ("%s", gdaex_get_sql_from_hashtable (gdaex, GDAEX_SQL_INSERT, "clients", NULL, ht_fields));
+
+       keys = g_strdup ("{\"id\": \"44\"}");
+
+       parser = json_parser_new ();
+
+       if (!json_parser_load_from_data (parser, keys, -1, NULL))
+               {
+                       return 0;
+               }
+
+       jnode_keys = json_parser_get_root (parser);
+
+       ht_keys = zak_utils_json_to_hashtable_gvalue (jnode_keys);
+
+       g_hash_table_foreach (ht_keys, foreach, NULL);
+
+       g_message ("%s", gdaex_get_sql_from_json (gdaex, GDAEX_SQL_SELECT, "clients", jnode_keys, jnode_fields));
+       g_message ("%s", gdaex_get_sql_from_hashtable (gdaex, GDAEX_SQL_SELECT, "clients", ht_keys, ht_fields));
+
+       g_free (fields);
+
+       fields = g_strdup ("{\"name\": \"my new name\","
+                          "\"surname\": \"and this is the new sur'name with '\"}");
+
+       parser = json_parser_new ();
+
+       if (!json_parser_load_from_data (parser, fields, -1, NULL))
+               {
+                       return 0;
+               }
+
+       jnode_fields = json_parser_get_root (parser);
+
+       ht_fields = zak_utils_json_to_hashtable_gvalue (jnode_fields);
+
+       g_hash_table_foreach (ht_fields, foreach, NULL);
+
+       g_message ("%s", gdaex_get_sql_from_json (gdaex, GDAEX_SQL_UPDATE, "clients", jnode_keys, jnode_fields));
+       g_message ("%s", gdaex_get_sql_from_hashtable (gdaex, GDAEX_SQL_UPDATE, "clients", ht_keys, ht_fields));
+
+       g_free (fields);
+       g_free (keys);
+
+       g_message ("%s", gdaex_get_sql_from_json (gdaex, GDAEX_SQL_DELETE, "clients", jnode_keys, NULL));
+       g_message ("%s", gdaex_get_sql_from_hashtable (gdaex, GDAEX_SQL_DELETE, "clients", ht_keys, NULL));
+
+       return 0;
+}