[libgda] GdaSqlBuilder: Rename gda_sql_builder_add_field*() functions.

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [libgda] GdaSqlBuilder: Rename gda_sql_builder_add_field*() functions.
Date: Mon, 14 Jun 2010 13:21:17 +0000 (UTC)
commit a5afb55768ab565e3d2172457c0cfe080976750c
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Jun 14 12:33:02 2010 +0200

    GdaSqlBuilder: Rename gda_sql_builder_add_field*() functions.
    
    * libgda/gda-sql-builder.[h|c]:
    Rename gda_sql_builder_add_field() to
    gda_sql_builder_add_field_value() because that is what it does.
    Likewise, rename  gda_sql_builder_add_field_value() to
    gda_sql_builder_add_field_value_as_gvalue() and
    rename gda_sql_builder_add_field_id() to
    gda_sql_builder_add_field_value_id().
    providers/reuseable/mysql/gda-mysql-reuseable.c
    * providers/reuseable/postgres/gda-postgres-reuseable.c
    * providers/web/gda-web-recordset.c
    * samples/SqlBuilder/example.c
    * samples/SqlBuilder/example_cnc.c
    * tests/test-sql-builder.c
    * tools/browser/browser-connection.c
    * tools/browser/browser-favorites.c: Adapted.
    * libgda/libgda.symbols:
    * docs/C/libgda-sections.txt: Renamed them here too.

 doc/C/libgda-sections.txt                          |    5 +-
 libgda/gda-sql-builder.c                           |   27 +++++---
 libgda/gda-sql-builder.h                           |    7 +-
 libgda/libgda.symbols                              |    4 +-
 providers/reuseable/mysql/gda-mysql-reuseable.c    |    2 +-
 .../reuseable/postgres/gda-postgres-reuseable.c    |    2 +-
 providers/web/gda-web-recordset.c                  |    4 +-
 samples/SqlBuilder/example.c                       |   70 ++++++++++----------
 samples/SqlBuilder/example_cnc.c                   |   26 ++++----
 tests/test-sql-builder.c                           |   54 ++++++++--------
 tools/browser/browser-connection.c                 |   10 ++--
 tools/browser/browser-favorites.c                  |   62 +++++++++---------
 12 files changed, 138 insertions(+), 135 deletions(-)
---
diff --git a/doc/C/libgda-sections.txt b/doc/C/libgda-sections.txt
index 5b3792a..cb187fe 100644
--- a/doc/C/libgda-sections.txt
+++ b/doc/C/libgda-sections.txt
@@ -1673,9 +1673,9 @@ gda_sql_builder_get_statement
 gda_sql_builder_get_sql_statement
 <SUBSECTION>
 gda_sql_builder_set_table
-gda_sql_builder_add_field
 gda_sql_builder_add_field_value
-gda_sql_builder_add_field_id
+gda_sql_builder_add_field_value_as_gvalue
+gda_sql_builder_add_field_value_id
 gda_sql_builder_add_function
 gda_sql_builder_add_function_v
 <SUBSECTION>
@@ -1756,4 +1756,3 @@ GDA_IS_REPETITIVE_STATEMENT
 GDA_TYPE_REPETITIVE_STATEMENT
 gda_repetitive_statement_get_type
 </SECTION>
-
diff --git a/libgda/gda-sql-builder.c b/libgda/gda-sql-builder.c
index 6e21885..8a4dae8 100644
--- a/libgda/gda-sql-builder.c
+++ b/libgda/gda-sql-builder.c
@@ -511,11 +511,11 @@ gda_sql_builder_select_add_field (GdaSqlBuilder *builder, const gchar *field_nam
 
 	const guint field_id = gda_sql_builder_add_id (builder, tmp);
 	if (alias && *alias)
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					      field_id,
 					      gda_sql_builder_add_id (builder, alias));
 	else
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					      field_id,
 					      0);
 	if (table_name)
@@ -540,7 +540,7 @@ create_typed_value (GType type, va_list *ap)
 }
 
 /**
- * gda_sql_builder_add_field
+ * gda_sql_builder_add_field_value
  * @builder: a #GdaSqlBuilder object
  * @field_name: a field name
  * @type: the GType of the following argument
@@ -551,10 +551,12 @@ create_typed_value (GType type, va_list *ap)
  * Specifies that the field represented by @field_name will be set to the value identified
  * by @... of type @type.
  *
+ * This is a C convenience function. See also gda_sql_builder_add_field_value_as_gvalue().
+ *
  * Since: 4.2
  */
 void
