GNOME.org
 

libgda r3201 - in trunk: . libgda libgda/sql-parser libgda/sqlite providers/firebird providers/mysql providers/postgres providers/skel-implementation/capi

Author: basd
Date: Fri Sep  5 13:30:14 2008
New Revision: 3201
URL: http://svn.gnome.org/viewvc/libgda?rev=3201&view=rev

Log:
2008-09-05  Bas Driessen <bas driessen xobas com>

	* providers/skel-implementation/capi/parser.y:
	* providers/firebird/parser.y:
	* providers/mysql/parser.y:
	* providers/postgres/parser.y:
	* providers/postgres/gda-postgres-provider.c:
	* libgda/gda-meta-store.c:
	* libgda/sqlite/gda-sqlite-provider.c:
	* libgda/sql-parser/gda-statement-struct.c:
	* libgda/sql-parser/parser.y:
	* libgda/sql-parser/gda-statement-struct-parts.c:
	* libgda/sql-parser/gda-statement-struct-parts.h:
	* libgda/gda-data-select.c:
	* libgda/gda-util.c:
	* libgda/gda-statement.c: Do not use the C++ reserved words 'using'
	and 'operator' as object names.

Modified:
   trunk/ChangeLog
   trunk/libgda/gda-data-select.c
   trunk/libgda/gda-meta-store.c
   trunk/libgda/gda-statement.c
   trunk/libgda/gda-util.c
   trunk/libgda/sql-parser/gda-statement-struct-parts.c
   trunk/libgda/sql-parser/gda-statement-struct-parts.h
   trunk/libgda/sql-parser/gda-statement-struct.c
   trunk/libgda/sql-parser/parser.y
   trunk/libgda/sqlite/gda-sqlite-provider.c
   trunk/providers/firebird/parser.y
   trunk/providers/mysql/parser.y
   trunk/providers/postgres/gda-postgres-provider.c
   trunk/providers/postgres/parser.y
   trunk/providers/skel-implementation/capi/parser.y

Modified: trunk/libgda/gda-data-select.c
==============================================================================
--- trunk/libgda/gda-data-select.c	(original)
+++ trunk/libgda/gda-data-select.c	Fri Sep  5 13:30:14 2008
@@ -1104,7 +1104,7 @@
 		return TRUE;
 
 	GdaSqlOperation *op = (GdaSqlOperation*) part;
