On GdaExQueryEditor implemented relations.

diff --git a/src/queryeditor.c b/src/queryeditor.c
index eb4de7d20741123d5381fa25447e5483daa9352e..f67c708c142041ce3cfb8139d752a71ef52ac1e3 100644 (file)
--- a/src/queryeditor.c
+++ b/src/queryeditor.c
@@ -268,8 +268,8 @@ gdaex_query_editor_init (GdaExQueryEditor *gdaex_query_editor)
        priv->relations = NULL;
 
        priv->lstore_link_type = gtk_list_store_new (2,
-                                                     G_TYPE_UINT,
-                                                     G_TYPE_STRING);
+                                                    G_TYPE_UINT,
+                                                    G_TYPE_STRING);
        priv->lstore_where_type = gtk_list_store_new (2,
                                                      G_TYPE_UINT,
                                                      G_TYPE_STRING);
@@ -657,7 +657,7 @@ gdaex_query_editor_add_relation (GdaExQueryEditor *qe,
                                }
 
                        relation->fields1 = g_slist_append (relation->fields1, field1);
-                       relation->fields2 = g_slist_append (relation->fields1, field2);
+                       relation->fields2 = g_slist_append (relation->fields2, field2);
                        create_relation = TRUE;
                }
 
@@ -754,6 +754,40 @@ static GdaTimestamp
        return ret;
 }
 