-gda_sql_builder_add_field (GdaSqlBuilder *builder, const gchar *field_name, GType type, ...)
+gda_sql_builder_add_field_value (GdaSqlBuilder *builder, const gchar *field_name, GType type, ...)
 {
 	g_return_if_fail (GDA_IS_SQL_BUILDER (builder));
 	g_return_if_fail (builder->priv->main_stmt);
@@ -579,11 +581,11 @@ gda_sql_builder_add_field (GdaSqlBuilder *builder, const gchar *field_name, GTyp
 	id1 = gda_sql_builder_add_id (builder, field_name);
 	id2 = gda_sql_builder_add_expr_value (builder, NULL, value);
 	gda_value_free (value);
-	gda_sql_builder_add_field_id (builder, id1, id2);
+	gda_sql_builder_add_field_value_id (builder, id1, id2);
 }
 
 /**
- * gda_sql_builder_add_field_value
+ * gda_sql_builder_add_field_value_as_gvalue
  * @builder: a #GdaSqlBuilder object
  * @field_name: a field name
  * @value: value to set the field to, or %NULL or a GDA_TYPE_NULL value to represent an SQL NULL
@@ -596,7 +598,7 @@ gda_sql_builder_add_field (GdaSqlBuilder *builder, const gchar *field_name, GTyp
  * Since: 4.2
  */
 void
-gda_sql_builder_add_field_value (GdaSqlBuilder *builder, const gchar *field_name, const GValue *value)
+gda_sql_builder_add_field_value_as_gvalue (GdaSqlBuilder *builder, const gchar *field_name, const GValue *value)
 {
 	g_return_if_fail (GDA_IS_SQL_BUILDER (builder));
 	g_return_if_fail (builder->priv->main_stmt);
@@ -611,11 +613,11 @@ gda_sql_builder_add_field_value (GdaSqlBuilder *builder, const gchar *field_name
 	guint id1, id2;
 	id1 = gda_sql_builder_add_id (builder, field_name);
 	id2 = gda_sql_builder_add_expr_value (builder, NULL, value);
-	gda_sql_builder_add_field_id (builder, id1, id2);
+	gda_sql_builder_add_field_value_id (builder, id1, id2);
 }
 
 /**
- * gda_sql_builder_add_field_id
+ * gda_sql_builder_add_field_value_id
  * @builder: a #GdaSqlBuilder object
  * @field_id: the ID of the field's name or definition
  * @value_id: the ID of the value to set the field to, or %0
@@ -632,10 +634,13 @@ gda_sql_builder_add_field_value (GdaSqlBuilder *builder, const gchar *field_name
  *    If @field_id represents a sub SELECT (obtained using gda_sql_builder_add_sub_select()), then
  *    this method call defines the sub SELECT from which values to insert are taken.</para></listitem>
  * </itemizedlist>
+ *
+ * See also gda_sql_builder_add_field_value() and gda_sql_builder_add_field_value_as_gvalue().
+ *
  * Since: 4.2
  */
 void
-gda_sql_builder_add_field_id (GdaSqlBuilder *builder, guint field_id, guint value_id)
+gda_sql_builder_add_field_value_id (GdaSqlBuilder *builder, guint field_id, guint value_id)
 {
 	g_return_if_fail (GDA_IS_SQL_BUILDER (builder));
 	g_return_if_fail (builder->priv->main_stmt);
@@ -1075,7 +1080,7 @@ gda_sql_builder_select_add_target_id (GdaSqlBuilder *builder, guint table_id, co
 				idalias = TRUE;
 			else if (!alias && ! t->as)
 				idalias = TRUE;
-			
+
 			gchar *tmp;
 			tmp = gda_sql_expr_serialize (t->expr);
 			if (! strcmp (ser, tmp)) {
diff --git a/libgda/gda-sql-builder.h b/libgda/gda-sql-builder.h
index 086751c..78eec89 100644
--- a/libgda/gda-sql-builder.h
+++ b/libgda/gda-sql-builder.h
@@ -91,15 +91,14 @@ guint             gda_sql_builder_add_case_v (GdaSqlBuilder *builder, guint test
 
 
 /* General Statement API */
-void              gda_sql_builder_add_field (GdaSqlBuilder *builder, const gchar *field_name, GType type, ...);
-void              gda_sql_builder_add_field_value (GdaSqlBuilder *builder, const gchar *field_name,
+void              gda_sql_builder_add_field_value (GdaSqlBuilder *builder, const gchar *field_name, GType type, ...);
+void              gda_sql_builder_add_field_value_as_gvalue (GdaSqlBuilder *builder, const gchar *field_name,
 						   const GValue *value);
+void              gda_sql_builder_add_field_value_id (GdaSqlBuilder *builder, guint field_id, guint value_id);
 
 void              gda_sql_builder_set_table (GdaSqlBuilder *builder, const gchar *table_name);
 void              gda_sql_builder_set_where (GdaSqlBuilder *builder, guint cond_id);
 
-void              gda_sql_builder_add_field_id (GdaSqlBuilder *builder, guint field_id, guint value_id);
-
 /* SELECT Statement API */
 guint             gda_sql_builder_select_add_field (GdaSqlBuilder *builder, const gchar *field_name,
 						    const gchar *table_name, const gchar *alias);
diff --git a/libgda/libgda.symbols b/libgda/libgda.symbols
index 084b1d2..34159d1 100644
--- a/libgda/libgda.symbols
+++ b/libgda/libgda.symbols
@@ -579,9 +579,9 @@
 	gda_sql_builder_add_cond_v
 	gda_sql_builder_add_expr
 	gda_sql_builder_add_expr_value
-	gda_sql_builder_add_field
-	gda_sql_builder_add_field_id
 	gda_sql_builder_add_field_value
+	gda_sql_builder_add_field_value_id
+	gda_sql_builder_add_field_value_as_gvalue
 	gda_sql_builder_add_function
 	gda_sql_builder_add_function_v
 	gda_sql_builder_add_id
diff --git a/providers/reuseable/mysql/gda-mysql-reuseable.c b/providers/reuseable/mysql/gda-mysql-reuseable.c
index 8627815..3a5ef3b 100644
--- a/providers/reuseable/mysql/gda-mysql-reuseable.c
+++ b/providers/reuseable/mysql/gda-mysql-reuseable.c
@@ -159,7 +159,7 @@ _gda_mysql_compute_version (GdaConnection *cnc, GdaMysqlReuseable *rdata, GError
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
         const guint id_func = gda_sql_builder_add_function (b, "version", 0);
-        gda_sql_builder_add_field_id (b, id_func, 0);
+        gda_sql_builder_add_field_value_id (b, id_func, 0);
 	stmt = gda_sql_builder_get_statement (b, NULL);
 	g_object_unref (b);
 	g_assert (stmt);
diff --git a/providers/reuseable/postgres/gda-postgres-reuseable.c b/providers/reuseable/postgres/gda-postgres-reuseable.c
index 96e2f52..1fa1aa0 100644
--- a/providers/reuseable/postgres/gda-postgres-reuseable.c
+++ b/providers/reuseable/postgres/gda-postgres-reuseable.c
@@ -185,7 +185,7 @@ _gda_postgres_compute_version (GdaConnection *cnc, GdaPostgresReuseable *rdata,
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
         const guint id_func = gda_sql_builder_add_function (b, "version", 0);
-        gda_sql_builder_add_field_id (b, id_func, 0);
+        gda_sql_builder_add_field_value_id (b, id_func, 0);
 	stmt = gda_sql_builder_get_statement (b, NULL);
 	g_object_unref (b);
 	g_assert (stmt);
diff --git a/providers/web/gda-web-recordset.c b/providers/web/gda-web-recordset.c
index cd7313e..fa52a69 100644
--- a/providers/web/gda-web-recordset.c
+++ b/providers/web/gda-web-recordset.c
@@ -343,10 +343,10 @@ create_table (GdaWebRecordset *rs, GError **error)
 		g_string_append_printf (string, "%s %s", colname,
 					gda_g_type_to_string (gda_column_get_g_type (column)));
 
-		gda_sql_builder_add_field_id (ib, gda_sql_builder_add_id (ib, colname),
+		gda_sql_builder_add_field_value_id (ib, gda_sql_builder_add_id (ib, colname),
 					   gda_sql_builder_add_param (ib, colname,
 								      gda_column_get_g_type (column), TRUE));
-		gda_sql_builder_add_field_id (sb, gda_sql_builder_add_id (sb, colname), 0);
+		gda_sql_builder_add_field_value_id (sb, gda_sql_builder_add_id (sb, colname), 0);
 
 		g_free (colname);
 	}
diff --git a/samples/SqlBuilder/example.c b/samples/SqlBuilder/example.c
index 7740556..15fbd7e 100644
--- a/samples/SqlBuilder/example.c
+++ b/samples/SqlBuilder/example.c
@@ -14,13 +14,13 @@ main (int argc, char *argv[])
 
 	gda_sql_builder_set_table (b, "customers");
 
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "e"),
 				   gda_sql_builder_add_param (b, "p1", G_TYPE_STRING, FALSE));
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "f"),
 				   gda_sql_builder_add_expr (b, NULL, G_TYPE_INT, 15));
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "g"),
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "g"),
 				   gda_sql_builder_add_expr (b, NULL, G_TYPE_STRING, "joe"));
 	
 	render_as_sql (b);
@@ -31,7 +31,7 @@ main (int argc, char *argv[])
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_UPDATE);
 
 	gda_sql_builder_set_table (b, "products");
-	gda_sql_builder_add_field (b, "ref", G_TYPE_STRING, "A0E'FESP");
+	gda_sql_builder_add_field_value (b, "ref", G_TYPE_STRING, "A0E'FESP");
 	guint id_field = gda_sql_builder_add_id (b, "id");
 	guint id_value = gda_sql_builder_add_expr (b, NULL, G_TYPE_INT, 14);
 	guint id_cond = gda_sql_builder_add_cond (b, GDA_SQL_OPERATOR_TYPE_EQ, id_field, id_value, 0);
@@ -74,9 +74,9 @@ main (int argc, char *argv[])
 					   NULL);
 	guint id_join = gda_sql_builder_select_join_targets (b, id_target1, id_target2, GDA_SQL_SELECT_JOIN_INNER, 0);
 
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "c.date"), 0); /* DATE is an SQL reserved keyword */
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "name"),
 				   gda_sql_builder_add_id (b, "person"));
 