-	if (op->operator != GDA_SQL_OPERATOR_TYPE_EQ) {
+	if (op->operator_type != GDA_SQL_OPERATOR_TYPE_EQ) {
 		g_set_error (error, GDA_DATA_SELECT_ERROR, GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
 			     _("Invalid unique row condition (ony equal operators are allowed)"));
 		return FALSE;
@@ -2027,7 +2027,7 @@
 		and_expr = gda_sql_expr_new (GDA_SQL_ANY_PART (sel));
 		and_cond = gda_sql_operation_new (GDA_SQL_ANY_PART (and_expr));
 		and_expr->cond = and_cond;
-		and_cond->operator = GDA_SQL_OPERATOR_TYPE_AND;
+		and_cond->operator_type = GDA_SQL_OPERATOR_TYPE_AND;
 		and_cond->operands = g_slist_append (NULL, sel->where_cond);
 		GDA_SQL_ANY_PART (sel->where_cond)->parent = GDA_SQL_ANY_PART (and_cond);
 		sel->where_cond = and_expr;
@@ -2704,7 +2704,7 @@
 		return TRUE;
 
 	GdaSqlOperation *op = (GdaSqlOperation*) part;
-	if (op->operator != GDA_SQL_OPERATOR_TYPE_EQ)
+	if (op->operator_type != GDA_SQL_OPERATOR_TYPE_EQ)
 		return TRUE;
 	
 	if (!op->operands || !op->operands->data || !op->operands->next || !op->operands->next->data ||

Modified: trunk/libgda/gda-meta-store.c
==============================================================================
--- trunk/libgda/gda-meta-store.c	(original)
+++ trunk/libgda/gda-meta-store.c	Fri Sep  5 13:30:14 2008
@@ -1346,7 +1346,7 @@
                                         ust->cond = expr;
                                 else {
                                         g_assert (ust->cond->cond);
-                                        if (ust->cond->cond->operator == GDA_SQL_OPERATOR_TYPE_AND)
+                                        if (ust->cond->cond->operator_type == GDA_SQL_OPERATOR_TYPE_AND)
                                                 ust->cond->cond->operands = g_slist_append (ust->cond->cond->operands,
                                                                                             expr);
                                         else {
@@ -1361,7 +1361,7 @@
                                         dst->cond = expr;
                                 else {
                                         g_assert (dst->cond->cond);
-                                        if (dst->cond->cond->operator == GDA_SQL_OPERATOR_TYPE_AND)
+                                        if (dst->cond->cond->operator_type == GDA_SQL_OPERATOR_TYPE_AND)
                                                 dst->cond->cond->operands = g_slist_append (dst->cond->cond->operands,
                                                                                             expr);
                                         else {
@@ -1559,7 +1559,7 @@
 	GdaSqlExpr *expr;
 	expr = gda_sql_expr_new (parent);
 	expr->cond = gda_sql_operation_new (GDA_SQL_ANY_PART (expr));
-	expr->cond->operator = GDA_SQL_OPERATOR_TYPE_AND;
+	expr->cond->operator_type = GDA_SQL_OPERATOR_TYPE_AND;
 
 	expr->cond->operands = g_slist_append (NULL, current);
 	GDA_SQL_ANY_PART (current)->parent = GDA_SQL_ANY_PART (expr->cond);
@@ -1577,7 +1577,7 @@
 	retexpr = gda_sql_expr_new (parent);
 
 	op = gda_sql_operation_new (GDA_SQL_ANY_PART (expr));
-	op->operator = GDA_SQL_OPERATOR_TYPE_EQ;
+	op->operator_type = GDA_SQL_OPERATOR_TYPE_EQ;
 	retexpr->cond = op;
 	
 	expr = gda_sql_expr_new (GDA_SQL_ANY_PART (op));

Modified: trunk/libgda/gda-statement.c
==============================================================================
--- trunk/libgda/gda-statement.c	(original)
+++ trunk/libgda/gda-statement.c	Fri Sep  5 13:30:14 2008
@@ -1462,7 +1462,7 @@
 	sql_list = g_slist_reverse (sql_list);
 
 	str = NULL;
-	switch (op->operator) {
+	switch (op->operator_type) {
 	case GDA_SQL_OPERATOR_TYPE_EQ:
 		if (SQL_OPERAND (sql_list->next->data)->is_null) 
 			str = g_strdup_printf ("%s IS NULL", SQL_OPERAND (sql_list->data)->sql);
@@ -1542,7 +1542,7 @@
 			add_p = FALSE;
 
 		string = g_string_new (SQL_OPERAND (sql_list->data)->sql);
-		if (op->operator == GDA_SQL_OPERATOR_TYPE_IN)
+		if (op->operator_type == GDA_SQL_OPERATOR_TYPE_IN)
 			g_string_append (string, " IN ");
 		else
 			g_string_append (string, " NOT IN ");
@@ -1751,8 +1751,8 @@
 	g_return_val_if_fail (GDA_SQL_ANY_PART (join)->type == GDA_SQL_ANY_SQL_SELECT_JOIN, NULL);
 
 	/* can't have: 
-	 *  - join->expr && join->using 
-	 *  - (join->type == GDA_SQL_SELECT_JOIN_CROSS) && (join->expr || join->using)
+	 *  - join->expr && join->use 
+	 *  - (join->type == GDA_SQL_SELECT_JOIN_CROSS) && (join->expr || join->use)
 	 */
 	if (!gda_sql_any_part_check_structure (GDA_SQL_ANY_PART (join), error)) return NULL;
 
@@ -1807,11 +1807,11 @@
 		g_free (str);
 		g_string_append_c (string, ')');
 	}
-	else if (join->using) {
+	else if (join->use) {
 		GSList *list;
 		g_string_append (string, " USING (");
-		for (list = join->using; list; list = list->next) {
-			if (list != join->using)
+		for (list = join->use; list; list = list->next) {
+			if (list != join->use)
 				g_string_append (string, ", ");
 			str = context->render_field (GDA_SQL_ANY_PART (list->data), context, error);
 			if (!str) goto err;

Modified: trunk/libgda/gda-util.c
==============================================================================
--- trunk/libgda/gda-util.c	(original)
+++ trunk/libgda/gda-util.c	Fri Sep  5 13:30:14 2008
@@ -688,7 +688,7 @@
 		}
 		else if (mtable->pk_cols_nb > 1) {
 			and_cond = gda_sql_operation_new (GDA_SQL_ANY_PART (expr));
-			and_cond->operator = GDA_SQL_OPERATOR_TYPE_AND;
+			and_cond->operator_type = GDA_SQL_OPERATOR_TYPE_AND;
 			expr->cond = and_cond;
 		}
 		for (i = 0; i < mtable->pk_cols_nb; i++) {
@@ -716,7 +716,7 @@
 
 				/* equal condition */
 				op = gda_sql_operation_new (GDA_SQL_ANY_PART (and_cond ? (gpointer)and_cond : (gpointer)expr));
-				op->operator = GDA_SQL_OPERATOR_TYPE_EQ;
+				op->operator_type = GDA_SQL_OPERATOR_TYPE_EQ;
 				if (and_cond) 
 					and_cond->operands = g_slist_append (and_cond->operands, op);
 				else

Modified: trunk/libgda/sql-parser/gda-statement-struct-parts.c
==============================================================================
--- trunk/libgda/sql-parser/gda-statement-struct-parts.c	(original)
+++ trunk/libgda/sql-parser/gda-statement-struct-parts.c	Fri Sep  5 13:30:14 2008
@@ -621,7 +621,7 @@
 	if (!operation) return NULL;
 
 	copy = gda_sql_operation_new (NULL);
-	copy->operator = operation->operator;
+	copy->operator_type = operation->operator_type;
 	
 	for (list = operation->operands; list; list = list->next) {
 		copy->operands = g_slist_prepend (copy->operands, 
@@ -656,7 +656,7 @@
 		string = g_string_new ("{");
 
 		g_string_append (string, "\"operator\":");
-		str = _json_quote_string (gda_sql_operation_operator_to_string (operation->operator));
+		str = _json_quote_string (gda_sql_operation_operator_to_string (operation->operator_type));
 		g_string_append (string, str);
 		g_free (str);
 
@@ -1347,8 +1347,8 @@
 	if (!join) return;
 
 	gda_sql_expr_free (join->expr);
-	g_slist_foreach (join->using, (GFunc) gda_sql_field_free, NULL);
-	g_slist_free (join->using);
+	g_slist_foreach (join->use, (GFunc) gda_sql_field_free, NULL);
+	g_slist_free (join->use);
 
 	g_free (join);
 }
@@ -1376,12 +1376,12 @@
 	copy->expr = gda_sql_expr_copy (join->expr);
 	gda_sql_any_part_set_parent (copy->expr, copy);
 
-	for (list = join->using; list; list = list->next) {
-		copy->using = g_slist_prepend (copy->using,
+	for (list = join->use; list; list = list->next) {
+		copy->use = g_slist_prepend (copy->use,
 					       gda_sql_field_copy ((GdaSqlField*) list->data));
-		gda_sql_any_part_set_parent (copy->using->data, copy);
+		gda_sql_any_part_set_parent (copy->use->data, copy);
 	}
-	copy->using = g_slist_reverse (copy->using);
+	copy->use = g_slist_reverse (copy->use);
 
 	return copy;
 }
@@ -1452,12 +1452,12 @@
 			g_free (str);
 		}
 
-		if (join->using) {
+		if (join->use) {
 			GSList *list;
 			g_string_append (string, ",\"using\":");
 			g_string_append_c (string, '[');
-			for (list = join->using; list; list = list->next) {
-				if (list != join->using)
+			for (list = join->use; list; list = list->next) {
+				if (list != join->use)
 					g_string_append_c (string, ',');
 				str = gda_sql_field_serialize ((GdaSqlField*) list->data);
 				g_string_append (string, str);

Modified: trunk/libgda/sql-parser/gda-statement-struct-parts.h
==============================================================================
--- trunk/libgda/sql-parser/gda-statement-struct-parts.h	(original)
+++ trunk/libgda/sql-parser/gda-statement-struct-parts.h	Fri Sep  5 13:30:14 2008
@@ -160,7 +160,7 @@
 
 struct _GdaSqlOperation {
 	GdaSqlAnyPart       any;
-	GdaSqlOperatorType  operator;
+	GdaSqlOperatorType  operator_type;
 	GSList             *operands;
 };
 
@@ -255,7 +255,7 @@
 	GdaSqlSelectJoinType  type;
 	gint                  position; /* between a target at (pos < @position) and the one @position */
 	GdaSqlExpr           *expr;
-	GSList               *using;
+	GSList               *use;
 };
 
 GdaSqlSelectJoin  *gda_sql_select_join_new            (GdaSqlAnyPart *parent);

Modified: trunk/libgda/sql-parser/gda-statement-struct.c
==============================================================================
--- trunk/libgda/sql-parser/gda-statement-struct.c	(original)
+++ trunk/libgda/sql-parser/gda-statement-struct.c	Fri Sep  5 13:30:14 2008
@@ -931,7 +931,7 @@
 				     _("Operation has no operand"));
 			return FALSE;
 		}
-		switch (operation->operator) {
+		switch (operation->operator_type) {
 		case GDA_SQL_OPERATOR_TYPE_EQ:
 		case GDA_SQL_OPERATOR_TYPE_IS:
 		case GDA_SQL_OPERATOR_TYPE_LIKE:
@@ -994,7 +994,7 @@
 			break;
 		default:
 			g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
-				     _("Unknown operator %d"), operation->operator);
+				     _("Unknown operator %d"), operation->operator_type);
 			return FALSE;
 		}
 		break;
@@ -1033,12 +1033,12 @@
 	}
 	case GDA_SQL_ANY_SQL_SELECT_JOIN: {
 		GdaSqlSelectJoin *join = (GdaSqlSelectJoin*) node;
-		if (join->expr && join->using) {
+		if (join->expr && join->use) {
 			g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
 				     _("Join can't at the same time specify a join condition and a list of fields to join on"));
 			return FALSE;
 		}
-		if ((join->type == GDA_SQL_SELECT_JOIN_CROSS) && (join->expr || join->using)) {
+		if ((join->type == GDA_SQL_SELECT_JOIN_CROSS) && (join->expr || join->use)) {
 			g_set_error (error, GDA_SQL_ERROR, GDA_SQL_STRUCTURE_CONTENTS_ERROR,
 				     _("Cross join can't have a join condition or a list of fields to join on"));
 			return FALSE;
@@ -1239,7 +1239,7 @@
 		GdaSqlSelectJoin *join = (GdaSqlSelectJoin *) node;
 		if (!gda_sql_any_part_foreach (GDA_SQL_ANY_PART (join->expr), func, data, error))
 			return FALSE;
-		for (l = join->using; l; l = l->next)
+		for (l = join->use; l; l = l->next)
 			if (!gda_sql_any_part_foreach (GDA_SQL_ANY_PART (l->data), func, data, error))
 				return FALSE;
 		break;

Modified: trunk/libgda/sql-parser/parser.y
==============================================================================
--- trunk/libgda/sql-parser/parser.y	(original)
+++ trunk/libgda/sql-parser/parser.y	Fri Sep  5 13:30:14 2008
@@ -162,7 +162,7 @@
 static GdaSqlExpr *
 compose_multiple_expr (GdaSqlOperatorType op, GdaSqlExpr *left, GdaSqlExpr *right) {
 	GdaSqlExpr *ret;
-	if (left->cond && (left->cond->operator == op)) {
+	if (left->cond && (left->cond->operator_type == op)) {
 		ret = left;
 		ret->cond->operands = g_slist_append (ret->cond->operands, right);
 	}
@@ -171,7 +171,7 @@
 		ret = gda_sql_expr_new (NULL);
 		cond = gda_sql_operation_new (GDA_SQL_ANY_PART (ret));
 		ret->cond = cond;
-		cond->operator = op;
+		cond->operator_type = op;
 		cond->operands = g_slist_prepend (NULL, right);
 		GDA_SQL_ANY_PART (right)->parent = GDA_SQL_ANY_PART (cond);
 		cond->operands = g_slist_prepend (cond->operands, left);
@@ -187,7 +187,7 @@
 	ret = gda_sql_expr_new (NULL);
 	cond = gda_sql_operation_new (GDA_SQL_ANY_PART (ret));
 	ret->cond = cond;
-	cond->operator = op;
+	cond->operator_type = op;
 	cond->operands = g_slist_prepend (NULL, right);
 	GDA_SQL_ANY_PART (right)->parent = GDA_SQL_ANY_PART (cond);
 	cond->operands = g_slist_prepend (cond->operands, left);
@@ -202,7 +202,7 @@
 	ret = gda_sql_expr_new (NULL);
 	cond = gda_sql_operation_new (GDA_SQL_ANY_PART (ret));
 	ret->cond = cond;
-	cond->operator = op;
+	cond->operator_type = op;
 	cond->operands = g_slist_prepend (NULL, expr);
 	GDA_SQL_ANY_PART (expr)->parent = GDA_SQL_ANY_PART (cond);
 	return ret;
@@ -654,7 +654,7 @@
 		GdaSqlSelectJoin *join = (GdaSqlSelectJoin *) (last->data);
 		join->expr = C;
 		join->position = g_slist_length (L->targets) - 1;
-		join->using = U;
+		join->use = U;
 	}
 }
 
@@ -829,7 +829,7 @@
 						  C = gda_sql_expr_new (NULL);
 						  cond = gda_sql_operation_new (GDA_SQL_ANY_PART (C));
 						  C->cond = cond;
-						  cond->operator = GDA_SQL_OPERATOR_TYPE_BETWEEN;
+						  cond->operator_type = GDA_SQL_OPERATOR_TYPE_BETWEEN;
 						  cond->operands = g_slist_append (NULL, L);
 						  GDA_SQL_ANY_PART (L)->parent = GDA_SQL_ANY_PART (cond);
 						  cond->operands = g_slist_append (cond->operands, R);
@@ -843,7 +843,7 @@
 						      expr = gda_sql_expr_new (NULL);
 						      cond = gda_sql_operation_new (GDA_SQL_ANY_PART (expr));
 						      expr->cond = cond;
-						      cond->operator = GDA_SQL_OPERATOR_TYPE_BETWEEN;
+						      cond->operator_type = GDA_SQL_OPERATOR_TYPE_BETWEEN;
 						      cond->operands = g_slist_append (NULL, L);
 						      GDA_SQL_ANY_PART (L)->parent = GDA_SQL_ANY_PART (cond);
 						      cond->operands = g_slist_append (cond->operands, R);
@@ -854,7 +854,7 @@
 						      C = gda_sql_expr_new (NULL);
 						      cond = gda_sql_operation_new (GDA_SQL_ANY_PART (C));
 						      C->cond = cond;
-						      cond->operator = GDA_SQL_OPERATOR_TYPE_NOT;
+						      cond->operator_type = GDA_SQL_OPERATOR_TYPE_NOT;
 						      cond->operands = g_slist_prepend (NULL, expr);
 						      GDA_SQL_ANY_PART (expr)->parent = GDA_SQL_ANY_PART (cond);
 }
@@ -870,7 +870,7 @@
 					   E = gda_sql_expr_new (NULL);
 					   cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					   E->cond = cond;
-					   cond->operator = GDA_SQL_OPERATOR_TYPE_IN;
+					   cond->operator_type = GDA_SQL_OPERATOR_TYPE_IN;
 					   cond->operands = g_slist_prepend (L, R);
 					   for (list = cond->operands; list; list = list->next)
 						   GDA_SQL_ANY_PART (list->data)->parent = GDA_SQL_ANY_PART (cond);
@@ -880,7 +880,7 @@
 					    E = gda_sql_expr_new (NULL);
 					    cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					    E->cond = cond;
-					    cond->operator = GDA_SQL_OPERATOR_TYPE_IN;
+					    cond->operator_type = GDA_SQL_OPERATOR_TYPE_IN;
 					    
 					    expr = gda_sql_expr_new (GDA_SQL_ANY_PART (cond));
 					    gda_sql_expr_take_select (expr, S);
@@ -893,7 +893,7 @@
 					       E = gda_sql_expr_new (NULL);
 					       cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					       E->cond = cond;
-					       cond->operator = GDA_SQL_OPERATOR_TYPE_NOTIN;
+					       cond->operator_type = GDA_SQL_OPERATOR_TYPE_NOTIN;
 					       cond->operands = g_slist_prepend (L, R);
 					       for (list = cond->operands; list; list = list->next)
 						       GDA_SQL_ANY_PART (list->data)->parent = GDA_SQL_ANY_PART (cond);
@@ -903,7 +903,7 @@
 					       E = gda_sql_expr_new (NULL);
 					       cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					       E->cond = cond;
-					       cond->operator = GDA_SQL_OPERATOR_TYPE_NOTIN;
+					       cond->operator_type = GDA_SQL_OPERATOR_TYPE_NOTIN;
 					       
 					       expr = gda_sql_expr_new (GDA_SQL_ANY_PART (cond));
 					       gda_sql_expr_take_select (expr, S);

Modified: trunk/libgda/sqlite/gda-sqlite-provider.c
==============================================================================
--- trunk/libgda/sqlite/gda-sqlite-provider.c	(original)
+++ trunk/libgda/sqlite/gda-sqlite-provider.c	Fri Sep  5 13:30:14 2008
@@ -1317,7 +1317,7 @@
 	sql_list = g_slist_reverse (sql_list);
 
 	str = NULL;
-	switch (op->operator) {
+	switch (op->operator_type) {
 	case GDA_SQL_OPERATOR_TYPE_EQ:
 		if (SQL_OPERAND (sql_list->next->data)->is_null) 
 			str = g_strdup_printf ("%s IS NULL", SQL_OPERAND (sql_list->data)->sql);
@@ -1393,7 +1393,7 @@
 			add_p = FALSE;
 
 		string = g_string_new (SQL_OPERAND (sql_list->data)->sql);
-		if (op->operator == GDA_SQL_OPERATOR_TYPE_IN)
+		if (op->operator_type == GDA_SQL_OPERATOR_TYPE_IN)
 			g_string_append (string, " IN ");
 		else
 			g_string_append (string, " NOT IN ");
@@ -1718,7 +1718,7 @@
 	where = gda_sql_expr_new (GDA_SQL_ANY_PART (select));
 	cond = gda_sql_operation_new (GDA_SQL_ANY_PART (where));
 	where->cond = cond;
-	cond->operator = GDA_SQL_OPERATOR_TYPE_EQ;
+	cond->operator_type = GDA_SQL_OPERATOR_TYPE_EQ;
 	expr = gda_sql_expr_new (GDA_SQL_ANY_PART (cond));
 	g_value_set_string ((value = gda_value_new (G_TYPE_STRING)), "_rowid_");
 	expr->value = value;

Modified: trunk/providers/firebird/parser.y
==============================================================================
--- trunk/providers/firebird/parser.y	(original)
+++ trunk/providers/firebird/parser.y	Fri Sep  5 13:30:14 2008
@@ -160,7 +160,7 @@
 static GdaSqlExpr *
 compose_multiple_expr (GdaSqlOperatorType op, GdaSqlExpr *left, GdaSqlExpr *right) {
 	GdaSqlExpr *ret;
-	if (left->cond && (left->cond->operator == op)) {
+	if (left->cond && (left->cond->operator_type == op)) {
 		ret = left;
 		ret->cond->operands = g_slist_append (ret->cond->operands, right);
 	}
@@ -169,7 +169,7 @@
 		ret = gda_sql_expr_new (NULL);
 		cond = gda_sql_operation_new (GDA_SQL_ANY_PART (ret));
 		ret->cond = cond;
-		cond->operator = op;
+		cond->operator_type = op;
 		cond->operands = g_slist_prepend (NULL, right);
 		GDA_SQL_ANY_PART (right)->parent = GDA_SQL_ANY_PART (cond);
 		cond->operands = g_slist_prepend (cond->operands, left);
@@ -185,7 +185,7 @@
 	ret = gda_sql_expr_new (NULL);
 	cond = gda_sql_operation_new (GDA_SQL_ANY_PART (ret));
 	ret->cond = cond;
-	cond->operator = op;
+	cond->operator_type = op;
 	cond->operands = g_slist_prepend (NULL, right);
 	GDA_SQL_ANY_PART (right)->parent = GDA_SQL_ANY_PART (cond);
 	cond->operands = g_slist_prepend (cond->operands, left);
@@ -200,7 +200,7 @@
 	ret = gda_sql_expr_new (NULL);
 	cond = gda_sql_operation_new (GDA_SQL_ANY_PART (ret));
 	ret->cond = cond;
-	cond->operator = op;
+	cond->operator_type = op;
 	cond->operands = g_slist_prepend (NULL, expr);
 	GDA_SQL_ANY_PART (expr)->parent = GDA_SQL_ANY_PART (cond);
 	return ret;
@@ -653,7 +653,7 @@
 		GdaSqlSelectJoin *join = (GdaSqlSelectJoin *) (last->data);
 		join->expr = C;
 		join->position = g_slist_length (L->targets) - 1;
-		join->using = U;
+		join->use = U;
 	}
 }
 
@@ -828,7 +828,7 @@
 						  C = gda_sql_expr_new (NULL);
 						  cond = gda_sql_operation_new (GDA_SQL_ANY_PART (C));
 						  C->cond = cond;
-						  cond->operator = GDA_SQL_OPERATOR_TYPE_BETWEEN;
+						  cond->operator_type = GDA_SQL_OPERATOR_TYPE_BETWEEN;
 						  cond->operands = g_slist_append (NULL, L);
 						  GDA_SQL_ANY_PART (L)->parent = GDA_SQL_ANY_PART (cond);
 						  cond->operands = g_slist_append (cond->operands, R);
@@ -842,7 +842,7 @@
 						      expr = gda_sql_expr_new (NULL);
 						      cond = gda_sql_operation_new (GDA_SQL_ANY_PART (expr));
 						      expr->cond = cond;
-						      cond->operator = GDA_SQL_OPERATOR_TYPE_BETWEEN;
+						      cond->operator_type = GDA_SQL_OPERATOR_TYPE_BETWEEN;
 						      cond->operands = g_slist_append (NULL, L);
 						      GDA_SQL_ANY_PART (L)->parent = GDA_SQL_ANY_PART (cond);
 						      cond->operands = g_slist_append (cond->operands, R);
@@ -853,7 +853,7 @@
 						      C = gda_sql_expr_new (NULL);
 						      cond = gda_sql_operation_new (GDA_SQL_ANY_PART (C));
 						      C->cond = cond;
-						      cond->operator = GDA_SQL_OPERATOR_TYPE_NOT;
+						      cond->operator_type = GDA_SQL_OPERATOR_TYPE_NOT;
 						      cond->operands = g_slist_prepend (NULL, expr);
 						      GDA_SQL_ANY_PART (expr)->parent = GDA_SQL_ANY_PART (cond);
 }
@@ -869,7 +869,7 @@
 					   E = gda_sql_expr_new (NULL);
 					   cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					   E->cond = cond;
-					   cond->operator = GDA_SQL_OPERATOR_TYPE_IN;
+					   cond->operator_type = GDA_SQL_OPERATOR_TYPE_IN;
 					   cond->operands = g_slist_prepend (L, R);
 					   for (list = cond->operands; list; list = list->next)
 						   GDA_SQL_ANY_PART (list->data)->parent = GDA_SQL_ANY_PART (cond);
@@ -879,7 +879,7 @@
 					    E = gda_sql_expr_new (NULL);
 					    cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					    E->cond = cond;
-					    cond->operator = GDA_SQL_OPERATOR_TYPE_IN;
+					    cond->operator_type = GDA_SQL_OPERATOR_TYPE_IN;
 					    
 					    expr = gda_sql_expr_new (GDA_SQL_ANY_PART (cond));
 					    gda_sql_expr_take_select (expr, S);
@@ -893,7 +893,7 @@
 					       expr = gda_sql_expr_new (NULL);
 					       cond = gda_sql_operation_new (GDA_SQL_ANY_PART (expr));
 					       expr->cond = cond;
-					       cond->operator = GDA_SQL_OPERATOR_TYPE_IN;
+					       cond->operator_type = GDA_SQL_OPERATOR_TYPE_IN;
 					       cond->operands = g_slist_prepend (L, R);
 					       for (list = cond->operands; list; list = list->next)
 						       GDA_SQL_ANY_PART (list->data)->parent = GDA_SQL_ANY_PART (cond);
@@ -901,7 +901,7 @@
 					       E = gda_sql_expr_new (NULL);
 					       cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					       E->cond = cond;
-					       cond->operator = GDA_SQL_OPERATOR_TYPE_NOT;
+					       cond->operator_type = GDA_SQL_OPERATOR_TYPE_NOT;
 					       cond->operands = g_slist_prepend (NULL, expr);
 					       GDA_SQL_ANY_PART (expr)->parent = GDA_SQL_ANY_PART (cond);
 }
@@ -910,7 +910,7 @@
 						expr1 = gda_sql_expr_new (NULL);
 						cond = gda_sql_operation_new (GDA_SQL_ANY_PART (expr1));
 						expr1->cond = cond;
-						cond->operator = GDA_SQL_OPERATOR_TYPE_IN;
+						cond->operator_type = GDA_SQL_OPERATOR_TYPE_IN;
 						
 						expr2 = gda_sql_expr_new (NULL);
 						gda_sql_expr_take_select (expr2, S);
@@ -922,7 +922,7 @@
 						E = gda_sql_expr_new (NULL);
 						cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 						E->cond = cond;
-						cond->operator = GDA_SQL_OPERATOR_TYPE_NOT;
+						cond->operator_type = GDA_SQL_OPERATOR_TYPE_NOT;
 						cond->operands = g_slist_prepend (NULL, expr1);
 						GDA_SQL_ANY_PART (expr1)->parent = GDA_SQL_ANY_PART (cond);
 }

Modified: trunk/providers/mysql/parser.y
==============================================================================
--- trunk/providers/mysql/parser.y	(original)
+++ trunk/providers/mysql/parser.y	Fri Sep  5 13:30:14 2008
@@ -160,7 +160,7 @@
 static GdaSqlExpr *
 compose_multiple_expr (GdaSqlOperatorType op, GdaSqlExpr *left, GdaSqlExpr *right) {
 	GdaSqlExpr *ret;
-	if (left->cond && (left->cond->operator == op)) {
+	if (left->cond && (left->cond->operator_type == op)) {
 		ret = left;
 		ret->cond->operands = g_slist_append (ret->cond->operands, right);
 	}
@@ -169,7 +169,7 @@
 		ret = gda_sql_expr_new (NULL);
 		cond = gda_sql_operation_new (GDA_SQL_ANY_PART (ret));
 		ret->cond = cond;
-		cond->operator = op;
+		cond->operator_type = op;
 		cond->operands = g_slist_prepend (NULL, right);
 		GDA_SQL_ANY_PART (right)->parent = GDA_SQL_ANY_PART (cond);
 		cond->operands = g_slist_prepend (cond->operands, left);
@@ -185,7 +185,7 @@
 	ret = gda_sql_expr_new (NULL);
 	cond = gda_sql_operation_new (GDA_SQL_ANY_PART (ret));
 	ret->cond = cond;
-	cond->operator = op;
+	cond->operator_type = op;
 	cond->operands = g_slist_prepend (NULL, right);
 	GDA_SQL_ANY_PART (right)->parent = GDA_SQL_ANY_PART (cond);
 	cond->operands = g_slist_prepend (cond->operands, left);
@@ -200,7 +200,7 @@
 	ret = gda_sql_expr_new (NULL);
 	cond = gda_sql_operation_new (GDA_SQL_ANY_PART (ret));
 	ret->cond = cond;
-	cond->operator = op;
+	cond->operator_type = op;
 	cond->operands = g_slist_prepend (NULL, expr);
 	GDA_SQL_ANY_PART (expr)->parent = GDA_SQL_ANY_PART (cond);
 	return ret;
@@ -653,7 +653,7 @@
 		GdaSqlSelectJoin *join = (GdaSqlSelectJoin *) (last->data);
 		join->expr = C;
 		join->position = g_slist_length (L->targets) - 1;
-		join->using = U;
+		join->use = U;
 	}
 }
 
@@ -828,7 +828,7 @@
 						  C = gda_sql_expr_new (NULL);
 						  cond = gda_sql_operation_new (GDA_SQL_ANY_PART (C));
 						  C->cond = cond;
-						  cond->operator = GDA_SQL_OPERATOR_TYPE_BETWEEN;
+						  cond->operator_type = GDA_SQL_OPERATOR_TYPE_BETWEEN;
 						  cond->operands = g_slist_append (NULL, L);
 						  GDA_SQL_ANY_PART (L)->parent = GDA_SQL_ANY_PART (cond);
 						  cond->operands = g_slist_append (cond->operands, R);
@@ -842,7 +842,7 @@
 						      expr = gda_sql_expr_new (NULL);
 						      cond = gda_sql_operation_new (GDA_SQL_ANY_PART (expr));
 						      expr->cond = cond;
-						      cond->operator = GDA_SQL_OPERATOR_TYPE_BETWEEN;
+						      cond->operator_type = GDA_SQL_OPERATOR_TYPE_BETWEEN;
 						      cond->operands = g_slist_append (NULL, L);
 						      GDA_SQL_ANY_PART (L)->parent = GDA_SQL_ANY_PART (cond);
 						      cond->operands = g_slist_append (cond->operands, R);
@@ -853,7 +853,7 @@
 						      C = gda_sql_expr_new (NULL);
 						      cond = gda_sql_operation_new (GDA_SQL_ANY_PART (C));
 						      C->cond = cond;
-						      cond->operator = GDA_SQL_OPERATOR_TYPE_NOT;
+						      cond->operator_type = GDA_SQL_OPERATOR_TYPE_NOT;
 						      cond->operands = g_slist_prepend (NULL, expr);
 						      GDA_SQL_ANY_PART (expr)->parent = GDA_SQL_ANY_PART (cond);
 }
@@ -869,7 +869,7 @@
 					   E = gda_sql_expr_new (NULL);
 					   cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					   E->cond = cond;
-					   cond->operator = GDA_SQL_OPERATOR_TYPE_IN;
+					   cond->operator_type = GDA_SQL_OPERATOR_TYPE_IN;
 					   cond->operands = g_slist_prepend (L, R);
 					   for (list = cond->operands; list; list = list->next)
 						   GDA_SQL_ANY_PART (list->data)->parent = GDA_SQL_ANY_PART (cond);
@@ -879,7 +879,7 @@
 					    E = gda_sql_expr_new (NULL);
 					    cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					    E->cond = cond;
-					    cond->operator = GDA_SQL_OPERATOR_TYPE_IN;
+					    cond->operator_type = GDA_SQL_OPERATOR_TYPE_IN;
 					    
 					    expr = gda_sql_expr_new (GDA_SQL_ANY_PART (cond));
 					    gda_sql_expr_take_select (expr, S);
@@ -893,7 +893,7 @@
 					       expr = gda_sql_expr_new (NULL);
 					       cond = gda_sql_operation_new (GDA_SQL_ANY_PART (expr));
 					       expr->cond = cond;
-					       cond->operator = GDA_SQL_OPERATOR_TYPE_IN;
+					       cond->operator_type = GDA_SQL_OPERATOR_TYPE_IN;
 					       cond->operands = g_slist_prepend (L, R);
 					       for (list = cond->operands; list; list = list->next)
 						       GDA_SQL_ANY_PART (list->data)->parent = GDA_SQL_ANY_PART (cond);
@@ -901,7 +901,7 @@
 					       E = gda_sql_expr_new (NULL);
 					       cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					       E->cond = cond;
-					       cond->operator = GDA_SQL_OPERATOR_TYPE_NOT;
+					       cond->operator_type = GDA_SQL_OPERATOR_TYPE_NOT;
 					       cond->operands = g_slist_prepend (NULL, expr);
 					       GDA_SQL_ANY_PART (expr)->parent = GDA_SQL_ANY_PART (cond);
 }
@@ -910,7 +910,7 @@
 						expr1 = gda_sql_expr_new (NULL);
 						cond = gda_sql_operation_new (GDA_SQL_ANY_PART (expr1));
 						expr1->cond = cond;
-						cond->operator = GDA_SQL_OPERATOR_TYPE_IN;
+						cond->operator_type = GDA_SQL_OPERATOR_TYPE_IN;
 						
 						expr2 = gda_sql_expr_new (NULL);
 						gda_sql_expr_take_select (expr2, S);
@@ -922,7 +922,7 @@
 						E = gda_sql_expr_new (NULL);
 						cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 						E->cond = cond;
-						cond->operator = GDA_SQL_OPERATOR_TYPE_NOT;
+						cond->operator_type = GDA_SQL_OPERATOR_TYPE_NOT;
 						cond->operands = g_slist_prepend (NULL, expr1);
 						GDA_SQL_ANY_PART (expr1)->parent = GDA_SQL_ANY_PART (cond);
 }

Modified: trunk/providers/postgres/gda-postgres-provider.c
==============================================================================
--- trunk/providers/postgres/gda-postgres-provider.c	(original)
+++ trunk/providers/postgres/gda-postgres-provider.c	Fri Sep  5 13:30:14 2008
@@ -1801,7 +1801,7 @@
 	where = gda_sql_expr_new (GDA_SQL_ANY_PART (select));
 	cond = gda_sql_operation_new (GDA_SQL_ANY_PART (where));
 	where->cond = cond;
-	cond->operator = GDA_SQL_OPERATOR_TYPE_EQ;
+	cond->operator_type = GDA_SQL_OPERATOR_TYPE_EQ;
 	expr = gda_sql_expr_new (GDA_SQL_ANY_PART (cond));
 	g_value_set_string ((value = gda_value_new (G_TYPE_STRING)), "oid");
 	expr->value = value;

Modified: trunk/providers/postgres/parser.y
==============================================================================
--- trunk/providers/postgres/parser.y	(original)
+++ trunk/providers/postgres/parser.y	Fri Sep  5 13:30:14 2008
@@ -162,7 +162,7 @@
 static GdaSqlExpr *
 compose_multiple_expr (GdaSqlOperatorType op, GdaSqlExpr *left, GdaSqlExpr *right) {
 	GdaSqlExpr *ret;
-	if (left->cond && (left->cond->operator == op)) {
+	if (left->cond && (left->cond->operator_type == op)) {
 		ret = left;
 		ret->cond->operands = g_slist_append (ret->cond->operands, right);
 	}
@@ -171,7 +171,7 @@
 		ret = gda_sql_expr_new (NULL);
 		cond = gda_sql_operation_new (GDA_SQL_ANY_PART (ret));
 		ret->cond = cond;
-		cond->operator = op;
+		cond->operator_type = op;
 		cond->operands = g_slist_prepend (NULL, right);
 		GDA_SQL_ANY_PART (right)->parent = GDA_SQL_ANY_PART (cond);
 		cond->operands = g_slist_prepend (cond->operands, left);
@@ -187,7 +187,7 @@
 	ret = gda_sql_expr_new (NULL);
 	cond = gda_sql_operation_new (GDA_SQL_ANY_PART (ret));
 	ret->cond = cond;
-	cond->operator = op;
+	cond->operator_type = op;
 	cond->operands = g_slist_prepend (NULL, right);
 	GDA_SQL_ANY_PART (right)->parent = GDA_SQL_ANY_PART (cond);
 	cond->operands = g_slist_prepend (cond->operands, left);
@@ -202,7 +202,7 @@
 	ret = gda_sql_expr_new (NULL);
 	cond = gda_sql_operation_new (GDA_SQL_ANY_PART (ret));
 	ret->cond = cond;
-	cond->operator = op;
+	cond->operator_type = op;
 	cond->operands = g_slist_prepend (NULL, expr);
 	GDA_SQL_ANY_PART (expr)->parent = GDA_SQL_ANY_PART (cond);
 	return ret;
@@ -655,7 +655,7 @@
 		GdaSqlSelectJoin *join = (GdaSqlSelectJoin *) (last->data);
 		join->expr = C;
 		join->position = g_slist_length (L->targets) - 1;
-		join->using = U;
+		join->use = U;
 	}
 }
 
@@ -830,7 +830,7 @@
 						  C = gda_sql_expr_new (NULL);
 						  cond = gda_sql_operation_new (GDA_SQL_ANY_PART (C));
 						  C->cond = cond;
-						  cond->operator = GDA_SQL_OPERATOR_TYPE_BETWEEN;
+						  cond->operator_type = GDA_SQL_OPERATOR_TYPE_BETWEEN;
 						  cond->operands = g_slist_append (NULL, L);
 						  GDA_SQL_ANY_PART (L)->parent = GDA_SQL_ANY_PART (cond);
 						  cond->operands = g_slist_append (cond->operands, R);
@@ -844,7 +844,7 @@
 						      expr = gda_sql_expr_new (NULL);
 						      cond = gda_sql_operation_new (GDA_SQL_ANY_PART (expr));
 						      expr->cond = cond;
-						      cond->operator = GDA_SQL_OPERATOR_TYPE_BETWEEN;
+						      cond->operator_type = GDA_SQL_OPERATOR_TYPE_BETWEEN;
 						      cond->operands = g_slist_append (NULL, L);
 						      GDA_SQL_ANY_PART (L)->parent = GDA_SQL_ANY_PART (cond);
 						      cond->operands = g_slist_append (cond->operands, R);
@@ -855,7 +855,7 @@
 						      C = gda_sql_expr_new (NULL);
 						      cond = gda_sql_operation_new (GDA_SQL_ANY_PART (C));
 						      C->cond = cond;
-						      cond->operator = GDA_SQL_OPERATOR_TYPE_NOT;
+						      cond->operator_type = GDA_SQL_OPERATOR_TYPE_NOT;
 						      cond->operands = g_slist_prepend (NULL, expr);
 						      GDA_SQL_ANY_PART (expr)->parent = GDA_SQL_ANY_PART (cond);
 }
@@ -871,7 +871,7 @@
 					   E = gda_sql_expr_new (NULL);
 					   cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					   E->cond = cond;
-					   cond->operator = GDA_SQL_OPERATOR_TYPE_IN;
+					   cond->operator_type = GDA_SQL_OPERATOR_TYPE_IN;
 					   cond->operands = g_slist_prepend (L, R);
 					   for (list = cond->operands; list; list = list->next)
 						   GDA_SQL_ANY_PART (list->data)->parent = GDA_SQL_ANY_PART (cond);
@@ -881,7 +881,7 @@
 					    E = gda_sql_expr_new (NULL);
 					    cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					    E->cond = cond;
-					    cond->operator = GDA_SQL_OPERATOR_TYPE_IN;
+					    cond->operator_type = GDA_SQL_OPERATOR_TYPE_IN;
 					    
 					    expr = gda_sql_expr_new (GDA_SQL_ANY_PART (cond));
 					    gda_sql_expr_take_select (expr, S);
@@ -894,7 +894,7 @@
 					       E = gda_sql_expr_new (NULL);
 					       cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					       E->cond = cond;
-					       cond->operator = GDA_SQL_OPERATOR_TYPE_NOTIN;
+					       cond->operator_type = GDA_SQL_OPERATOR_TYPE_NOTIN;
 					       cond->operands = g_slist_prepend (L, R);
 					       for (list = cond->operands; list; list = list->next)
 						       GDA_SQL_ANY_PART (list->data)->parent = GDA_SQL_ANY_PART (cond);
@@ -904,7 +904,7 @@
 					       E = gda_sql_expr_new (NULL);
 					       cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					       E->cond = cond;
-					       cond->operator = GDA_SQL_OPERATOR_TYPE_NOTIN;
+					       cond->operator_type = GDA_SQL_OPERATOR_TYPE_NOTIN;
 					       
 					       expr = gda_sql_expr_new (GDA_SQL_ANY_PART (cond));
 					       gda_sql_expr_take_select (expr, S);

Modified: trunk/providers/skel-implementation/capi/parser.y
==============================================================================
--- trunk/providers/skel-implementation/capi/parser.y	(original)
+++ trunk/providers/skel-implementation/capi/parser.y	Fri Sep  5 13:30:14 2008
@@ -160,7 +160,7 @@
 static GdaSqlExpr *
 compose_multiple_expr (GdaSqlOperatorType op, GdaSqlExpr *left, GdaSqlExpr *right) {
 	GdaSqlExpr *ret;
-	if (left->cond && (left->cond->operator == op)) {
+	if (left->cond && (left->cond->operator_type == op)) {
 		ret = left;
 		ret->cond->operands = g_slist_append (ret->cond->operands, right);
 	}
@@ -169,7 +169,7 @@
 		ret = gda_sql_expr_new (NULL);
 		cond = gda_sql_operation_new (GDA_SQL_ANY_PART (ret));
 		ret->cond = cond;
-		cond->operator = op;
+		cond->operator_type = op;
 		cond->operands = g_slist_prepend (NULL, right);
 		GDA_SQL_ANY_PART (right)->parent = GDA_SQL_ANY_PART (cond);
 		cond->operands = g_slist_prepend (cond->operands, left);
@@ -185,7 +185,7 @@
 	ret = gda_sql_expr_new (NULL);
 	cond = gda_sql_operation_new (GDA_SQL_ANY_PART (ret));
 	ret->cond = cond;
-	cond->operator = op;
+	cond->operator_type = op;
 	cond->operands = g_slist_prepend (NULL, right);
 	GDA_SQL_ANY_PART (right)->parent = GDA_SQL_ANY_PART (cond);
 	cond->operands = g_slist_prepend (cond->operands, left);
@@ -200,7 +200,7 @@
 	ret = gda_sql_expr_new (NULL);
 	cond = gda_sql_operation_new (GDA_SQL_ANY_PART (ret));
 	ret->cond = cond;
-	cond->operator = op;
+	cond->operator_type = op;
 	cond->operands = g_slist_prepend (NULL, expr);
 	GDA_SQL_ANY_PART (expr)->parent = GDA_SQL_ANY_PART (cond);
 	return ret;
@@ -653,7 +653,7 @@
 		GdaSqlSelectJoin *join = (GdaSqlSelectJoin *) (last->data);
 		join->expr = C;
 		join->position = g_slist_length (L->targets) - 1;
-		join->using = U;
+		join->use = U;
 	}
 }
 
@@ -828,7 +828,7 @@
 						  C = gda_sql_expr_new (NULL);
 						  cond = gda_sql_operation_new (GDA_SQL_ANY_PART (C));
 						  C->cond = cond;
-						  cond->operator = GDA_SQL_OPERATOR_TYPE_BETWEEN;
+						  cond->operator_type = GDA_SQL_OPERATOR_TYPE_BETWEEN;
 						  cond->operands = g_slist_append (NULL, L);
 						  GDA_SQL_ANY_PART (L)->parent = GDA_SQL_ANY_PART (cond);
 						  cond->operands = g_slist_append (cond->operands, R);
@@ -842,7 +842,7 @@
 						      expr = gda_sql_expr_new (NULL);
 						      cond = gda_sql_operation_new (GDA_SQL_ANY_PART (expr));
 						      expr->cond = cond;
-						      cond->operator = GDA_SQL_OPERATOR_TYPE_BETWEEN;
+						      cond->operator_type = GDA_SQL_OPERATOR_TYPE_BETWEEN;
 						      cond->operands = g_slist_append (NULL, L);
 						      GDA_SQL_ANY_PART (L)->parent = GDA_SQL_ANY_PART (cond);
 						      cond->operands = g_slist_append (cond->operands, R);
@@ -853,7 +853,7 @@
 						      C = gda_sql_expr_new (NULL);
 						      cond = gda_sql_operation_new (GDA_SQL_ANY_PART (C));
 						      C->cond = cond;
-						      cond->operator = GDA_SQL_OPERATOR_TYPE_NOT;
+						      cond->operator_type = GDA_SQL_OPERATOR_TYPE_NOT;
 						      cond->operands = g_slist_prepend (NULL, expr);
 						      GDA_SQL_ANY_PART (expr)->parent = GDA_SQL_ANY_PART (cond);
 }
@@ -869,7 +869,7 @@
 					   E = gda_sql_expr_new (NULL);
 					   cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					   E->cond = cond;
-					   cond->operator = GDA_SQL_OPERATOR_TYPE_IN;
+					   cond->operator_type = GDA_SQL_OPERATOR_TYPE_IN;
 					   cond->operands = g_slist_prepend (L, R);
 					   for (list = cond->operands; list; list = list->next)
 						   GDA_SQL_ANY_PART (list->data)->parent = GDA_SQL_ANY_PART (cond);
@@ -879,7 +879,7 @@
 					    E = gda_sql_expr_new (NULL);
 					    cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					    E->cond = cond;
-					    cond->operator = GDA_SQL_OPERATOR_TYPE_IN;
+					    cond->operator_type = GDA_SQL_OPERATOR_TYPE_IN;
 					    
 					    expr = gda_sql_expr_new (GDA_SQL_ANY_PART (cond));
 					    gda_sql_expr_take_select (expr, S);
@@ -893,7 +893,7 @@
 					       expr = gda_sql_expr_new (NULL);
 					       cond = gda_sql_operation_new (GDA_SQL_ANY_PART (expr));
 					       expr->cond = cond;
-					       cond->operator = GDA_SQL_OPERATOR_TYPE_IN;
+					       cond->operator_type = GDA_SQL_OPERATOR_TYPE_IN;
 					       cond->operands = g_slist_prepend (L, R);
 					       for (list = cond->operands; list; list = list->next)
 						       GDA_SQL_ANY_PART (list->data)->parent = GDA_SQL_ANY_PART (cond);
@@ -901,7 +901,7 @@
 					       E = gda_sql_expr_new (NULL);
 					       cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 					       E->cond = cond;
-					       cond->operator = GDA_SQL_OPERATOR_TYPE_NOT;
+					       cond->operator_type = GDA_SQL_OPERATOR_TYPE_NOT;
 					       cond->operands = g_slist_prepend (NULL, expr);
 					       GDA_SQL_ANY_PART (expr)->parent = GDA_SQL_ANY_PART (cond);
 }
@@ -910,7 +910,7 @@
 						expr1 = gda_sql_expr_new (NULL);
 						cond = gda_sql_operation_new (GDA_SQL_ANY_PART (expr1));
 						expr1->cond = cond;
-						cond->operator = GDA_SQL_OPERATOR_TYPE_IN;
+						cond->operator_type = GDA_SQL_OPERATOR_TYPE_IN;
 						
 						expr2 = gda_sql_expr_new (NULL);
 						gda_sql_expr_take_select (expr2, S);
@@ -922,7 +922,7 @@
 						E = gda_sql_expr_new (NULL);
 						cond = gda_sql_operation_new (GDA_SQL_ANY_PART (E));
 						E->cond = cond;
-						cond->operator = GDA_SQL_OPERATOR_TYPE_NOT;
+						cond->operator_type = GDA_SQL_OPERATOR_TYPE_NOT;
 						cond->operands = g_slist_prepend (NULL, expr1);
 						GDA_SQL_ANY_PART (expr1)->parent = GDA_SQL_ANY_PART (cond);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]