Implementation draft.

diff --git a/data/libgdaex/gui/libgdaex.ui b/data/libgdaex/gui/libgdaex.ui
index bf25df8e0c314d9822226befa15e9b95d20ba8d3..2843836e4bdf2010b42996ac50299beaf310a9f2 100644 (file)
--- a/data/libgdaex/gui/libgdaex.ui
+++ b/data/libgdaex/gui/libgdaex.ui
@@ -2,10 +2,53 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy project-wide -->
+  <object class="GtkTreeStore" id="tstore_fields">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name name_visible -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="lstore_show">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name name_visible -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="lstore_order">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name name_visible -->
+      <column type="gchararray"/>
+      <!-- column-name order -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkTreeStore" id="tstore_where">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name name_visible -->
+      <column type="gchararray"/>
+      <!-- column-name condition_not -->
+      <column type="gboolean"/>
+      <!-- column-name condition_type -->
+      <column type="guint"/>
+      <!-- column-name condition_type_visible -->
+      <column type="gchararray"/>
+      <!-- column-name condition_from -->
+      <column type="gchararray"/>
+      <!-- column-name condition_to -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkDialog" id="dialog1">
     <property name="border_width">5</property>
     <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -275,13 +318,24 @@
                                         </child>
                                       </object>
                                     </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" id="treeviewcolumn9">
+                                        <property name="title">Not</property>
+                                        <child>
+                                          <object class="GtkCellRendererToggle" id="cellrenderertoggle1"/>
+                                          <attributes>
+                                            <attribute name="active">2</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="treeviewcolumn6">
                                         <property name="title">Type</property>
                                         <child>
                                           <object class="GtkCellRendererText" id="cellrenderertext6"/>
                                           <attributes>
-                                            <attribute name="text">3</attribute>
+                                            <attribute name="text">4</attribute>
                                           </attributes>
                                         </child>
                                       </object>
@@ -292,7 +346,7 @@
                                         <child>
                                           <object class="GtkCellRendererText" id="cellrenderertext7"/>
                                           <attributes>
-                                            <attribute name="text">4</attribute>
+                                            <attribute name="text">5</attribute>
                                           </attributes>
                                         </child>
                                       </object>
@@ -303,7 +357,7 @@
                                         <child>
                                           <object class="GtkCellRendererText" id="cellrenderertext8"/>
                                           <attributes>
-                                            <attribute name="text">5</attribute>
+                                            <attribute name="text">6</attribute>
                                           </attributes>
                                         </child>
                                       </object>
@@ -591,46 +645,4 @@
       <action-widget response="2">button2</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkTreeStore" id="tstore_fields">
-    <columns>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-      <!-- column-name name_visible -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="lstore_show">
-    <columns>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-      <!-- column-name name_visible -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="lstore_order">
-    <columns>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-      <!-- column-name name_visible -->
-      <column type="gchararray"/>
-      <!-- column-name order -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkTreeStore" id="tstore_where">
-    <columns>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-      <!-- column-name name_visible -->
-      <column type="gchararray"/>
-      <!-- column-name condition_type -->
-      <column type="guint"/>
-      <!-- column-name condition_type_visible -->
-      <column type="gchararray"/>
-      <!-- column-name condition_from -->
-      <column type="gchararray"/>
-      <!-- column-name condition_to -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
 </interface>

diff --git a/src/queryeditor.c b/src/queryeditor.c
index bb630cf49e4c1e1832c6f032c42dd327f55cab05..84d858b8bc08ca978404f079de191eee21bd8f75 100644 (file)
--- a/src/queryeditor.c
+++ b/src/queryeditor.c
@@ -38,12 +38,21 @@ static void gdaex_query_editor_build_ui (GdaExQueryEditor *qe);
 
 #define GDAEX_QUERY_EDITOR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_GDAEX_QUERY_EDITOR, GdaExQueryEditorPrivate))
 
+typedef struct
+       {
+               gchar *name;
+               gchar *name_visible;
+               GHashTable *fields;     /* GdaExQueryEditorField */
+       } GdaExQueryEditorTable;
+
 typedef struct _GdaExQueryEditorPrivate GdaExQueryEditorPrivate;
 struct _GdaExQueryEditorPrivate
        {
                GdaEx *gdaex;
 
                GtkWidget *hbx_main;
+
+               GHashTable *tables;     /* GdaExQueryEditorTable */
        };
 
 G_DEFINE_TYPE (GdaExQueryEditor, gdaex_query_editor, G_TYPE_OBJECT)
@@ -76,6 +85,7 @@ enum
 {
        COL_WHERE_NAME,
        COL_WHERE_VISIBLE_NAME,
+       COL_WHERE_CONDITION_NOT,
        COL_WHERE_CONDITION_TYPE,
        COL_WHERE_CONDITION_FROM,
        COL_WHERE_CONDITION_TO

diff --git a/src/queryeditor.h b/src/queryeditor.h
index 1030015d02b3fbae3064c5dbe94093370261537d..9b83334c5fea178aac072764145c6bf3cd147667 100644 (file)
--- a/src/queryeditor.h
+++ b/src/queryeditor.h
@@ -57,6 +57,25 @@ GdaExQueryEditor *gdaex_query_editor_new (GdaEx *gdaex);
 
 GtkWidget *gdaex_query_editor_get_widget (GdaExQueryEditor *gdaex_query_editor);
 
+typedef struct
+       {
+               gchar *name;
+               gchar *name_visible;
+               /* - tipo di campo (stringa, interno, double, date, datetime) */
+               /* - sempre presente nelle query, quindi non sceglibile per la parte show */
+               /* - sceglibile per la parte where */
+               /* - condizioni where che è possibile applicare (es. i campi id_* non ha senso che abbiano un between, */
+               /*                                             ma ci deve essere la possibilità di fare ricerche anche sulle decodifiche) */
+       } GdaExQueryEditorField;
+
+gboolean gdaex_query_editor_add_table (GdaExQueryEditor *qe, const gchar *table_name, const gchar *table_name_visibile);
+gboolean gdaex_query_editor_table_add_field (GdaExQueryEditor *qe, const gchar *table_name, GdaExQueryEditorField field);
+gboolean gdaex_query_editor_add_relation (GdaExQueryEditor *qe,
+                                          const gchar *table_name1, GdaExQueryEditorField field1,
+                                          const gchar *table_name2, GdaExQueryEditorField field2);
+
+const gchar *gdaex_query_editor_get_sql (GdaExQueryEditor *qe);
+
 
 G_END_DECLS