@@ -98,7 +98,7 @@ main (int argc, char *argv[])
 				      gda_sql_builder_add_expr (b, NULL, G_TYPE_INT, 5),
 				      gda_sql_builder_add_expr (b, NULL, G_TYPE_STRING, "Joe"),
 				      0);
-	gda_sql_builder_add_field_id (b, id_function_myfunc, 0);
+	gda_sql_builder_add_field_value_id (b, id_function_myfunc, 0);
 	render_as_sql (b);
 
 	/* reuse the same GdaSqlBuilder object to have:
@@ -108,7 +108,7 @@ main (int argc, char *argv[])
 
 	guint args[] = {id_function_myfunc, id_b, id_b_value};
 	guint id_function_max = gda_sql_builder_add_function_v (b, "MAX", args, 3);
-	gda_sql_builder_add_field_id (b, id_function_max, 0);
+	gda_sql_builder_add_field_value_id (b, id_function_max, 0);
 
 	render_as_sql (b);
 	g_object_unref (b);
@@ -117,7 +117,7 @@ main (int argc, char *argv[])
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_UPDATE);
 
 	gda_sql_builder_set_table (b, "select");
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "date"),
 				   gda_sql_builder_add_expr (b, NULL, G_TYPE_STRING, "2009-05-27"));
 	id_field = gda_sql_builder_add_id (b, "id");
@@ -141,14 +141,14 @@ main (int argc, char *argv[])
 				      gda_sql_builder_add_expr (b, NULL, G_TYPE_INT, 5),
 				      gda_sql_builder_add_expr (b, NULL, G_TYPE_STRING, "Joe"),
 				      0);
-	gda_sql_builder_add_field_id (b, id_function, 0);
+	gda_sql_builder_add_field_value_id (b, id_function, 0);
 	render_as_sql (b);
 	g_object_unref (b);
 
 	/* Subselect: SELECT name FROM master WHERE id IN (SELECT id FROM subdata) */
 	GdaSqlStatement *sub;
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "id"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "id"), 0);
 	gda_sql_builder_select_add_target_id (b,
 					   gda_sql_builder_add_id (b, "subdata"),
 					   NULL);