+GdaExQueryEditorRelation
+*gdaex_query_editor_get_table_relation (GdaExQueryEditor *qe,
+                                        const gchar *table_name)
+{
+       GdaExQueryEditorRelation *ret;
+
+       GdaExQueryEditorPrivate *priv;
+
+       GSList *relations;
+
+       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+
+       if (priv->relations == NULL)
+               {
+                       return NULL;
+               }
+
+       ret = NULL;
+
+       relations = priv->relations;
+       while (relations != NULL)
+               {
+                       if (g_strcmp0 (((GdaExQueryEditorRelation *)relations->data)->table2->name, table_name) == 0)
+                               {
+                                       ret = (GdaExQueryEditorRelation *)relations->data;
+                                       break;
+                               }
+
+                       relations = g_slist_next (relations);
+               }
+
+       return ret;
+}
+
 GdaSqlBuilder
 *gdaex_query_editor_get_sql_as_gdasqlbuilder (GdaExQueryEditor *qe)
 {
@@ -770,6 +804,10 @@ GdaSqlBuilder
 
        GdaExQueryEditorTable *table;
        GdaExQueryEditorField *field;
+       GdaExQueryEditorRelation *relation;
+
+       GSList *fields1;
+       GSList *fields2;
 
        g_return_val_if_fail (GDAEX_IS_QUERY_EDITOR (qe), NULL);
 
@@ -797,6 +835,37 @@ GdaSqlBuilder
                                        table = g_hash_table_lookup (priv->tables, table_name);
                                        field = g_hash_table_lookup (table->fields, field_name);
 
+                                       /* check if table is part of a relation */
+                                       relation = gdaex_query_editor_get_table_relation (qe, table_name);
+                                       if (relation != NULL)
+                                               {
+                                                       id_target1 = gda_sql_builder_select_add_target_id (sqlbuilder,
+                                                                                                          gda_sql_builder_add_id (sqlbuilder, relation->table1->name),
+                                                                                                          NULL);
+                                                       id_target2 = gda_sql_builder_select_add_target_id (sqlbuilder,
+                                                                                                          gda_sql_builder_add_id (sqlbuilder, relation->table2->name),
+                                                                                                          NULL);
+
+                                                       /* for each fields couple */
+                                                       fields1 = relation->fields1;
+                                                       fields2 = relation->fields2;
+                                                       while (fields1 != NULL)
+                                                               {
+                                                                       id_join1 = gda_sql_builder_add_id (sqlbuilder, g_strconcat (relation->table1->name, ".", ((GdaExQueryEditorField *)fields1->data)->name, NULL));
+                                                                       id_join2 = gda_sql_builder_add_id (sqlbuilder, g_strconcat (relation->table2->name, ".", ((GdaExQueryEditorField *)fields2->data)->name, NULL));
+
+                                                                       join_cond = gda_sql_builder_add_cond (sqlbuilder, GDA_SQL_OPERATOR_TYPE_EQ,
+                                                                                                             id_join1, id_join2, 0);
+
+                                                                       gda_sql_builder_select_join_targets (sqlbuilder, id_target1, id_target2,
+                                                                                                            relation->join_type == GDAEX_QE_JOIN_TYPE_LEFT ? GDA_SQL_SELECT_JOIN_LEFT : GDA_SQL_SELECT_JOIN_INNER,
+                                                                                                            join_cond);
+
+                                                                       fields1 = g_slist_next (fields1);
+                                                                       fields2 = g_slist_next (fields2);
+                                                               }
+                                               }
+
                                        if (field->decode_table2 != NULL)
                                                {
                                                        id_target1 = gda_sql_builder_select_add_target_id (sqlbuilder,

diff --git a/tests/query_editor.c b/tests/query_editor.c
index 6b90baa45d3ab77b8762b0decb5ed8fdc05e876c..8b4106f60a51d43e6a2fc21057513216c2ee3277 100644 (file)
--- a/tests/query_editor.c
+++ b/tests/query_editor.c
@@ -108,6 +108,7 @@ on_btn_get_sql_clicked (GtkButton *button,
                                                    GTK_MESSAGE_INFO,
                                                    GTK_BUTTONS_OK,
                                                    sql);
+       gtk_window_set_title (GTK_WINDOW (dialog), "Sql");
        gtk_dialog_run (GTK_DIALOG (dialog));
        gtk_widget_destroy (dialog);
 
@@ -119,6 +120,7 @@ on_btn_get_sql_clicked (GtkButton *button,
                                         GTK_MESSAGE_INFO,
                                         GTK_BUTTONS_OK,
                                         sql);
+       gtk_window_set_title (GTK_WINDOW (dialog), "Sql Select");
        gtk_dialog_run (GTK_DIALOG (dialog));
        gtk_widget_destroy (dialog);
        g_free (sql);
@@ -131,6 +133,7 @@ on_btn_get_sql_clicked (GtkButton *button,
                                         GTK_MESSAGE_INFO,
                                         GTK_BUTTONS_OK,
                                         sql);
+       gtk_window_set_title (GTK_WINDOW (dialog), "Sql From");
        gtk_dialog_run (GTK_DIALOG (dialog));
        gtk_widget_destroy (dialog);
        g_free (sql);
@@ -143,6 +146,7 @@ on_btn_get_sql_clicked (GtkButton *button,
                                         GTK_MESSAGE_INFO,
                                         GTK_BUTTONS_OK,
                                         sql);
+       gtk_window_set_title (GTK_WINDOW (dialog), "Sql Where");
        gtk_dialog_run (GTK_DIALOG (dialog));
        gtk_widget_destroy (dialog);
        g_free (sql);
@@ -155,6 +159,7 @@ on_btn_get_sql_clicked (GtkButton *button,
                                         GTK_MESSAGE_INFO,
                                         GTK_BUTTONS_OK,
                                         sql);
+       gtk_window_set_title (GTK_WINDOW (dialog), "Sql Order By");
        gtk_dialog_run (GTK_DIALOG (dialog));
        gtk_widget_destroy (dialog);
        g_free (sql);
@@ -171,6 +176,7 @@ on_btn_get_sql_clicked (GtkButton *button,
                                         GTK_MESSAGE_INFO,
                                         GTK_BUTTONS_OK,
                                         buf);
+       gtk_window_set_title (GTK_WINDOW (dialog), "Xml");
        gtk_dialog_run (GTK_DIALOG (dialog));
        gtk_widget_destroy (dialog);
 }