From 406562a442a847aae705a22220fb09a1edefa5f7 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Fri, 26 Jun 2015 10:20:56 +0200 Subject: [PATCH] Started GdaExSqlBuilder. --- src/Makefile.am | 6 +- src/libgdaex.h | 1 + src/sqlbuilder.c | 168 +++++++++++++++++++++++++++++++++++++++++++++ src/sqlbuilder.h | 69 +++++++++++++++++++ tests/Makefile.am | 1 + tests/sqlbuilder.c | 34 +++++++++ 6 files changed, 277 insertions(+), 2 deletions(-) create mode 100644 src/sqlbuilder.c create mode 100644 src/sqlbuilder.h create mode 100644 tests/sqlbuilder.c diff --git a/src/Makefile.am b/src/Makefile.am index 796a506..8f8f5a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,7 +33,8 @@ libgdaex_la_SOURCES = gdaex.c \ gridcolumn.c \ queryeditor.c \ queryeditor_widget_interface.c \ - queryeditorentry.c + queryeditorentry.c \ + sqlbuilder.c libgdaex_la_LDFLAGS = -no-undefined @@ -43,6 +44,7 @@ libgdaex_include_HEADERS = libgdaex.h \ gridcolumn.h \ queryeditor.h \ queryeditor_widget_interface.h \ - queryeditorentry.h + queryeditorentry.h \ + sqlbuilder.h libgdaex_includedir = $(includedir)/libgdaex diff --git a/src/libgdaex.h b/src/libgdaex.h index fbbdb31..cd347f5 100644 --- a/src/libgdaex.h +++ b/src/libgdaex.h @@ -29,6 +29,7 @@ #include "gridcolumn.h" #include "queryeditor.h" #include "queryeditor_widget_interface.h" +#include "sqlbuilder.h" #endif /* __LIBGDAEX_H__ */ diff --git a/src/sqlbuilder.c b/src/sqlbuilder.c new file mode 100644 index 0000000..d2ebd93 --- /dev/null +++ b/src/sqlbuilder.c @@ -0,0 +1,168 @@ +/* + * sql_builder.c + * + * Copyright (C) 2010-2014 Andrea Zagli + * + * This file is part of libgdaex. + * + * libgdaex_sql_builder 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. + * + * libgdaex_sql_builder 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 libgdaex; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H + #include +#endif + +#include + +#include "sqlbuilder.h" + +static void gdaex_sql_builder_class_init (GdaExSqlBuilderClass *klass); +static void gdaex_sql_builder_init (GdaExSqlBuilder *gdaex_sql_builder); + +static void gdaex_sql_builder_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void gdaex_sql_builder_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); + + +#define GDAEX_SQLBUILDER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDAEX_TYPE_SQLBUILDER, GdaExSqlBuilderPrivate)) + +typedef struct _GdaExSqlBuilderTable GdaExSqlBuilderTable; +struct _GdaExSqlBuilderTable +{ + guint id; + gchar *name; + gchar *alias; +}; + +typedef struct _GdaExSqlBuilderPrivate GdaExSqlBuilderPrivate; +struct _GdaExSqlBuilderPrivate + { + GdaSqlBuilder *sqlb; + GHashTable *ht_tables; + }; + +G_DEFINE_TYPE (GdaExSqlBuilder, gdaex_sql_builder, G_TYPE_OBJECT) + +static void +gdaex_sql_builder_class_init (GdaExSqlBuilderClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (object_class, sizeof (GdaExSqlBuilderPrivate)); + + object_class->set_property = gdaex_sql_builder_set_property; + object_class->get_property = gdaex_sql_builder_get_property; +} + +static void +gdaex_sql_builder_init (GdaExSqlBuilder *gdaex_sql_builder) +{ + GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (gdaex_sql_builder); + + priv->ht_tables = g_hash_table_new (g_str_hash, g_str_equal); +} + +GdaExSqlBuilder +*gdaex_sql_builder_new (GdaSqlStatementType stmt_type) +{ + GdaExSqlBuilder *gdaex_sql_builder = GDAEX_SQLBUILDER (g_object_new (gdaex_sql_builder_get_type (), NULL)); + + GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (gdaex_sql_builder); + + priv->sqlb = gda_sql_builder_new (stmt_type); + + return gdaex_sql_builder; +} + +void +gdaex_sql_builder_from (GdaExSqlBuilder *sqlb, const gchar *table_name, const gchar *table_alias) +{ + GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (sqlb); + + GdaExSqlBuilderTable *t; + + t = g_hash_table_lookup (priv->ht_tables, table_name); + if (t == NULL) + { + t = g_new0 (GdaExSqlBuilderTable, 1); + t->name = g_strdup (table_name); + t->alias = g_strdup (table_alias); + t->id = gda_sql_builder_select_add_target_id (priv->sqlb, gda_sql_builder_add_id (priv->sqlb, table_name), NULL); + g_hash_table_insert (priv->ht_tables, t->name, t); + } +} + +GdaSqlBuilder +*gdaex_sql_builder_get_gda_sql_builder (GdaExSqlBuilder *sqlb) +{ + GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (sqlb); + + return priv->sqlb; +} + +const gchar +*gdaex_sql_builder_get_sql (GdaExSqlBuilder *sqlb) +{ + gchar *ret; + GdaStatement *stmt; + + GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (sqlb); + + ret = NULL; + + gda_sql_builder_select_add_field (priv->sqlb, "*", NULL, NULL); + stmt = gda_sql_builder_get_statement (priv->sqlb, NULL); + if (stmt != NULL) + { + ret = gda_statement_to_sql (stmt, NULL, NULL); + } + + return ret; +} + +/* PRIVATE */ +static void +gdaex_sql_builder_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) +{ + GdaExSqlBuilder *gdaex_sql_builder = GDAEX_SQLBUILDER (object); + GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (gdaex_sql_builder); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +gdaex_sql_builder_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) +{ + GdaExSqlBuilder *gdaex_sql_builder = GDAEX_SQLBUILDER (object); + GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (gdaex_sql_builder); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} diff --git a/src/sqlbuilder.h b/src/sqlbuilder.h new file mode 100644 index 0000000..6fc6a32 --- /dev/null +++ b/src/sqlbuilder.h @@ -0,0 +1,69 @@ +/* + * sqlbuilder.h + * + * Copyright (C) 2015 Andrea Zagli + * + * This file is part of libgdaex. + * + * libgdaex 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. + * + * libgdaex 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 libgdaex; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifndef __GDAEX_SQL_BUILDER_H__ +#define __GDAEX_SQLBUILDER_H__ + +#include +#include + +#include "gdaex.h" + +G_BEGIN_DECLS + + +#define GDAEX_TYPE_SQLBUILDER (gdaex_sql_builder_get_type ()) +#define GDAEX_SQLBUILDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDAEX_TYPE_SQLBUILDER, GdaExSqlBuilder)) +#define GDAEX_SQLBUILDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDAEX_TYPE_SQLBUILDER, GdaExSqlBuilderClass)) +#define GDAEX_IS_SQLBUILDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDAEX_TYPE_SQL_BUILDER)) +#define GDAEX_IS_SQLBUILDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDAEX_TYPE_SQLBUILDER)) +#define GDAEX_SQLBUILDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDAEX_TYPE_SQLBUILDER, GdaExSqlBuilderClass)) + + +typedef struct _GdaExSqlBuilder GdaExSqlBuilder; +typedef struct _GdaExSqlBuilderClass GdaExSqlBuilderClass; + +struct _GdaExSqlBuilder + { + GObject parent; + }; + +struct _GdaExSqlBuilderClass + { + GObjectClass parent_class; + }; + +GType gdaex_sql_builder_get_type (void) G_GNUC_CONST; + + +GdaExSqlBuilder *gdaex_sql_builder_new (GdaSqlStatementType stmt_type); + +void gdaex_sql_builder_from (GdaExSqlBuilder *sqlb, const gchar *table_name, const gchar *table_alias); + +GdaSqlBuilder *gdaex_sql_builder_get_gda_sql_builder (GdaExSqlBuilder *sqlb); +const gchar *gdaex_sql_builder_get_sql (GdaExSqlBuilder *sqlb); + + +G_END_DECLS + +#endif /* __GDAEX_SQLBUILDER_H__ */ diff --git a/tests/Makefile.am b/tests/Makefile.am index 03f357a..4ed3489 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -19,6 +19,7 @@ noinst_PROGRAMS = fill_liststore \ grid \ query_editor \ select \ + sqlbuilder \ test_prefix LDADD = $(top_builddir)/src/libgdaex.la diff --git a/tests/sqlbuilder.c b/tests/sqlbuilder.c new file mode 100644 index 0000000..0ca035d --- /dev/null +++ b/tests/sqlbuilder.c @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2015 Andrea Zagli + * + * 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 + +int +main (int argc, char **argv) +{ + GdaExSqlBuilder *sqlb; + + gtk_init (&argc, &argv); + + sqlb = gdaex_sql_builder_new (GDA_SQL_STATEMENT_SELECT); + gdaex_sql_builder_from (sqlb, "pippo", "pluto"); + + g_message ("sql: %s", gdaex_sql_builder_get_sql (sqlb)); + + return 0; +} -- 2.49.0