[libgda/gtk3] Modified GdaSqlExpr to keep API but not ABI and make code more readable

[Vivien Malerba <vivien src gnome org>]

commit 22fc654ba795acee766fd93c56cf59808b8e1b7d
Author: Vivien Malerba <malerba gnome-db org>
Date:   Mon Feb 28 18:32:26 2011 +0100

    Modified GdaSqlExpr to keep API but not ABI and make code more readable

 libgda/gda-sql-builder.c                       |   15 +++++++--------
 libgda/gda-statement.c                         |    9 ++++-----
 libgda/sql-parser/gda-statement-struct-parts.c |    4 ++--
 libgda/sql-parser/gda-statement-struct-parts.h |   15 +++++++++------
 providers/oracle/gda-oracle-provider.c         |    8 ++++----
 5 files changed, 26 insertions(+), 25 deletions(-)
---
diff --git a/libgda/gda-sql-builder.c b/libgda/gda-sql-builder.c
index ec2ac95..986f1be 100644
--- a/libgda/gda-sql-builder.c
+++ b/libgda/gda-sql-builder.c
@@ -1,6 +1,5 @@
-/* gda-sql-builder.c
- *
- * Copyright (C) 2008 - 2010 Vivien Malerba
+/*
+ * Copyright (C) 2008 - 2011 Vivien Malerba
  *
  * This Library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public License as
@@ -511,12 +510,12 @@ gda_sql_builder_select_add_field (GdaSqlBuilder *builder, const gchar *field_nam
 	const GdaSqlBuilderId field_id = gda_sql_builder_add_id (builder, tmp);
 	if (alias && *alias)
 		gda_sql_builder_add_field_value_id (builder,
-					      field_id,
-					      gda_sql_builder_add_id (builder, alias));
+						    field_id,
+						    gda_sql_builder_add_id (builder, alias));
 	else
 		gda_sql_builder_add_field_value_id (builder,
-					      field_id,
-					      0);
+						    field_id,
+						    0);
 	if (table_name)
 		g_free (tmp);
 
@@ -942,7 +941,7 @@ gda_sql_builder_add_id (GdaSqlBuilder *builder, const gchar *string)
 	if (string) {
 		expr->value = gda_value_new (G_TYPE_STRING);
 		g_value_set_string (expr->value, string);
-		expr->value_is_ident = (gpointer) 0x1;
+		expr->value_is_ident = TRUE;
 	}
 
 	return add_part (builder, (GdaSqlAnyPart *) expr);
diff --git a/libgda/gda-statement.c b/libgda/gda-statement.c
index a308d0a..792e2ed 100644
--- a/libgda/gda-statement.c
+++ b/libgda/gda-statement.c
@@ -1,6 +1,5 @@
-/* gda-statement.c
- *
- * Copyright (C) 2007 - 2010 Vivien Malerba
+/*
+ * Copyright (C) 2007 - 2011 Vivien Malerba
  *
  * This Library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public License as
@@ -1864,7 +1863,6 @@ default_render_select_target (GdaSqlSelectTarget *target, GdaSqlRenderingContext
 {
 	GString *string;
 	gchar *str;
-	gpointer tmp;
 
 	g_return_val_if_fail (target, NULL);
 	g_return_val_if_fail (GDA_SQL_ANY_PART (target)->type == GDA_SQL_ANY_SQL_SELECT_TARGET, NULL);
@@ -1880,8 +1878,9 @@ default_render_select_target (GdaSqlSelectTarget *target, GdaSqlRenderingContext
 		g_free (str);
 	}
 	else {
+		gboolean tmp;
 		tmp = target->expr->value_is_ident;
-		target->expr->value_is_ident = (gpointer) 0x1;
+		target->expr->value_is_ident = TRUE;
 		str = context->render_expr (target->expr, context, NULL, NULL, error);
 		target->expr->value_is_ident = tmp;
 		string = g_string_new (str);
diff --git a/libgda/sql-parser/gda-statement-struct-parts.c b/libgda/sql-parser/gda-statement-struct-parts.c
index 9d2696d..fb15c4e 100644
--- a/libgda/sql-parser/gda-statement-struct-parts.c
+++ b/libgda/sql-parser/gda-statement-struct-parts.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 - 2009 Vivien Malerba
+ * Copyright (C) 2007 - 2011 Vivien Malerba
  *
  * This Library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public License as
@@ -94,7 +94,7 @@ gda_sql_expr_free (GdaSqlExpr *expr)
 	}
 	gda_sql_case_free (expr->case_s);
 	g_free (expr->cast_as);
-	expr->value_is_ident = (gpointer) 0x1;
+	expr->value_is_ident = TRUE;
 	g_free (expr);
 }
 
diff --git a/libgda/sql-parser/gda-statement-struct-parts.h b/libgda/sql-parser/gda-statement-struct-parts.h
index 0325623..7770d82 100644
--- a/libgda/sql-parser/gda-statement-struct-parts.h
+++ b/libgda/sql-parser/gda-statement-struct-parts.h
@@ -1,5 +1,8 @@
 /*
- * Copyright (C) 2007 - 2008 Vivien Malerba
+ * Copyright (C) 2007 - 2011 The GNOME Foundation.
+ *
+ * AUTHORS:
+ *      Vivien Malerba <malerba gnome-db org>
  *
  * This Library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public License as
@@ -66,7 +69,7 @@ typedef struct _GdaSqlSelectOrder GdaSqlSelectOrder;
  * <userinput>"'joe'"</userinput> and not <userinput>"joe"</userinput>.
  *
  * Note 2 about the @value field: if the expression represents an SQL identifier (such as a table
- * or field name), then the @value_is_ident should be set to %0x01, and @value should be a string
+ * or field name), then the @value_is_ident should be set to %TRUE, and @value should be a string
  * which may contain double quotes around SQL identifiers which also are reserved keywords or which
  * are case sensitive.
  */