@@ -156,7 +156,7 @@ main (int argc, char *argv[])
 	g_object_unref (b);
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "name"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "name"), 0);
 	gda_sql_builder_select_add_target_id (b,
 					   gda_sql_builder_add_id (b, "master"),
 					   NULL);
@@ -172,7 +172,7 @@ main (int argc, char *argv[])
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
 	gda_sql_builder_select_add_target_id (b,
 					   gda_sql_builder_add_id (b, "documents"), "d");
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				      gda_sql_builder_add_function (b, "MAX",
 								    gda_sql_builder_add_id (b, "ts"),
 								    0), 0);
@@ -186,9 +186,9 @@ main (int argc, char *argv[])
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
 	gda_sql_builder_select_add_target_id (b,
 					   gda_sql_builder_add_id (b, "topics"), "t");
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "id"), 0);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "name"), 0);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_sub_select (b, sub), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "id"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "name"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_sub_select (b, sub), 0);
 	gda_sql_statement_free (sub);
 
 	render_as_sql (b);
@@ -196,9 +196,9 @@ main (int argc, char *argv[])
 	
 	/* Subselect in INSERT: INSERT INTO customers (e, f, g) SELECT id, name, location FROM subdate */
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "id"), 0);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "name"), 0);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "location"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "id"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "name"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "location"), 0);
 	gda_sql_builder_select_add_target_id (b,
 					   gda_sql_builder_add_id (b, "subdate"),
 					   NULL);
@@ -208,10 +208,10 @@ main (int argc, char *argv[])
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_INSERT);
 
 	gda_sql_builder_set_table (b, "customers");
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "e"), 0);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "f"), 0);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "g"), 0);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_sub_select (b, sub), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "e"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "f"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "g"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_sub_select (b, sub), 0);
 	gda_sql_statement_free (sub);
 	
 	render_as_sql (b);
@@ -221,8 +221,8 @@ main (int argc, char *argv[])
 	/* compound: SELECT id, name FROM subdata1 UNION SELECT ident, lastname FROM subdata2 */
 	GdaSqlStatement *sub1, *sub2;
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "id"), 0);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "name"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "id"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "name"), 0);
 	gda_sql_builder_select_add_target_id (b,
 					   gda_sql_builder_add_id (b, "subdata1"),
 					   NULL);
@@ -230,8 +230,8 @@ main (int argc, char *argv[])
 	g_object_unref (b);
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "ident"), 0);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "lastname"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "ident"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "lastname"), 0);
 	gda_sql_builder_select_add_target_id (b,
 					   gda_sql_builder_add_id (b, "subdata2"),
 					   NULL);
@@ -257,7 +257,7 @@ main (int argc, char *argv[])
 						  gda_sql_builder_add_expr (b, NULL, G_TYPE_INT, 1),
 						  id_cond, gda_sql_builder_add_expr (b, NULL, G_TYPE_INT, 2),
 						  0);
-	gda_sql_builder_add_field_id (b, id_case, 0);
+	gda_sql_builder_add_field_value_id (b, id_case, 0);
 	gda_sql_builder_select_add_target_id (b,
 					   gda_sql_builder_add_id (b, "data"),
 					   NULL);
@@ -276,7 +276,7 @@ main (int argc, char *argv[])
 					    gda_sql_builder_add_expr (b, NULL, G_TYPE_STRING, "Charlie"),
 					    gda_sql_builder_add_expr (b, NULL, G_TYPE_INT, 3),
 					    0);
-	gda_sql_builder_add_field_id (b, id_case, 0);
+	gda_sql_builder_add_field_value_id (b, id_case, 0);
 	gda_sql_builder_select_add_target_id (b,
 					   gda_sql_builder_add_id (b, "data"),
 					   NULL);
@@ -303,8 +303,8 @@ main (int argc, char *argv[])
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_INSERT);
 
 	gda_sql_builder_set_table (b, "customers");
