[libgda/libgda-vala] Fixing API for GdaSqlExpression. Added to Makefile.am

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit f011b59a9947bb45e78642e75946897f2c59199f
Author: Daniel Espinosa <esodan gmail com>
Date:   Wed May 15 11:11:51 2013 -0500

    Fixing API for GdaSqlExpression. Added to Makefile.am

 libgda/Makefile.am                  |    2 +
 libgda/gda-sql-expression-private.h |    6 +-
 libgda/gda-sql-expression.c         |  113 +++++++++++++++++++++++++++++++++-
 libgda/gda-sql-expression.h         |   19 +++----
 libgda/gda-sql-select.h             |   12 +++-
 5 files changed, 132 insertions(+), 20 deletions(-)
---
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index a31dd32..b0a2d03 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -94,6 +94,7 @@ gda_headers = \
        gda-statement.h \
        gda-statement-extra.h \
        gda-sql-builder.h \
+       gda-sql-expression.h \
        gda-transaction-status.h \
        gda-transaction-status-private.h \
        gda-tree.h \
@@ -153,6 +154,7 @@ gda_sources= \
        gda-server-provider-extra.c \
        gda-statement.c \
        gda-sql-builder.c \
+       gda-sql-expression.c \
        gda-transaction-status.c \
        gda-tree.c \
        gda-tree-mgr-columns.c \
diff --git a/libgda/gda-sql-expression-private.h b/libgda/gda-sql-expression-private.h
index 0c9d2bc..4f6c06c 100644
--- a/libgda/gda-sql-expression-private.h
+++ b/libgda/gda-sql-expression-private.h
@@ -22,9 +22,9 @@
 #define __GDA_SQL_EXPRESSION_PRIVATE_H__
 
 
-void               _gda_sql_expression_set_expr       (GdaSqlExpression *expr,
-                                                    const GdaSqlExpr *e);
-const GdaSqlExpr  *_gda_sql_expression_get_expr       (GdaSqlExpression *expr);
+void            _gda_sql_expression_set_builder       (GdaSqlExpression *expr,
+                                                 const GdaSqlBuilder *builder);
+GdaSqlBuilder  *_gda_sql_expression_get_builder       (GdaSqlExpression *expr);
 
 /*
  * Method definitions.
diff --git a/libgda/gda-sql-expression.c b/libgda/gda-sql-expression.c
index c5e29e7..74761bd 100644
--- a/libgda/gda-sql-expression.c
+++ b/libgda/gda-sql-expression.c
@@ -26,7 +26,8 @@ G_DEFINE_TYPE (GdaSqlExpression, gda_sql_expression, G_TYPE_OBJECT);
 
 struct _GdaSqlExpressionPrivate
 {
-  GdaSqlExpr          *exp;
+  GdaSqlBuilder        *builder;
+  GdaSqlBuilderId      id;
   GdaSqlExpressionType type;
 };
 
@@ -36,8 +37,7 @@ enum
         PROP_0,
         PROP_VALUE,
         PROP_IS_IDENT,
-        PROP_EXPR_TYPE,
-        PROP_FUNCTION,
+        PROP_EXPR_TYPE
 };
 
 static void
@@ -53,5 +53,110 @@ gda_sql_expression_init (GdaSqlExpression *self)
 
   self->priv = priv = GDA_SQL_EXPRESSION_GET_PRIVATE (self);
 
-  priv->exp = gda_sql_expr_new (NULL);
+  priv->builder = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
+  priv->type = GDA_SQL_EXPRESSION_TYPE_VALUE;
 }
+
+GdaSqlExpression *
+gda_sql_expression_new (GdaSqlExpressionType type)
+{}
+
+GdaSqlExpression*
+gda_sql_expression_new_from_string (const gchar* str)
+{}
+
+gchar*
+gda_sql_expression_to_string (GdaSqlExpression *expr)
+{}
+
+void
+gda_sql_expression_check_clean (GdaSqlExpression *expr)
+{}
+
+void
+gda_sql_expression_take_select (GdaSqlExpression *expr, 
+                                GdaStatement *stm)
+{}
+
+void
+gda_sql_expression_set_value (GdaSqlExpression *expr,
+                              const GValue *val)
+{}
+
+const GValue*
+gda_sql_expression_get_value (GdaSqlExpression *expr)
+{}
+
+
+void
+gda_sql_expression_set_variable_pspec (GdaSqlExpression *expr,
+                                       const GdaSqlParamSpec *spec)
+{}
+
+GdaSqlParamSpec*
+gda_sql_expression_get_variable_pspec (GdaSqlExpression *expr)
+{}
+
+
+void
+gda_sql_expression_set_function_name (GdaSqlExpression *expr,
+                                      const gchar *name)
+{}
+
+void
+gda_sql_expression_set_function_args (GdaSqlExpression *expr,
+                                      const GSList *args)
+{}
+
+void
+gda_sql_expression_set_operator_type  (GdaSqlExpression *expr,
+                                       GdaSqlOperatorType optype)
+{}
+
+void
+gda_sql_expression_set_operator_operands (GdaSqlExpression *expr,
+                                          const GSList *operands)
+{}
+
+void
+gda_sql_expression_set_select (GdaSqlExpression *expr,
+                               GdaStatement *select)
+{}
+
+GdaSqlSelect*
+gda_sql_expression_get_select (GdaSqlExpression *expr)
+{}
+
+void
+gda_sql_expression_set_compound (GdaSqlExpression *expr,
+                                 GdaStatement *compound)
+{}
+
+GdaSqlCompound*
+gda_sql_expression_set_compound (GdaSqlExpression *expr)
+{}
+
+void
+gda_sql_expression_set_case_expr (GdaSqlExpression *expr,
+                                  GdaSqlExpression *e)
+{}
+
+void
+gda_sql_expression_set_case_when (GdaSqlExpression *expr,
+                                  const GSList *when)
+{}
+
+void
+gda_sql_expression_set_case_then (GdaSqlExpression *expr,
+                                  const GSList *then)
+{}
+
+void
+gda_sql_expression_set_case_else (GdaSqlExpression *expr,
+                                  const GSList *_else)
+{}
+
+void
+gda_sql_expression_set_cast_as (GdaSqlExpression *expr,
+                                const gchar *cast_as)
+{}
diff --git a/libgda/gda-sql-expression.h b/libgda/gda-sql-expression.h
index af701f3..06571ed 100644
--- a/libgda/gda-sql-expression.h
+++ b/libgda/gda-sql-expression.h
@@ -42,7 +42,7 @@ typedef struct _GdaSqlExpressionPrivate GdaSqlExpressionPrivate;
 
 typedef enum   _GdaSqlExpressionType    GdaSqlExpressionType;
 
-enum {
+typedef enum {
        GDA_SQL_EXPRESSION_TYPE_VALUE,
        GDA_SQL_EXPRESSION_TYPE_VARIABLE,
        GDA_SQL_EXPRESSION_TYPE_FUNCTION,
@@ -51,7 +51,7 @@ enum {
        GDA_SQL_EXPRESSION_TYPE_COMPOUND,
        GDA_SQL_EXPRESSION_TYPE_CASE,
        GDA_SQL_EXPRESSION_TYPE_CAST_AS
-}
+} _GdaSqlExpressionType;
 
 struct _GdaSqlExpression
 {
@@ -70,12 +70,12 @@ struct _GdaSqlExpressionClass
 
 /* used by GDA_TYPE_SQL_EXPRESSION */
 GType              gda_sql_expression_get_type        (void);
