From e3ad870028d2d713cf7f8805c8b7a179a8296076 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Sat, 22 Oct 2011 12:40:14 +0200
Subject: [PATCH] Added function GdaExQueryEditor::get_sql_gdasqlbuilder.

---
 src/queryeditor.c | 55 +++++++++++++++++++++++++++++++----------------
 src/queryeditor.h |  2 ++
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/queryeditor.c b/src/queryeditor.c
index 6103ba0..7d6f5c8 100644
--- a/src/queryeditor.c
+++ b/src/queryeditor.c
@@ -184,7 +184,7 @@ struct _GdaExQueryEditorPrivate
 		GSList *relations;	/* GdaExQueryEditorRelation */
 
 		/* for value choosing */
-		guint editor_type; /* 1 - show; 2 - where; 3 - order */
+		guint editor_type;
 
 		GtkWidget *hbox;
 		GtkWidget *tbl;
@@ -687,11 +687,9 @@ static GdaTimestamp
 	return ret;
 }
 
-const gchar
-*gdaex_query_editor_get_sql (GdaExQueryEditor *qe)
+GdaSqlBuilder
+*gdaex_query_editor_get_sql_as_gdasqlbuilder (GdaExQueryEditor *qe)
 {
-	const gchar *ret;
-
 	GdaExQueryEditorPrivate *priv;
 
 	GdaSqlBuilder *sqlbuilder;
@@ -706,11 +704,6 @@ const gchar
 	GdaExQueryEditorTable *table;
 	GdaExQueryEditorField *field;
 
-	GdaStatement *stmt;
-	GError *error;
-
-	ret = NULL;
-
 	g_return_val_if_fail (GDAEX_IS_QUERY_EDITOR (qe), NULL);
 
 	priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
@@ -1027,6 +1020,30 @@ const gchar
 				} while (gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->lstore_order), &iter));
 		}
 
+	return sqlbuilder;
+}
+
+const gchar
+*gdaex_query_editor_get_sql (GdaExQueryEditor *qe)
+{
+	const gchar *ret;
+
+	GdaExQueryEditorPrivate *priv;
+
+	GdaSqlBuilder *sqlbuilder;
+	GdaStatement *stmt;
+	GError *error;
+
+	ret = NULL;
+
+	sqlbuilder = gdaex_query_editor_get_sql_as_gdasqlbuilder (qe);
+	if (sqlbuilder == NULL)
+		{
+			return ret;
+		}
+
+	priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+
 	error = NULL;
 	stmt = gda_sql_builder_get_statement (sqlbuilder, &error);
 	if (stmt == NULL || error != NULL)
@@ -2169,15 +2186,15 @@ gdaex_query_editor_on_btn_cancel_clicked (GtkButton *button,
 
 	switch (priv->editor_type)
 		{
-			case 1:
+			case GDAEX_QE_PAGE_SHOW:
 				gtk_tree_selection_unselect_all (priv->sel_show);
 				break;
 
-			case 2:
+			case GDAEX_QE_PAGE_WHERE:
 				gtk_tree_selection_unselect_all (priv->sel_where);
 				break;
 
-			case 3:
+			case GDAEX_QE_PAGE_ORDER:
 				gtk_tree_selection_unselect_all (priv->sel_order);
 				break;
 		}
@@ -2207,7 +2224,7 @@ gdaex_query_editor_on_btn_save_clicked (GtkButton *button,
 
 	switch (priv->editor_type)
 		{
-			case 1:
+			case GDAEX_QE_PAGE_SHOW:
 				if (gtk_tree_selection_get_selected (priv->sel_show, NULL, &iter))
 					{
 						val1 = (gchar *)gtk_entry_get_text (GTK_ENTRY (priv->txt1));
@@ -2227,7 +2244,7 @@ gdaex_query_editor_on_btn_save_clicked (GtkButton *button,
 					}
 				break;
 
-			case 2:
+			case GDAEX_QE_PAGE_WHERE:
 				if (gtk_tree_selection_get_selected (priv->sel_where, NULL, &iter))
 					{
 						GtkTreeModel *model;
@@ -2359,7 +2376,7 @@ gdaex_query_editor_on_btn_save_clicked (GtkButton *button,
 					}
 				break;
 
-			case 3:
+			case GDAEX_QE_PAGE_ORDER:
 				if (gtk_tree_selection_get_selected (priv->sel_order, NULL, &iter))
 					{
 						if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->opt_asc)))
@@ -2520,7 +2537,7 @@ gdaex_query_editor_on_sel_show_changed (GtkTreeSelection *treeselection,
 
 	if (gtk_tree_selection_get_selected (priv->sel_show, NULL, &iter))
 		{
-			priv->editor_type = 1;
+			priv->editor_type = GDAEX_QE_PAGE_SHOW;
 
 			gtk_tree_selection_unselect_all (priv->sel_where);
 			gtk_tree_selection_unselect_all (priv->sel_order);
@@ -2699,7 +2716,7 @@ gdaex_query_editor_on_sel_where_changed (GtkTreeSelection *treeselection,
 
 	if (gtk_tree_selection_get_selected (priv->sel_where, NULL, &iter))
 		{
-			priv->editor_type = 2;
+			priv->editor_type = GDAEX_QE_PAGE_WHERE;
 
 			gtk_tree_selection_unselect_all (priv->sel_show);
 			gtk_tree_selection_unselect_all (priv->sel_order);
@@ -3181,7 +3198,7 @@ gdaex_query_editor_on_sel_order_changed (GtkTreeSelection *treeselection,
 
 	if (gtk_tree_selection_get_selected (priv->sel_order, NULL, &iter))
 		{
-			priv->editor_type = 3;
+			priv->editor_type = GDAEX_QE_PAGE_ORDER;
 
 			gtk_tree_selection_unselect_all (priv->sel_show);
 			gtk_tree_selection_unselect_all (priv->sel_where);
diff --git a/src/queryeditor.h b/src/queryeditor.h
index 60bd9ae..2a658c6 100644
--- a/src/queryeditor.h
+++ b/src/queryeditor.h
@@ -138,6 +138,8 @@ gboolean gdaex_query_editor_add_relation (GdaExQueryEditor *qe,
 
 void gdaex_query_editor_clean_choices (GdaExQueryEditor *qe);
 
+GdaSqlBuilder *gdaex_query_editor_get_sql_as_gdasqlbuilder (GdaExQueryEditor *qe);
+
 const gchar *gdaex_query_editor_get_sql (GdaExQueryEditor *qe);
 
 xmlNode *gdaex_query_editor_get_sql_as_xml (GdaExQueryEditor *qe);
-- 
2.49.0