-	gda_sql_builder_add_field (b, "f", G_TYPE_INT, 15);
-	gda_sql_builder_add_field (b, "g", G_TYPE_STRING, "joe");
+	gda_sql_builder_add_field_value (b, "f", G_TYPE_INT, 15);
+	gda_sql_builder_add_field_value (b, "g", G_TYPE_STRING, "joe");
 	
 	render_as_sql (b);
 	g_object_unref (b);
@@ -329,7 +329,7 @@ main (int argc, char *argv[])
 	g_object_unref (b);
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "id"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "id"), 0);
 	gda_sql_builder_select_add_target_id (b,
 					      gda_sql_builder_add_id (b, "mytable"),
 					      NULL);
@@ -347,8 +347,8 @@ main (int argc, char *argv[])
 
 	/* Subselect: SELECT name FROM (SELECT id FROM subdata) as sub */
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "id"), 0);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "name"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "id"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "name"), 0);
 	gda_sql_builder_select_add_target_id (b,
 					      gda_sql_builder_add_id (b, "subdata"),
 					      NULL);
@@ -356,7 +356,7 @@ main (int argc, char *argv[])
 	g_object_unref (b);
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "name"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "name"), 0);
 	gda_sql_builder_select_add_target_id (b,
 					      gda_sql_builder_add_sub_select (b, sub), "sub");
 	gda_sql_statement_free (sub);
diff --git a/samples/SqlBuilder/example_cnc.c b/samples/SqlBuilder/example_cnc.c
index e6e4b00..7dd61a6 100644
--- a/samples/SqlBuilder/example_cnc.c
+++ b/samples/SqlBuilder/example_cnc.c
@@ -14,13 +14,13 @@ main (int argc, char *argv[])
 
 	gda_sql_builder_set_table (b, "customers");
 
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "e"),
 				   gda_sql_builder_add_param (b, "p1", G_TYPE_STRING, FALSE));
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "f"),
 				   gda_sql_builder_add_expr (b, NULL, G_TYPE_INT, 15));
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "g"),
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "g"),
 				   gda_sql_builder_add_expr (b, NULL, G_TYPE_STRING, "joe"));
 	
 	render_as_sql (b);
@@ -31,7 +31,7 @@ main (int argc, char *argv[])
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_UPDATE);
 
 	gda_sql_builder_set_table (b, "products");
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "ref"),
 				   gda_sql_builder_add_expr (b, NULL, G_TYPE_STRING, "A0E'FESP"));
 	guint id_field = gda_sql_builder_add_id (b, "id");
@@ -76,9 +76,9 @@ main (int argc, char *argv[])
 					   NULL);
 	guint id_join = gda_sql_builder_select_join_targets (b, id_target1, id_target2, GDA_SQL_SELECT_JOIN_INNER, 0);
 
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "c.date"), 0); /* DATE is an SQL reserved keyword */
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "name"),
 				   gda_sql_builder_add_id (b, "person"));
 
@@ -100,7 +100,7 @@ main (int argc, char *argv[])
 				      gda_sql_builder_add_expr (b, NULL, G_TYPE_INT, 5),
 				      gda_sql_builder_add_expr (b, NULL, G_TYPE_STRING, "Joe"),
 				      0);