-GdaSqlExpression * gda_sql_expression_new             (GdaSqlExpressionType type);
-GdaSqlExpression * gda_sql_expression_new_from_string (const gchar* str);
-gchar*             gda_sql_expression_to_string       (GdaSqlExpression *expr);
+GdaSqlExpression  *gda_sql_expression_new             (GdaSqlExpressionType type);
+GdaSqlExpression  *gda_sql_expression_new_from_string (const gchar* str);
+gchar             *gda_sql_expression_to_string       (GdaSqlExpression *expr);
 void               gda_sql_expression_check_clean     (GdaSqlExpression *expr);
 void               gda_sql_expression_take_select     (GdaSqlExpression *expr, 
-                                                    GdaSqlStatement *stm);
+                                                    GdaStatement *stm);
 
 void               gda_sql_expression_set_value       (GdaSqlExpression *expr,
                                                     const GValue *val);
@@ -98,12 +98,12 @@ void               gda_sql_expression_set_operator_operands (GdaSqlExpression *e
                                                     const GSList *operands);
 
 void               gda_sql_expression_set_select      (GdaSqlExpression *expr,
-                                                    GdaSqlSelect *select);
+                                                    GdaStatement *select);
 GdaSqlSelect      *gda_sql_expression_get_select      (GdaSqlExpression *expr);
 
 
 void               gda_sql_expression_set_compound    (GdaSqlExpression *expr,
-                                                    GdaSqlCompound *compound);
+                                                    GdaStatement *compound);
 GdaSqlCompound    *gda_sql_expression_set_compound    (GdaSqlExpression *expr);
 
 
@@ -119,8 +119,5 @@ void               gda_sql_expression_set_case_else   (GdaSqlExpression *expr,
 
 void               gda_sql_expression_set_cast_as     (GdaSqlExpression *expr,
                                                     const gchar *cast_as);
-/*
- * Method definitions.
- */
 
 #endif /* __GDA_SQL_EXPRESSION_H__ */
diff --git a/libgda/gda-sql-select.h b/libgda/gda-sql-select.h
index d78526d..fcb6dbd 100644
--- a/libgda/gda-sql-select.h
+++ b/libgda/gda-sql-select.h
@@ -59,8 +59,16 @@ struct _GdaSqlSelectClass
 GType              gda_sql_select_get_type        (void);
 GdaSqlSelect      *gda_sql_select_new             (void);
 
+void               gda_sql_select_set_distinct_expr  (GdaSqlSelect *select,
+                                                    GdaSqlExpression distinct);
+GdaSqlExpression  *gda_sql_select_get_distinct_expr  (GdaSqlSelect *select);
 void               gda_sql_select_set_distinct       (GdaSqlSelect *select,
-                                                    gboolean distinct);
-const GValue      *gda_sql_select_get_distinct       (GdaSqlSelect *select);
+                                                    gboolean is_distinct);
+gboolean           gda_sql_select_get_distinct       (GdaSqlSelect *select);
+
+
+void               gda_sql_select_set_fields       (GdaSqlSelect *select,
+                                                    GSList *fields);
+const GSList      *gda_sql_select_get_fields       (GdaSqlSelect *select);
 
 #endif /* __GDA_SQL_EXPRESSION_H__ */