@@ -81,14 +84,14 @@ struct _GdaSqlExpr {
 
 	gchar           *cast_as;
 
-	gpointer         value_is_ident; /* pointer to a boolean to keep ABI from 4.0.
-					  * Non NULL if @value represents an SQL identifier
-					  * Mem in _NOT_ allocated!
-					  */
+	gboolean         value_is_ident;
 
 	/*< private >*/
 	/* Padding for future expansion */
+	gpointer         _gda_reserved1;
 	gpointer         _gda_reserved2;
+	gpointer         _gda_reserved3;
+	gpointer         _gda_reserved4;
 };
 
 #define GDA_TYPE_SQL_EXPR (gda_sql_expr_get_type())
diff --git a/providers/oracle/gda-oracle-provider.c b/providers/oracle/gda-oracle-provider.c
index fb1ea49..52c9c4c 100644
--- a/providers/oracle/gda-oracle-provider.c
+++ b/providers/oracle/gda-oracle-provider.c
@@ -1,5 +1,5 @@
-/* GDA Oracle provider
- * Copyright (C) 2009 - 2010 The GNOME Foundation.
+/*
+ * Copyright (C) 2009 - 2011 The GNOME Foundation.
  *
  * AUTHORS:
  *      Rodrigo Moya <rodrigo gnome-db org>
@@ -1293,7 +1293,6 @@ oracle_render_select_target (GdaSqlSelectTarget *target, GdaSqlRenderingContext
 {
         GString *string;
         gchar *str;
-	gpointer tmp;
 
         g_return_val_if_fail (target, NULL);
         g_return_val_if_fail (GDA_SQL_ANY_PART (target)->type == GDA_SQL_ANY_SQL_SELECT_TARGET, NULL);
@@ -1309,8 +1308,9 @@ oracle_render_select_target (GdaSqlSelectTarget *target, GdaSqlRenderingContext
 		g_free (str);
 	}
 	else {
+		gboolean tmp;
 		tmp = target->expr->value_is_ident;
-		target->expr->value_is_ident = (gpointer) 0x1;
+		target->expr->value_is_ident = TRUE;
 		str = context->render_expr (target->expr, context, NULL, NULL, error);
 		target->expr->value_is_ident = tmp;
 		string = g_string_new (str);