-	gda_sql_builder_add_field_id (b, id_function_myfunc, 0);
+	gda_sql_builder_add_field_value_id (b, id_function_myfunc, 0);
 	render_as_sql (b);
 
 	/* reuse the same GdaSqlBuilder object to have:
@@ -110,7 +110,7 @@ main (int argc, char *argv[])
 
 	guint args[] = {id_function_myfunc, id_b, id_b_value};
 	guint id_function_max = gda_sql_builder_add_function_v (b, "MAX", args, 3);
-	gda_sql_builder_add_field_id (b, id_function_max, 0);
+	gda_sql_builder_add_field_value_id (b, id_function_max, 0);
 
 	render_as_sql (b);
 	g_object_unref (b);
@@ -119,7 +119,7 @@ main (int argc, char *argv[])
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_UPDATE);
 
 	gda_sql_builder_set_table (b, "select");
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "date"),
 				   gda_sql_builder_add_expr (b, NULL, G_TYPE_STRING, "2009-05-27"));
 	id_field = gda_sql_builder_add_id (b, "id");
@@ -143,7 +143,7 @@ main (int argc, char *argv[])
 				      gda_sql_builder_add_expr (b, NULL, G_TYPE_INT, 5),
 				      gda_sql_builder_add_expr (b, NULL, G_TYPE_STRING, "Joe"),
 				      0);
-	gda_sql_builder_add_field_id (b, id_function, 0);
+	gda_sql_builder_add_field_value_id (b, id_function, 0);
 	render_as_sql (b);
 	g_object_unref (b);
 
@@ -167,8 +167,8 @@ main (int argc, char *argv[])
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_INSERT);
 
 	gda_sql_builder_set_table (b, "customers");
-	gda_sql_builder_add_field (b, "f", G_TYPE_INT, 15);
-	gda_sql_builder_add_field (b, "g", G_TYPE_STRING, "joe");
+	gda_sql_builder_add_field_value (b, "f", G_TYPE_INT, 15);
+	gda_sql_builder_add_field_value (b, "g", G_TYPE_STRING, "joe");
 	
 	render_as_sql (b);
 	g_object_unref (b);
@@ -193,7 +193,7 @@ main (int argc, char *argv[])
 	g_object_unref (b);
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "id"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "id"), 0);
 	gda_sql_builder_select_add_target_id (b,
 					      gda_sql_builder_add_id (b, "mytable"),
 					      NULL);
diff --git a/tests/test-sql-builder.c b/tests/test-sql-builder.c
index 3c849e3..5ae8b21 100644
--- a/tests/test-sql-builder.c
+++ b/tests/test-sql-builder.c
@@ -139,7 +139,7 @@ build0 (void)
 	GdaSqlStatement *stmt;
 
 	builder = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (builder,
+	gda_sql_builder_add_field_value_id (builder,
 				   gda_sql_builder_add_id (builder, "*"), 0);
 	gda_sql_builder_select_add_target_id (builder,
 					   gda_sql_builder_add_id (builder, "mytable"), NULL);
@@ -164,13 +164,13 @@ build1 (void)
 	builder = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
 	gda_sql_builder_select_add_target_id (builder,
 					   gda_sql_builder_add_id (builder, "mytable"), NULL);
-	gda_sql_builder_add_field_id (builder,
+	gda_sql_builder_add_field_value_id (builder,
 				   gda_sql_builder_add_id (builder, "contents"), 0);
-	gda_sql_builder_add_field_id (builder,
+	gda_sql_builder_add_field_value_id (builder,
 				   gda_sql_builder_add_id (builder, "descr"), 0);
-	gda_sql_builder_add_field_id (builder,
+	gda_sql_builder_add_field_value_id (builder,
 				   gda_sql_builder_add_id (builder, "rank"), 0);
-	gda_sql_builder_add_field_id (builder,
+	gda_sql_builder_add_field_value_id (builder,
 				   gda_sql_builder_add_id (builder, "name"), 0);
 	guint id_cond1 = gda_sql_builder_add_cond (builder, GDA_SQL_OPERATOR_TYPE_EQ,
 						   gda_sql_builder_add_id (builder, "session"),
@@ -208,19 +208,19 @@ build2 (void)
 	builder = gda_sql_builder_new (GDA_SQL_STATEMENT_INSERT);
 	gda_sql_builder_set_table (builder, "mytable");
 
-	gda_sql_builder_add_field_id (builder,
+	gda_sql_builder_add_field_value_id (builder,
 				   gda_sql_builder_add_id (builder, "session"),
 				   gda_sql_builder_add_param (builder, "session", G_TYPE_INT, FALSE));
-	gda_sql_builder_add_field_id (builder,
+	gda_sql_builder_add_field_value_id (builder,
 				   gda_sql_builder_add_id (builder, "type"),
 				   gda_sql_builder_add_param (builder, "type", G_TYPE_INT, FALSE));
-	gda_sql_builder_add_field_id (builder,
+	gda_sql_builder_add_field_value_id (builder,
 				   gda_sql_builder_add_id (builder, "name"),
 				   gda_sql_builder_add_param (builder, "name", G_TYPE_STRING, TRUE));
-	gda_sql_builder_add_field_id (builder,
+	gda_sql_builder_add_field_value_id (builder,
 				   gda_sql_builder_add_id (builder, "contents"),
 				   gda_sql_builder_add_param (builder, "contents", G_TYPE_STRING, FALSE));
-	gda_sql_builder_add_field_id (builder,
+	gda_sql_builder_add_field_value_id (builder,
 				   gda_sql_builder_add_id (builder, "descr"),
 				   gda_sql_builder_add_param (builder, "descr", G_TYPE_STRING, TRUE));
 
@@ -242,13 +242,13 @@ build3 (void)
 	builder = gda_sql_builder_new (GDA_SQL_STATEMENT_UPDATE);
 	gda_sql_builder_set_table (builder, "mytable");
 
-	gda_sql_builder_add_field_id (builder,
+	gda_sql_builder_add_field_value_id (builder,
 				   gda_sql_builder_add_id (builder, "name"),
 				   gda_sql_builder_add_param (builder, "name", G_TYPE_STRING, TRUE));
-	gda_sql_builder_add_field_id (builder,
+	gda_sql_builder_add_field_value_id (builder,
 				   gda_sql_builder_add_id (builder, "contents"),
 				   gda_sql_builder_add_param (builder, "contents", G_TYPE_STRING, FALSE));
-	gda_sql_builder_add_field_id (builder,
+	gda_sql_builder_add_field_value_id (builder,
 				   gda_sql_builder_add_id (builder, "descr"),
 				   gda_sql_builder_add_param (builder, "descr", G_TYPE_STRING, TRUE));
 
@@ -276,7 +276,7 @@ build4 (void)
 	guint t1, t2;
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "fav.*"), 0);
 	t1 = gda_sql_builder_select_add_target_id (b,
 						gda_sql_builder_add_id (b, "mytable"),
@@ -317,7 +317,7 @@ build5 (void)
 	GdaSqlStatement *stmt;
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "id"), 0);
 	gda_sql_builder_select_add_target_id (b,
 					   gda_sql_builder_add_id (b, "mytable"),
@@ -348,8 +348,8 @@ build6 (void)
 	GdaSqlStatement *stmt;
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "fav_id"), 0);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "rank"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "fav_id"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "rank"), 0);
 
 	gda_sql_builder_select_add_target_id (b,
 					   gda_sql_builder_add_id (b, "mytable"),
@@ -379,7 +379,7 @@ build7 (void)
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_UPDATE);
 	gda_sql_builder_set_table (b, "mytable");
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "rank"),
 				   gda_sql_builder_add_param (b, "newrank", G_TYPE_INT, FALSE));
 	guint id_cond1 = gda_sql_builder_add_cond (b, GDA_SQL_OPERATOR_TYPE_EQ,
@@ -435,9 +435,9 @@ build9 (void)
 	builder = gda_sql_builder_new (GDA_SQL_STATEMENT_INSERT);
 	gda_sql_builder_set_table (builder, "mytable");
 
-	gda_sql_builder_add_field_value (builder, "session", NULL);
+	gda_sql_builder_add_field_value_as_gvalue (builder, "session", NULL);
 	value = gda_value_new_null ();
-	gda_sql_builder_add_field_value (builder, "name", value);
+	gda_sql_builder_add_field_value_as_gvalue (builder, "name", value);
 	gda_value_free (value);
 
 	stmt = gda_sql_statement_copy (gda_sql_builder_get_sql_statement (builder));
@@ -456,8 +456,8 @@ build10 (void)
 	GdaSqlStatement *stmt;
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "fav_id"), 0);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "rank"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "fav_id"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "rank"), 0);
 
 	gda_sql_builder_select_add_target_id (b,
 					   gda_sql_builder_add_id (b, "mytable"),
@@ -487,8 +487,8 @@ build11 (void)
 	GdaSqlStatement *stmt;
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "fav_id"), 0);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "rank"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "fav_id"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "rank"), 0);
 
 	gda_sql_builder_select_add_target_id (b,
 					   gda_sql_builder_add_id (b, "mytable"),
@@ -522,10 +522,10 @@ build12 (void)
 	GdaSqlStatement *stmt;
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "store_name"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "store_name"), 0);
 	const guint id_func = gda_sql_builder_add_function (b, "sum",
 				      gda_sql_builder_add_id (b, "sales"), 0);
-	gda_sql_builder_add_field_id (b, id_func, 0);
+	gda_sql_builder_add_field_value_id (b, id_func, 0);
 
 	gda_sql_builder_select_add_target_id (b,
 					   gda_sql_builder_add_id (b, "stores"),
@@ -563,7 +563,7 @@ builder_test_target_id (void)
 	gboolean allok = TRUE;
 
 	builder = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (builder,
+	gda_sql_builder_add_field_value_id (builder,
 				      gda_sql_builder_add_id (builder, "*"), 0);
 	/* same target with aliases */
 	id1 = gda_sql_builder_select_add_target_id (builder,
diff --git a/tools/browser/browser-connection.c b/tools/browser/browser-connection.c
index 62e43a3..064b11f 100644
--- a/tools/browser/browser-connection.c
+++ b/tools/browser/browser-connection.c
@@ -1249,19 +1249,19 @@ browser_connection_set_table_column_attribute (BrowserConnection *bcnc,
 	if (value) {
 		builder = gda_sql_builder_new (GDA_SQL_STATEMENT_INSERT);
 		gda_sql_builder_set_table (builder, DBTABLE_PREFERENCES_TABLE_NAME);
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					      gda_sql_builder_add_id (builder, "table_schema"),
 					      gda_sql_builder_add_param (builder, "schema", G_TYPE_STRING, FALSE));
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					      gda_sql_builder_add_id (builder, "table_name"),
 					      gda_sql_builder_add_param (builder, "name", G_TYPE_STRING, FALSE));
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					      gda_sql_builder_add_id (builder, "table_column"),
 					      gda_sql_builder_add_param (builder, "column", G_TYPE_STRING, FALSE));
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					      gda_sql_builder_add_id (builder, "att_name"),
 					      gda_sql_builder_add_param (builder, "attname", G_TYPE_STRING, FALSE));
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					      gda_sql_builder_add_id (builder, "att_value"),
 					      gda_sql_builder_add_param (builder, "attvalue", G_TYPE_STRING, FALSE));
 		stmt = gda_sql_builder_get_statement (builder, error);
diff --git a/tools/browser/browser-favorites.c b/tools/browser/browser-favorites.c
index 26cd560..c0062b5 100644
--- a/tools/browser/browser-favorites.c
+++ b/tools/browser/browser-favorites.c
@@ -248,7 +248,7 @@ find_favorite_position (BrowserFavorites *bfav, gint fav_id, gint order_key)
 	g_return_val_if_fail (fav_id >= 0, -1);
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "rank"), 0);
 	gda_sql_builder_select_add_target (b, FAVORDER_TABLE_NAME, NULL);
 	gda_sql_builder_set_where (b,
@@ -311,15 +311,15 @@ find_favorite (BrowserFavorites *bfav, guint session_id, gint id, const gchar *c
 	g_return_val_if_fail ((id >= 0) || contents, -1);
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "id"), 0);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "type"), 0);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "name"), 0);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "descr"), 0);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "contents"), 0);
 	gda_sql_builder_select_add_target (b, FAVORITES_TABLE_NAME, NULL);
 
@@ -399,7 +399,7 @@ favorites_reorder (BrowserFavorites *bfav, gint order_key, gint id, gint new_pos
 	g_assert (order_key >= 0);
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b, gda_sql_builder_add_id (b, "fav_id"), 0);
+	gda_sql_builder_add_field_value_id (b, gda_sql_builder_add_id (b, "fav_id"), 0);
 
 	gda_sql_builder_select_add_target (b, FAVORDER_TABLE_NAME, NULL);
 	
@@ -433,7 +433,7 @@ favorites_reorder (BrowserFavorites *bfav, gint order_key, gint id, gint new_pos
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_UPDATE);
 	gda_sql_builder_set_table (b, FAVORDER_TABLE_NAME);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "rank"),
 				   gda_sql_builder_add_param (b, "rank", G_TYPE_INT, FALSE));
 	const guint id_cond1 = gda_sql_builder_add_cond (b, GDA_SQL_OPERATOR_TYPE_EQ,
@@ -559,19 +559,19 @@ browser_favorites_add (BrowserFavorites *bfav, guint session_id,
 		builder = gda_sql_builder_new (GDA_SQL_STATEMENT_INSERT);
 		gda_sql_builder_set_table (builder, FAVORITES_TABLE_NAME);
 
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					   gda_sql_builder_add_id (builder, "session"),
 					   gda_sql_builder_add_param (builder, "session", G_TYPE_INT, FALSE));
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					   gda_sql_builder_add_id (builder, "type"),
 					   gda_sql_builder_add_param (builder, "type", G_TYPE_INT, FALSE));
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					   gda_sql_builder_add_id (builder, "name"),
 					   gda_sql_builder_add_param (builder, "name", G_TYPE_STRING, TRUE));
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					   gda_sql_builder_add_id (builder, "contents"),
 					   gda_sql_builder_add_param (builder, "contents", G_TYPE_STRING, FALSE));
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					   gda_sql_builder_add_id (builder, "descr"),
 					   gda_sql_builder_add_param (builder, "descr", G_TYPE_STRING, TRUE));
 		stmt = gda_sql_builder_get_statement (builder, error);
@@ -596,13 +596,13 @@ browser_favorites_add (BrowserFavorites *bfav, guint session_id,
 		builder = gda_sql_builder_new (GDA_SQL_STATEMENT_UPDATE);
 		gda_sql_builder_set_table (builder, FAVORITES_TABLE_NAME);
 
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					   gda_sql_builder_add_id (builder, "name"),
 					   gda_sql_builder_add_param (builder, "name", G_TYPE_STRING, TRUE));
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					   gda_sql_builder_add_id (builder, "contents"),
 					   gda_sql_builder_add_param (builder, "contents", G_TYPE_STRING, FALSE));
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					   gda_sql_builder_add_id (builder, "descr"),
 					   gda_sql_builder_add_param (builder, "descr", G_TYPE_STRING, TRUE));
 
@@ -613,11 +613,11 @@ browser_favorites_add (BrowserFavorites *bfav, guint session_id,
 								 0));
 		if (fav->id == favid) {
 			/* alter name and description only if fav->id was OK */
-			gda_sql_builder_add_field_id (builder,
+			gda_sql_builder_add_field_value_id (builder,
 						   gda_sql_builder_add_id (builder, "name"),
 						   gda_sql_builder_add_param (builder, "name", G_TYPE_STRING,
 									  TRUE));
-			gda_sql_builder_add_field_id (builder,
+			gda_sql_builder_add_field_value_id (builder,
 						   gda_sql_builder_add_id (builder, "descr"),
 						   gda_sql_builder_add_param (builder, "descr", G_TYPE_STRING,
 									  TRUE));
@@ -673,13 +673,13 @@ browser_favorites_add (BrowserFavorites *bfav, guint session_id,
 
 		builder = gda_sql_builder_new (GDA_SQL_STATEMENT_INSERT);
 		gda_sql_builder_set_table (builder, FAVORDER_TABLE_NAME);
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					   gda_sql_builder_add_id (builder, "fav_id"),
 					   gda_sql_builder_add_param (builder, "id", G_TYPE_INT, FALSE));
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					   gda_sql_builder_add_id (builder, "rank"),
 					   gda_sql_builder_add_param (builder, "rank", G_TYPE_INT, FALSE));
-		gda_sql_builder_add_field_id (builder,
+		gda_sql_builder_add_field_value_id (builder,
 					   gda_sql_builder_add_id (builder, "order_key"),
 					   gda_sql_builder_add_param (builder, "orderkey", G_TYPE_STRING, TRUE));
 		stmt = gda_sql_builder_get_statement (builder, error);
@@ -791,15 +791,15 @@ browser_favorites_list (BrowserFavorites *bfav, guint session_id, BrowserFavorit
 		return NULL;
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "fav.contents"), 0);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "fav.descr"), 0);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "fav.name"), 0);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "fav.type"), 0);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "fav.id"), 0);
 
 	t1 = gda_sql_builder_select_add_target (b, FAVORITES_TABLE_NAME, "fav");
@@ -1085,15 +1085,15 @@ browser_favorites_get (BrowserFavorites *bfav, gint fav_id,
 	memset (out_fav, 0, sizeof (BrowserFavoritesAttributes));
 
 	b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "id"), 0);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "type"), 0);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "name"), 0);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "descr"), 0);
-	gda_sql_builder_add_field_id (b,
+	gda_sql_builder_add_field_value_id (b,
 				   gda_sql_builder_add_id (b, "contents"), 0);
 	gda_sql_builder_select_add_target (b, FAVORITES_TABLE_NAME, NULL);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]