[libgda] GdaSqlBuilder: improved API names
- From: Vivien Malerba <vivien src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libgda] GdaSqlBuilder: improved API names
- Date: Thu, 1 Oct 2009 18:22:58 +0000 (UTC)
commit 8ce93643b40a09b386582f107dba7ea961194ac5
Author: Vivien Malerba <malerba gnome-db org>
Date: Thu Oct 1 19:58:05 2009 +0200
GdaSqlBuilder: improved API names
gda_sql_builder_ident => gda_sql_builder_add_id
gda_sql_builder_expr => gda_sql_builder_add_expr
gda_sql_builder_cond => gda_sql_builder_add_cond
gda_sql_builder_param => gda_sql_builder_add_param
doc/C/libgda-sections.txt | 12 +-
doc/C/tmpl/gda-sql-builder.sgml | 26 ++--
libgda/gda-sql-builder.c | 34 +++---
libgda/gda-sql-builder.h | 12 +-
samples/SqlBuilder/example.c | 54 +++++-----
tests/test-sql-builder.c | 172 ++++++++++++++--------------
tools/browser/browser-favorites.c | 226 ++++++++++++++++++------------------
7 files changed, 268 insertions(+), 268 deletions(-)
---
diff --git a/doc/C/libgda-sections.txt b/doc/C/libgda-sections.txt
index c6204af..2e335c2 100644
--- a/doc/C/libgda-sections.txt
+++ b/doc/C/libgda-sections.txt
@@ -1665,13 +1665,13 @@ gda_sql_builder_add_field
gda_sql_builder_add_function
gda_sql_builder_add_function_v
<SUBSECTION>
-gda_sql_builder_ident
-gda_sql_builder_expr
-gda_sql_builder_expr_value
-gda_sql_builder_param
+gda_sql_builder_add_id
+gda_sql_builder_add_expr
+gda_sql_builder_add_expr_value
+gda_sql_builder_add_param
<SUBSECTION>
-gda_sql_builder_cond
-gda_sql_builder_cond_v
+gda_sql_builder_add_cond
+gda_sql_builder_add_cond_v
gda_sql_builder_set_where
<SUBSECTION>
gda_sql_builder_select_add_target
diff --git a/doc/C/tmpl/gda-sql-builder.sgml b/doc/C/tmpl/gda-sql-builder.sgml
index 7eebede..ef5a296 100644
--- a/doc/C/tmpl/gda-sql-builder.sgml
+++ b/doc/C/tmpl/gda-sql-builder.sgml
@@ -25,15 +25,15 @@ Factory object for statements
The following example builds the equivalent of the <![CDATA["name='joe' AND age >= ##ageparam::int"]]> expression:
<programlisting><![CDATA[
GdaSqlBuilder *b=...
-gda_sql_builder_ident (b, 1, "name"); // build the "name" SQL identifier with requested ID=1
-gda_sql_builder_expr (b, 2, NULL, G_TYPE_STRING, "joe"); // 'joe' expression, requested ID=2
-gda_sql_builder_cond2 (b, 3, GDA_SQL_OPERATOR_TYPE_EQ, 1, 2); // "name='joe'", requested ID=3
+gda_sql_builder_add_id (b, 1, "name"); // build the "name" SQL identifier with requested ID=1
+gda_sql_builder_add_expr (b, 2, NULL, G_TYPE_STRING, "joe"); // 'joe' expression, requested ID=2
+gda_sql_builder_add_cond2 (b, 3, GDA_SQL_OPERATOR_TYPE_EQ, 1, 2); // "name='joe'", requested ID=3
-gda_sql_builder_cond2 (b, 4, GDA_SQL_OPERATOR_TYPE_GT, // requested ID=4
- gda_sql_builder_ident (b, 0, "age"), // build the "age" SQL identifier, no specific ID
- gda_sql_builder_param (b, 0, "ageparam", G_TYPE_INT, FALSE) // parameter, no specific ID
+gda_sql_builder_add_cond2 (b, 4, GDA_SQL_OPERATOR_TYPE_GT, // requested ID=4
+ gda_sql_builder_add_id (b, 0, "age"), // build the "age" SQL identifier, no specific ID
+ gda_sql_builder_add_param (b, 0, "ageparam", G_TYPE_INT, FALSE) // parameter, no specific ID
);
-gda_sql_builder_cond2 (b, 5, GDA_SQL_OPERATOR_TYPE_AND, 3, 4); // whole expression, requested ID=5
+gda_sql_builder_add_cond2 (b, 5, GDA_SQL_OPERATOR_TYPE_AND, 3, 4); // whole expression, requested ID=5
]]></programlisting>
</para>
@@ -129,7 +129,7 @@ gda_sql_builder_cond2 (b, 5, GDA_SQL_OPERATOR_TYPE_AND, 3, 4); // whole expressi
@Returns:
-<!-- ##### FUNCTION gda_sql_builder_ident ##### -->
+<!-- ##### FUNCTION gda_sql_builder_add_id ##### -->
<para>
</para>
@@ -140,7 +140,7 @@ gda_sql_builder_cond2 (b, 5, GDA_SQL_OPERATOR_TYPE_AND, 3, 4); // whole expressi
@Returns:
-<!-- ##### FUNCTION gda_sql_builder_expr ##### -->
+<!-- ##### FUNCTION gda_sql_builder_add_expr ##### -->
<para>
</para>
@@ -153,7 +153,7 @@ gda_sql_builder_cond2 (b, 5, GDA_SQL_OPERATOR_TYPE_AND, 3, 4); // whole expressi
@Returns:
-<!-- ##### FUNCTION gda_sql_builder_expr_value ##### -->
+<!-- ##### FUNCTION gda_sql_builder_add_expr_value ##### -->
<para>
</para>
@@ -165,7 +165,7 @@ gda_sql_builder_cond2 (b, 5, GDA_SQL_OPERATOR_TYPE_AND, 3, 4); // whole expressi
@Returns:
-<!-- ##### FUNCTION gda_sql_builder_param ##### -->
+<!-- ##### FUNCTION gda_sql_builder_add_param ##### -->
<para>
</para>
@@ -178,7 +178,7 @@ gda_sql_builder_cond2 (b, 5, GDA_SQL_OPERATOR_TYPE_AND, 3, 4); // whole expressi
@Returns:
-<!-- ##### FUNCTION gda_sql_builder_cond ##### -->
+<!-- ##### FUNCTION gda_sql_builder_add_cond ##### -->
<para>
</para>
@@ -192,7 +192,7 @@ gda_sql_builder_cond2 (b, 5, GDA_SQL_OPERATOR_TYPE_AND, 3, 4); // whole expressi
@Returns:
-<!-- ##### FUNCTION gda_sql_builder_cond_v ##### -->
+<!-- ##### FUNCTION gda_sql_builder_add_cond_v ##### -->
<para>
</para>
diff --git a/libgda/gda-sql-builder.c b/libgda/gda-sql-builder.c
index a47dc83..ce6d0fa 100644
--- a/libgda/gda-sql-builder.c
+++ b/libgda/gda-sql-builder.c
@@ -577,7 +577,7 @@ gda_sql_builder_add_field (GdaSqlBuilder *builder, guint field_id, guint value_i
}
/**
- * gda_sql_builder_expr_value
+ * gda_sql_builder_add_expr_value
* @builder: a #GdaSqlBuilder object
* @id: the requested ID, or 0 if to be determined by @builder
* @dh: a #GdaDataHandler to use, or %NULL
@@ -593,7 +593,7 @@ gda_sql_builder_add_field (GdaSqlBuilder *builder, guint field_id, guint value_i
* Since: 4.2
*/
guint
-gda_sql_builder_expr_value (GdaSqlBuilder *builder, guint id, GdaDataHandler *dh, GValue *value)
+gda_sql_builder_add_expr_value (GdaSqlBuilder *builder, guint id, GdaDataHandler *dh, GValue *value)
{
g_return_val_if_fail (GDA_IS_SQL_BUILDER (builder), 0);
g_return_val_if_fail (builder->priv->main_stmt, 0);
@@ -631,7 +631,7 @@ gda_sql_builder_expr_value (GdaSqlBuilder *builder, guint id, GdaDataHandler *dh
}
/**
- * gda_sql_builder_expr
+ * gda_sql_builder_add_expr
* @builder: a #GdaSqlBuilder object
* @id: the requested ID, or 0 if to be determined by @builder
* @dh: a #GdaDataHandler to use, or %NULL
@@ -645,8 +645,8 @@ gda_sql_builder_expr_value (GdaSqlBuilder *builder, guint id, GdaDataHandler *dh
*
* For example:
* <programlisting>
- * gda_sql_builder_expr (b, 0, G_TYPE_INT, 15);
- * gda_sql_builder_expr (b, 5, G_TYPE_STRING, "joe")
+ * gda_sql_builder_add_expr (b, 0, G_TYPE_INT, 15);
+ * gda_sql_builder_add_expr (b, 5, G_TYPE_STRING, "joe")
* </programlisting>
*
* will be rendered as SQL as:
@@ -660,7 +660,7 @@ gda_sql_builder_expr_value (GdaSqlBuilder *builder, guint id, GdaDataHandler *dh
* Since: 4.2
*/
guint
-gda_sql_builder_expr (GdaSqlBuilder *builder, guint id, GdaDataHandler *dh, GType type, ...)
+gda_sql_builder_add_expr (GdaSqlBuilder *builder, guint id, GdaDataHandler *dh, GType type, ...)
{
g_return_val_if_fail (GDA_IS_SQL_BUILDER (builder), 0);
g_return_val_if_fail (builder->priv->main_stmt, 0);
@@ -680,7 +680,7 @@ gda_sql_builder_expr (GdaSqlBuilder *builder, guint id, GdaDataHandler *dh, GTyp
if (!v)
return 0;
- retval = gda_sql_builder_expr_value (builder, id, dh, v);
+ retval = gda_sql_builder_add_expr_value (builder, id, dh, v);
gda_value_free (v);
@@ -688,7 +688,7 @@ gda_sql_builder_expr (GdaSqlBuilder *builder, guint id, GdaDataHandler *dh, GTyp
}
/**
- * gda_sql_builder_ident
+ * gda_sql_builder_add_id
* @builder: a #GdaSqlBuilder object
* @id: the requested ID, or 0 if to be determined by @builder
* @string: a string
@@ -698,7 +698,7 @@ gda_sql_builder_expr (GdaSqlBuilder *builder, guint id, GdaDataHandler *dh, GTyp
* The new expression will contain the @string literal.
* For example:
* <programlisting>
- * gda_sql_builder_expr_liretal (b, 0, "name")
+ * gda_sql_builder_add_expr_liretal (b, 0, "name")
* </programlisting>
*
* will be rendered as SQL as:
@@ -711,7 +711,7 @@ gda_sql_builder_expr (GdaSqlBuilder *builder, guint id, GdaDataHandler *dh, GTyp
* Since: 4.2
*/
guint
-gda_sql_builder_ident (GdaSqlBuilder *builder, guint id, const gchar *string)
+gda_sql_builder_add_id (GdaSqlBuilder *builder, guint id, const gchar *string)
{
g_return_val_if_fail (GDA_IS_SQL_BUILDER (builder), 0);
g_return_val_if_fail (builder->priv->main_stmt, 0);
@@ -728,7 +728,7 @@ gda_sql_builder_ident (GdaSqlBuilder *builder, guint id, const gchar *string)
}
/**
- * gda_sql_builder_param
+ * gda_sql_builder_add_param
* @builder: a #GdaSqlBuilder object
* @id: the requested ID, or 0 if to be determined by @builder
* @param_name: parameter's name
@@ -740,7 +740,7 @@ gda_sql_builder_ident (GdaSqlBuilder *builder, guint id, const gchar *string)
* The new expression will contain the @string literal.
* For example:
* <programlisting>
- * gda_sql_builder_param (b, 0, "age", G_TYPE_INT, FALSE)
+ * gda_sql_builder_add_param (b, 0, "age", G_TYPE_INT, FALSE)
* </programlisting>
*
* will be rendered as SQL as:
@@ -754,7 +754,7 @@ gda_sql_builder_ident (GdaSqlBuilder *builder, guint id, const gchar *string)
* Since: 4.2
*/
guint
-gda_sql_builder_param (GdaSqlBuilder *builder, guint id, const gchar *param_name, GType type, gboolean nullok)
+gda_sql_builder_add_param (GdaSqlBuilder *builder, guint id, const gchar *param_name, GType type, gboolean nullok)
{
g_return_val_if_fail (GDA_IS_SQL_BUILDER (builder), 0);
g_return_val_if_fail (builder->priv->main_stmt, 0);
@@ -772,7 +772,7 @@ gda_sql_builder_param (GdaSqlBuilder *builder, guint id, const gchar *param_name
}
/**
- * gda_sql_builder_cond
+ * gda_sql_builder_add_cond
* @builder: a #GdaSqlBuilder object
* @id: the requested ID, or 0 if to be determined by @builder
* @op: type of condition
@@ -787,7 +787,7 @@ gda_sql_builder_param (GdaSqlBuilder *builder, guint id, const gchar *param_name
* Since: 4.2
*/
guint
-gda_sql_builder_cond (GdaSqlBuilder *builder, guint id, GdaSqlOperatorType op, guint op1, guint op2, guint op3)
+gda_sql_builder_add_cond (GdaSqlBuilder *builder, guint id, GdaSqlOperatorType op, guint op1, guint op2, guint op3)
{
g_return_val_if_fail (GDA_IS_SQL_BUILDER (builder), 0);
g_return_val_if_fail (builder->priv->main_stmt, 0);
@@ -817,7 +817,7 @@ gda_sql_builder_cond (GdaSqlBuilder *builder, guint id, GdaSqlOperatorType op, g
}
/**
- * gda_sql_builder_cond_v
+ * gda_sql_builder_add_cond_v
* @builder: a #GdaSqlBuilder object
* @id: the requested ID, or 0 if to be determined by @builder
* @op: type of condition
@@ -835,7 +835,7 @@ gda_sql_builder_cond (GdaSqlBuilder *builder, guint id, GdaSqlOperatorType op, g
* Since: 4.2
*/
guint
-gda_sql_builder_cond_v (GdaSqlBuilder *builder, guint id, GdaSqlOperatorType op,
+gda_sql_builder_add_cond_v (GdaSqlBuilder *builder, guint id, GdaSqlOperatorType op,
const guint *op_ids, gint op_ids_size)
{
gint i;
diff --git a/libgda/gda-sql-builder.h b/libgda/gda-sql-builder.h
index 9240bef..fae267e 100644
--- a/libgda/gda-sql-builder.h
+++ b/libgda/gda-sql-builder.h
@@ -70,14 +70,14 @@ GdaStatement *gda_sql_builder_get_statement (GdaSqlBuilder *builder, GError
GdaSqlStatement *gda_sql_builder_get_sql_statement (GdaSqlBuilder *builder, gboolean copy_it);
/* Expression API */
-guint gda_sql_builder_ident (GdaSqlBuilder *builder, guint id, const gchar *string);
-guint gda_sql_builder_expr (GdaSqlBuilder *builder, guint id, GdaDataHandler *dh, GType type, ...);
-guint gda_sql_builder_expr_value (GdaSqlBuilder *builder, guint id, GdaDataHandler *dh, GValue* value);
-guint gda_sql_builder_param (GdaSqlBuilder *builder, guint id, const gchar *param_name, GType type, gboolean nullok);
+guint gda_sql_builder_add_id (GdaSqlBuilder *builder, guint id, const gchar *string);
+guint gda_sql_builder_add_expr (GdaSqlBuilder *builder, guint id, GdaDataHandler *dh, GType type, ...);
+guint gda_sql_builder_add_expr_value (GdaSqlBuilder *builder, guint id, GdaDataHandler *dh, GValue* value);
+guint gda_sql_builder_add_param (GdaSqlBuilder *builder, guint id, const gchar *param_name, GType type, gboolean nullok);
-guint gda_sql_builder_cond (GdaSqlBuilder *builder, guint id, GdaSqlOperatorType op,
+guint gda_sql_builder_add_cond (GdaSqlBuilder *builder, guint id, GdaSqlOperatorType op,
guint op1, guint op2, guint op3);
-guint gda_sql_builder_cond_v (GdaSqlBuilder *builder, guint id, GdaSqlOperatorType op,
+guint gda_sql_builder_add_cond_v (GdaSqlBuilder *builder, guint id, GdaSqlOperatorType op,
const guint *op_ids, gint op_ids_size);
guint gda_sql_builder_add_function (GdaSqlBuilder *builder, guint id, const gchar *func_name, ...);
guint gda_sql_builder_add_function_v (GdaSqlBuilder *builder, guint id, const gchar *func_name,
diff --git a/samples/SqlBuilder/example.c b/samples/SqlBuilder/example.c
index 9e4e827..6814684 100644
--- a/samples/SqlBuilder/example.c
+++ b/samples/SqlBuilder/example.c
@@ -16,13 +16,13 @@ main (int argc, char *argv[])
gda_sql_builder_set_table (b, "customers");
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "e"),
- gda_sql_builder_param (b, 0, "p1", G_TYPE_STRING, FALSE));
+ gda_sql_builder_add_id (b, 0, "e"),
+ gda_sql_builder_add_param (b, 0, "p1", G_TYPE_STRING, FALSE));
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "f"),
- gda_sql_builder_expr (b, 0, NULL, G_TYPE_INT, 15));
- gda_sql_builder_add_field (b, gda_sql_builder_ident (b, 0, "g"),
- gda_sql_builder_expr (b, 0, NULL, G_TYPE_STRING, "joe"));
+ gda_sql_builder_add_id (b, 0, "f"),
+ gda_sql_builder_add_expr (b, 0, NULL, G_TYPE_INT, 15));
+ gda_sql_builder_add_field (b, gda_sql_builder_add_id (b, 0, "g"),
+ gda_sql_builder_add_expr (b, 0, NULL, G_TYPE_STRING, "joe"));
render_as_sql (b);
g_object_unref (b);
@@ -33,20 +33,20 @@ main (int argc, char *argv[])
gda_sql_builder_set_table (b, "products");
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "ref"),
- gda_sql_builder_expr (b, 10, NULL, G_TYPE_STRING, "A0E'FESP"));
- gda_sql_builder_ident (b, 1, "id");
- gda_sql_builder_expr (b, 2, NULL, G_TYPE_INT, 14);
- gda_sql_builder_cond (b, 3, GDA_SQL_OPERATOR_TYPE_EQ, 1, 2, 0);
+ gda_sql_builder_add_id (b, 0, "ref"),
+ gda_sql_builder_add_expr (b, 10, NULL, G_TYPE_STRING, "A0E'FESP"));
+ gda_sql_builder_add_id (b, 1, "id");
+ gda_sql_builder_add_expr (b, 2, NULL, G_TYPE_INT, 14);
+ gda_sql_builder_add_cond (b, 3, GDA_SQL_OPERATOR_TYPE_EQ, 1, 2, 0);
gda_sql_builder_set_where (b, 3);
render_as_sql (b);
/* reuse the same GdaSqlBuilder object to change the WHERE condition to: WHERE id = ##theid::int */
gda_sql_builder_set_where (b,
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
1,
- gda_sql_builder_param (b, 0, "theid", G_TYPE_INT, FALSE),
+ gda_sql_builder_add_param (b, 0, "theid", G_TYPE_INT, FALSE),
0));
render_as_sql (b);
g_object_unref (b);
@@ -55,9 +55,9 @@ main (int argc, char *argv[])
b = gda_sql_builder_new (GDA_SQL_STATEMENT_DELETE);
gda_sql_builder_set_table (b, "items");
- gda_sql_builder_ident (b, 1, "id");
- gda_sql_builder_param (b, 2, "theid", G_TYPE_INT, FALSE);
- gda_sql_builder_cond (b, 3, GDA_SQL_OPERATOR_TYPE_EQ, 1, 2, 0);
+ gda_sql_builder_add_id (b, 1, "id");
+ gda_sql_builder_add_param (b, 2, "theid", G_TYPE_INT, FALSE);
+ gda_sql_builder_add_cond (b, 3, GDA_SQL_OPERATOR_TYPE_EQ, 1, 2, 0);
gda_sql_builder_set_where (b, 3);
render_as_sql (b);
@@ -70,18 +70,18 @@ main (int argc, char *argv[])
*/
b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
- gda_sql_builder_ident (b, 1, "select"); /* SELECT is an SQL reserved keyword */
+ gda_sql_builder_add_id (b, 1, "select"); /* SELECT is an SQL reserved keyword */
gda_sql_builder_select_add_target (b, 1, 1, "c");
gda_sql_builder_select_add_target (b, 2,
- gda_sql_builder_ident (b, 0, "orders"),
+ gda_sql_builder_add_id (b, 0, "orders"),
NULL);
gda_sql_builder_select_join_targets (b, 5, 1, 2, GDA_SQL_SELECT_JOIN_INNER, 0);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "c.date"), 0); /* DATE is an SQL reserved keyword */
+ gda_sql_builder_add_id (b, 0, "c.date"), 0); /* DATE is an SQL reserved keyword */
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "name"),
- gda_sql_builder_ident (b, 0, "person"));
+ gda_sql_builder_add_id (b, 0, "name"),
+ gda_sql_builder_add_id (b, 0, "person"));
render_as_sql (b);
@@ -94,12 +94,12 @@ main (int argc, char *argv[])
/* SELECT myfunc (a, 5, 'Joe') FROM mytable */
b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
gda_sql_builder_select_add_target (b, 0,
- gda_sql_builder_ident (b, 0, "mytable"),
+ gda_sql_builder_add_id (b, 0, "mytable"),
NULL);
gda_sql_builder_add_function (b, 1, "myfunc",
- gda_sql_builder_ident (b, 0, "a"),
- gda_sql_builder_expr (b, 0, NULL, G_TYPE_INT, 5),
- gda_sql_builder_expr (b, 0, NULL, G_TYPE_STRING, "Joe"),
+ gda_sql_builder_add_id (b, 0, "a"),
+ gda_sql_builder_add_expr (b, 0, NULL, G_TYPE_INT, 5),
+ gda_sql_builder_add_expr (b, 0, NULL, G_TYPE_STRING, "Joe"),
0);
gda_sql_builder_add_field (b, 1, 0);
render_as_sql (b);
@@ -107,8 +107,8 @@ main (int argc, char *argv[])
/* reuse the same GdaSqlBuilder object to have:
* SELECT myfunc (a, 5, 'Joe'), MAX (myfunc (a, 5, 'Joe'), b, 10) FROM mytable */
guint args[] = {1, 3, 4};
- gda_sql_builder_ident (b, 3, "b");
- gda_sql_builder_expr (b, 4, NULL, G_TYPE_INT, 10);
+ gda_sql_builder_add_id (b, 3, "b");
+ gda_sql_builder_add_expr (b, 4, NULL, G_TYPE_INT, 10);
gda_sql_builder_add_function_v (b, 5, "MAX", args, 3);
gda_sql_builder_add_field (b, 5, 0);
diff --git a/tests/test-sql-builder.c b/tests/test-sql-builder.c
index ca8b0a4..35628ab 100644
--- a/tests/test-sql-builder.c
+++ b/tests/test-sql-builder.c
@@ -127,9 +127,9 @@ build0 (void)
builder = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "*"), 0);
+ gda_sql_builder_add_id (builder, 0, "*"), 0);
gda_sql_builder_select_add_target (builder, 0,
- gda_sql_builder_ident (builder, 0, "mytable"), NULL);
+ gda_sql_builder_add_id (builder, 0, "mytable"), NULL);
stmt = gda_sql_builder_get_sql_statement (builder, FALSE);
g_object_unref (builder);
return stmt;
@@ -150,32 +150,32 @@ build1 (void)
builder = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
gda_sql_builder_select_add_target (builder, 0,
- gda_sql_builder_ident (builder, 0, "mytable"), NULL);
+ gda_sql_builder_add_id (builder, 0, "mytable"), NULL);
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "contents"), 0);
+ gda_sql_builder_add_id (builder, 0, "contents"), 0);
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "descr"), 0);
+ gda_sql_builder_add_id (builder, 0, "descr"), 0);
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "rank"), 0);
+ gda_sql_builder_add_id (builder, 0, "rank"), 0);
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "name"), 0);
- gda_sql_builder_cond (builder, 1, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (builder, 0, "session"),
- gda_sql_builder_param (builder, 0, "session", G_TYPE_STRING, FALSE), 0);
-
- op_ids [index] = gda_sql_builder_cond (builder, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (builder, 0, "type"),
- gda_sql_builder_expr (builder, 0, NULL, G_TYPE_STRING, "TABLE"), 0);
+ gda_sql_builder_add_id (builder, 0, "name"), 0);
+ gda_sql_builder_add_cond (builder, 1, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (builder, 0, "session"),
+ gda_sql_builder_add_param (builder, 0, "session", G_TYPE_STRING, FALSE), 0);
+
+ op_ids [index] = gda_sql_builder_add_cond (builder, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (builder, 0, "type"),
+ gda_sql_builder_add_expr (builder, 0, NULL, G_TYPE_STRING, "TABLE"), 0);
index++;
- op_ids [index] = gda_sql_builder_cond (builder, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (builder, 0, "name"),
- gda_sql_builder_expr (builder, 0, NULL, G_TYPE_STRING, "alf"), 0);
+ op_ids [index] = gda_sql_builder_add_cond (builder, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (builder, 0, "name"),
+ gda_sql_builder_add_expr (builder, 0, NULL, G_TYPE_STRING, "alf"), 0);
index++;
- gda_sql_builder_cond_v (builder, 2, GDA_SQL_OPERATOR_TYPE_AND, op_ids, index);
+ gda_sql_builder_add_cond_v (builder, 2, GDA_SQL_OPERATOR_TYPE_AND, op_ids, index);
- gda_sql_builder_set_where (builder, gda_sql_builder_cond (builder, 0, GDA_SQL_OPERATOR_TYPE_AND, 1, 2, 0));
+ gda_sql_builder_set_where (builder, gda_sql_builder_add_cond (builder, 0, GDA_SQL_OPERATOR_TYPE_AND, 1, 2, 0));
stmt = gda_sql_builder_get_sql_statement (builder, FALSE);
g_object_unref (builder);
@@ -196,20 +196,20 @@ build2 (void)
gda_sql_builder_set_table (builder, "mytable");
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "session"),
- gda_sql_builder_param (builder, 0, "session", G_TYPE_INT, FALSE));
+ gda_sql_builder_add_id (builder, 0, "session"),
+ gda_sql_builder_add_param (builder, 0, "session", G_TYPE_INT, FALSE));
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "type"),
- gda_sql_builder_param (builder, 0, "type", G_TYPE_INT, FALSE));
+ gda_sql_builder_add_id (builder, 0, "type"),
+ gda_sql_builder_add_param (builder, 0, "type", G_TYPE_INT, FALSE));
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "name"),
- gda_sql_builder_param (builder, 0, "name", G_TYPE_STRING, TRUE));
+ gda_sql_builder_add_id (builder, 0, "name"),
+ gda_sql_builder_add_param (builder, 0, "name", G_TYPE_STRING, TRUE));
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "contents"),
- gda_sql_builder_param (builder, 0, "contents", G_TYPE_STRING, FALSE));
+ gda_sql_builder_add_id (builder, 0, "contents"),
+ gda_sql_builder_add_param (builder, 0, "contents", G_TYPE_STRING, FALSE));
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "descr"),
- gda_sql_builder_param (builder, 0, "descr", G_TYPE_STRING, TRUE));
+ gda_sql_builder_add_id (builder, 0, "descr"),
+ gda_sql_builder_add_param (builder, 0, "descr", G_TYPE_STRING, TRUE));
stmt = gda_sql_builder_get_sql_statement (builder, FALSE);
g_object_unref (builder);
@@ -230,19 +230,19 @@ build3 (void)
gda_sql_builder_set_table (builder, "mytable");
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "name"),
- gda_sql_builder_param (builder, 0, "name", G_TYPE_STRING, TRUE));
+ gda_sql_builder_add_id (builder, 0, "name"),
+ gda_sql_builder_add_param (builder, 0, "name", G_TYPE_STRING, TRUE));
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "contents"),
- gda_sql_builder_param (builder, 0, "contents", G_TYPE_STRING, FALSE));
+ gda_sql_builder_add_id (builder, 0, "contents"),
+ gda_sql_builder_add_param (builder, 0, "contents", G_TYPE_STRING, FALSE));
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "descr"),
- gda_sql_builder_param (builder, 0, "descr", G_TYPE_STRING, TRUE));
+ gda_sql_builder_add_id (builder, 0, "descr"),
+ gda_sql_builder_add_param (builder, 0, "descr", G_TYPE_STRING, TRUE));
gda_sql_builder_set_where (builder,
- gda_sql_builder_cond (builder, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (builder, 0, "id"),
- gda_sql_builder_param (builder, 0, "id", G_TYPE_INT, FALSE),
+ gda_sql_builder_add_cond (builder, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (builder, 0, "id"),
+ gda_sql_builder_add_param (builder, 0, "id", G_TYPE_INT, FALSE),
0));
stmt = gda_sql_builder_get_sql_statement (builder, FALSE);
@@ -264,30 +264,30 @@ build4 (void)
b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "fav.*"), 0);
+ gda_sql_builder_add_id (b, 0, "fav.*"), 0);
t1 = gda_sql_builder_select_add_target (b, 0,
- gda_sql_builder_ident (b, 0, "mytable"),
+ gda_sql_builder_add_id (b, 0, "mytable"),
"fav");
t2 = gda_sql_builder_select_add_target (b, 0,
- gda_sql_builder_ident (b, 0, "fav_orders"),
+ gda_sql_builder_add_id (b, 0, "fav_orders"),
"o");
gda_sql_builder_select_join_targets (b, 0, t1, t2, GDA_SQL_SELECT_JOIN_LEFT,
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "fav.id"),
- gda_sql_builder_ident (b, 0, "o.fav_id"),
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "fav.id"),
+ gda_sql_builder_add_id (b, 0, "o.fav_id"),
0));
gda_sql_builder_set_where (b,
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_AND,
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "fav.sesion"),
- gda_sql_builder_param (b, 0, "session", G_TYPE_INT, FALSE), 0),
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "o.order_key"),
- gda_sql_builder_param (b, 0, "okey", G_TYPE_INT, FALSE), 0), 0));
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_AND,
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "fav.sesion"),
+ gda_sql_builder_add_param (b, 0, "session", G_TYPE_INT, FALSE), 0),
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "o.order_key"),
+ gda_sql_builder_add_param (b, 0, "okey", G_TYPE_INT, FALSE), 0), 0));
gda_sql_builder_select_order_by (b,
- gda_sql_builder_ident (b, 0, "o.rank"), TRUE, NULL);
+ gda_sql_builder_add_id (b, 0, "o.rank"), TRUE, NULL);
stmt = gda_sql_builder_get_sql_statement (b, FALSE);
g_object_unref (b);
return stmt;
@@ -305,19 +305,19 @@ build5 (void)
b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "id"), 0);
+ gda_sql_builder_add_id (b, 0, "id"), 0);
gda_sql_builder_select_add_target (b, 0,
- gda_sql_builder_ident (b, 0, "mytable"),
+ gda_sql_builder_add_id (b, 0, "mytable"),
NULL);
gda_sql_builder_set_where (b,
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_AND,
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "sesion"),
- gda_sql_builder_param (b, 0, "session", G_TYPE_INT, FALSE), 0),
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "contents"),
- gda_sql_builder_param (b, 0, "contents", G_TYPE_INT, FALSE), 0), 0));
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_AND,
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "sesion"),
+ gda_sql_builder_add_param (b, 0, "session", G_TYPE_INT, FALSE), 0),
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "contents"),
+ gda_sql_builder_add_param (b, 0, "contents", G_TYPE_INT, FALSE), 0), 0));
stmt = gda_sql_builder_get_sql_statement (b, FALSE);
g_object_unref (b);
@@ -335,20 +335,20 @@ build6 (void)
GdaSqlStatement *stmt;
b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
- gda_sql_builder_add_field (b, gda_sql_builder_ident (b, 0, "fav_id"), 0);
- gda_sql_builder_add_field (b, gda_sql_builder_ident (b, 0, "rank"), 0);
+ gda_sql_builder_add_field (b, gda_sql_builder_add_id (b, 0, "fav_id"), 0);
+ gda_sql_builder_add_field (b, gda_sql_builder_add_id (b, 0, "rank"), 0);
gda_sql_builder_select_add_target (b, 0,
- gda_sql_builder_ident (b, 0, "mytable"),
+ gda_sql_builder_add_id (b, 0, "mytable"),
NULL);
- gda_sql_builder_cond (b, 1, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "order_key"),
- gda_sql_builder_param (b, 0, "orderkey", G_TYPE_INT, FALSE), 0);
- gda_sql_builder_cond (b, 2, GDA_SQL_OPERATOR_TYPE_DIFF,
- gda_sql_builder_ident (b, 0, "fav_id"),
- gda_sql_builder_param (b, 0, "id", G_TYPE_INT, FALSE), 0);
+ gda_sql_builder_add_cond (b, 1, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "order_key"),
+ gda_sql_builder_add_param (b, 0, "orderkey", G_TYPE_INT, FALSE), 0);
+ gda_sql_builder_add_cond (b, 2, GDA_SQL_OPERATOR_TYPE_DIFF,
+ gda_sql_builder_add_id (b, 0, "fav_id"),
+ gda_sql_builder_add_param (b, 0, "id", G_TYPE_INT, FALSE), 0);
- gda_sql_builder_set_where (b, gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_AND, 1, 2, 0));
+ gda_sql_builder_set_where (b, gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_AND, 1, 2, 0));
stmt = gda_sql_builder_get_sql_statement (b, FALSE);
g_object_unref (b);
@@ -367,21 +367,21 @@ build7 (void)
b = gda_sql_builder_new (GDA_SQL_STATEMENT_UPDATE);
gda_sql_builder_set_table (b, "mytable");
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "rank"),
- gda_sql_builder_param (b, 0, "newrank", G_TYPE_INT, FALSE));
- gda_sql_builder_cond (b, 1, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "fav_id"),
- gda_sql_builder_param (b, 0, "id", G_TYPE_INT, FALSE),
+ gda_sql_builder_add_id (b, 0, "rank"),
+ gda_sql_builder_add_param (b, 0, "newrank", G_TYPE_INT, FALSE));
+ gda_sql_builder_add_cond (b, 1, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "fav_id"),
+ gda_sql_builder_add_param (b, 0, "id", G_TYPE_INT, FALSE),
0);
- gda_sql_builder_cond (b, 2, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "order_key"),
- gda_sql_builder_param (b, 0, "orderkey", G_TYPE_INT, FALSE),
+ gda_sql_builder_add_cond (b, 2, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "order_key"),
+ gda_sql_builder_add_param (b, 0, "orderkey", G_TYPE_INT, FALSE),
0);
- gda_sql_builder_cond (b, 3, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "rank"),
- gda_sql_builder_param (b, 0, "rank", G_TYPE_INT, FALSE),
+ gda_sql_builder_add_cond (b, 3, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "rank"),
+ gda_sql_builder_add_param (b, 0, "rank", G_TYPE_INT, FALSE),
0);
- gda_sql_builder_set_where (b, gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_AND, 1, 2, 3));
+ gda_sql_builder_set_where (b, gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_AND, 1, 2, 3));
stmt = gda_sql_builder_get_sql_statement (b, FALSE);
g_object_unref (b);
@@ -400,9 +400,9 @@ build8 (void)
b = gda_sql_builder_new (GDA_SQL_STATEMENT_DELETE);
gda_sql_builder_set_table (b, "mytable");
- gda_sql_builder_set_where (b, gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "id"),
- gda_sql_builder_param (b, 0, "id", G_TYPE_INT, FALSE),
+ gda_sql_builder_set_where (b, gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "id"),
+ gda_sql_builder_add_param (b, 0, "id", G_TYPE_INT, FALSE),
0));
stmt = gda_sql_builder_get_sql_statement (b, FALSE);
g_object_unref (b);
diff --git a/tools/browser/browser-favorites.c b/tools/browser/browser-favorites.c
index 4898311..f45ad94 100644
--- a/tools/browser/browser-favorites.c
+++ b/tools/browser/browser-favorites.c
@@ -243,18 +243,18 @@ find_favorite_position (BrowserFavorites *bfav, gint fav_id, gint order_key)
b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "rank"), 0);
+ gda_sql_builder_add_id (b, 0, "rank"), 0);
gda_sql_builder_select_add_target (b, 0,
- gda_sql_builder_ident (b, 0, FAVORDER_TABLE_NAME),
+ gda_sql_builder_add_id (b, 0, FAVORDER_TABLE_NAME),
NULL);
gda_sql_builder_set_where (b,
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_AND,
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "fav_id"),
- gda_sql_builder_param (b, 0, "favid", G_TYPE_INT, FALSE), 0),
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "order_key"),
- gda_sql_builder_param (b, 0, "okey", G_TYPE_INT, FALSE), 0),
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_AND,
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "fav_id"),
+ gda_sql_builder_add_param (b, 0, "favid", G_TYPE_INT, FALSE), 0),
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "order_key"),
+ gda_sql_builder_add_param (b, 0, "okey", G_TYPE_INT, FALSE), 0),
0));
stmt = gda_sql_builder_get_statement (b, NULL);
@@ -308,36 +308,36 @@ find_favorite (BrowserFavorites *bfav, guint session_id, gint id, const gchar *c
b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "id"), 0);
+ gda_sql_builder_add_id (b, 0, "id"), 0);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "type"), 0);
+ gda_sql_builder_add_id (b, 0, "type"), 0);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "name"), 0);
+ gda_sql_builder_add_id (b, 0, "name"), 0);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "descr"), 0);
+ gda_sql_builder_add_id (b, 0, "descr"), 0);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "contents"), 0);
+ gda_sql_builder_add_id (b, 0, "contents"), 0);
gda_sql_builder_select_add_target (b, 0,
- gda_sql_builder_ident (b, 0, FAVORITES_TABLE_NAME),
+ gda_sql_builder_add_id (b, 0, FAVORITES_TABLE_NAME),
NULL);
if (id >= 0) {
/* lookup from ID */
gda_sql_builder_set_where (b,
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "id"),
- gda_sql_builder_param (b, 0, "id", G_TYPE_INT, FALSE), 0));
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "id"),
+ gda_sql_builder_add_param (b, 0, "id", G_TYPE_INT, FALSE), 0));
}
else {
/* lookup using session and contents */
gda_sql_builder_set_where (b,
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_AND,
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "session"),
- gda_sql_builder_param (b, 0, "session", G_TYPE_INT, FALSE), 0),
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "contents"),
- gda_sql_builder_param (b, 0, "contents", G_TYPE_INT, FALSE), 0), 0));
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_AND,
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "session"),
+ gda_sql_builder_add_param (b, 0, "session", G_TYPE_INT, FALSE), 0),
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "contents"),
+ gda_sql_builder_add_param (b, 0, "contents", G_TYPE_INT, FALSE), 0), 0));
}
stmt = gda_sql_builder_get_statement (b, error);
g_object_unref (G_OBJECT (b));
@@ -397,17 +397,17 @@ 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 (b, gda_sql_builder_ident (b, 0, "fav_id"), 0);
+ gda_sql_builder_add_field (b, gda_sql_builder_add_id (b, 0, "fav_id"), 0);
gda_sql_builder_select_add_target (b, 0,
- gda_sql_builder_ident (b, 0, FAVORDER_TABLE_NAME),
+ gda_sql_builder_add_id (b, 0, FAVORDER_TABLE_NAME),
NULL);
- gda_sql_builder_set_where (b, gda_sql_builder_cond (b, 1, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "order_key"),
- gda_sql_builder_param (b, 0, "orderkey", G_TYPE_INT, FALSE), 0));
+ gda_sql_builder_set_where (b, gda_sql_builder_add_cond (b, 1, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "order_key"),
+ gda_sql_builder_add_param (b, 0, "orderkey", G_TYPE_INT, FALSE), 0));
gda_sql_builder_select_order_by (b,
- gda_sql_builder_ident (b, 0, "rank"), TRUE, NULL);
+ gda_sql_builder_add_id (b, 0, "rank"), TRUE, NULL);
stmt = gda_sql_builder_get_statement (b, error);
g_object_unref (G_OBJECT (b));
if (!stmt)
@@ -434,17 +434,17 @@ 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 (b,
- gda_sql_builder_ident (b, 0, "rank"),
- gda_sql_builder_param (b, 0, "rank", G_TYPE_INT, FALSE));
- gda_sql_builder_cond (b, 1, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "fav_id"),
- gda_sql_builder_param (b, 0, "id", G_TYPE_INT, FALSE),
+ gda_sql_builder_add_id (b, 0, "rank"),
+ gda_sql_builder_add_param (b, 0, "rank", G_TYPE_INT, FALSE));
+ gda_sql_builder_add_cond (b, 1, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "fav_id"),
+ gda_sql_builder_add_param (b, 0, "id", G_TYPE_INT, FALSE),
0);
- gda_sql_builder_cond (b, 2, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "order_key"),
- gda_sql_builder_param (b, 0, "orderkey", G_TYPE_INT, FALSE),
+ gda_sql_builder_add_cond (b, 2, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "order_key"),
+ gda_sql_builder_add_param (b, 0, "orderkey", G_TYPE_INT, FALSE),
0);
- gda_sql_builder_set_where (b, gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_AND, 1, 2, 0));
+ gda_sql_builder_set_where (b, gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_AND, 1, 2, 0));
stmt = gda_sql_builder_get_statement (b, error);
if (!stmt) {
retval = FALSE;
@@ -560,20 +560,20 @@ browser_favorites_add (BrowserFavorites *bfav, guint session_id,
gda_sql_builder_set_table (builder, FAVORITES_TABLE_NAME);
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "session"),
- gda_sql_builder_param (builder, 0, "session", G_TYPE_INT, FALSE));
+ gda_sql_builder_add_id (builder, 0, "session"),
+ gda_sql_builder_add_param (builder, 0, "session", G_TYPE_INT, FALSE));
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "type"),
- gda_sql_builder_param (builder, 0, "type", G_TYPE_INT, FALSE));
+ gda_sql_builder_add_id (builder, 0, "type"),
+ gda_sql_builder_add_param (builder, 0, "type", G_TYPE_INT, FALSE));
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "name"),
- gda_sql_builder_param (builder, 0, "name", G_TYPE_STRING, TRUE));
+ gda_sql_builder_add_id (builder, 0, "name"),
+ gda_sql_builder_add_param (builder, 0, "name", G_TYPE_STRING, TRUE));
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "contents"),
- gda_sql_builder_param (builder, 0, "contents", G_TYPE_STRING, FALSE));
+ gda_sql_builder_add_id (builder, 0, "contents"),
+ gda_sql_builder_add_param (builder, 0, "contents", G_TYPE_STRING, FALSE));
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "descr"),
- gda_sql_builder_param (builder, 0, "descr", G_TYPE_STRING, TRUE));
+ gda_sql_builder_add_id (builder, 0, "descr"),
+ gda_sql_builder_add_param (builder, 0, "descr", G_TYPE_STRING, TRUE));
stmt = gda_sql_builder_get_statement (builder, error);
g_object_unref (G_OBJECT (builder));
if (!stmt)
@@ -597,29 +597,29 @@ browser_favorites_add (BrowserFavorites *bfav, guint session_id,
gda_sql_builder_set_table (builder, FAVORITES_TABLE_NAME);
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "name"),
- gda_sql_builder_param (builder, 0, "name", G_TYPE_STRING, TRUE));
+ gda_sql_builder_add_id (builder, 0, "name"),
+ gda_sql_builder_add_param (builder, 0, "name", G_TYPE_STRING, TRUE));
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "contents"),
- gda_sql_builder_param (builder, 0, "contents", G_TYPE_STRING, FALSE));
+ gda_sql_builder_add_id (builder, 0, "contents"),
+ gda_sql_builder_add_param (builder, 0, "contents", G_TYPE_STRING, FALSE));
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "descr"),
- gda_sql_builder_param (builder, 0, "descr", G_TYPE_STRING, TRUE));
+ gda_sql_builder_add_id (builder, 0, "descr"),
+ gda_sql_builder_add_param (builder, 0, "descr", G_TYPE_STRING, TRUE));
gda_sql_builder_set_where (builder,
- gda_sql_builder_cond (builder, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (builder, 0, "id"),
- gda_sql_builder_param (builder, 0, "id", G_TYPE_INT, FALSE),
+ gda_sql_builder_add_cond (builder, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (builder, 0, "id"),
+ gda_sql_builder_add_param (builder, 0, "id", G_TYPE_INT, FALSE),
0));
if (fav->id == favid) {
/* alter name and description only if fav->id was OK */
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "name"),
- gda_sql_builder_param (builder, 0, "name", G_TYPE_STRING,
+ gda_sql_builder_add_id (builder, 0, "name"),
+ gda_sql_builder_add_param (builder, 0, "name", G_TYPE_STRING,
TRUE));
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "descr"),
- gda_sql_builder_param (builder, 0, "descr", G_TYPE_STRING,
+ gda_sql_builder_add_id (builder, 0, "descr"),
+ gda_sql_builder_add_param (builder, 0, "descr", G_TYPE_STRING,
TRUE));
}
@@ -652,14 +652,14 @@ browser_favorites_add (BrowserFavorites *bfav, guint session_id,
builder = gda_sql_builder_new (GDA_SQL_STATEMENT_DELETE);
gda_sql_builder_set_table (builder, FAVORDER_TABLE_NAME);
gda_sql_builder_set_where (builder,
- gda_sql_builder_cond (builder, 0, GDA_SQL_OPERATOR_TYPE_AND,
- gda_sql_builder_cond (builder, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (builder, 0, "fav_id"),
- gda_sql_builder_param (builder, 0, "id", G_TYPE_INT, FALSE),
+ gda_sql_builder_add_cond (builder, 0, GDA_SQL_OPERATOR_TYPE_AND,
+ gda_sql_builder_add_cond (builder, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (builder, 0, "fav_id"),
+ gda_sql_builder_add_param (builder, 0, "id", G_TYPE_INT, FALSE),
0),
- gda_sql_builder_cond (builder, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (builder, 0, "order_key"),
- gda_sql_builder_param (builder, 0, "orderkey", G_TYPE_INT, FALSE),
+ gda_sql_builder_add_cond (builder, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (builder, 0, "order_key"),
+ gda_sql_builder_add_param (builder, 0, "orderkey", G_TYPE_INT, FALSE),
0), 0));
stmt = gda_sql_builder_get_statement (builder, error);
g_object_unref (G_OBJECT (builder));
@@ -674,14 +674,14 @@ 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 (builder,
- gda_sql_builder_ident (builder, 0, "fav_id"),
- gda_sql_builder_param (builder, 0, "id", G_TYPE_INT, FALSE));
+ gda_sql_builder_add_id (builder, 0, "fav_id"),
+ gda_sql_builder_add_param (builder, 0, "id", G_TYPE_INT, FALSE));
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "rank"),
- gda_sql_builder_param (builder, 0, "rank", G_TYPE_INT, FALSE));
+ gda_sql_builder_add_id (builder, 0, "rank"),
+ gda_sql_builder_add_param (builder, 0, "rank", G_TYPE_INT, FALSE));
gda_sql_builder_add_field (builder,
- gda_sql_builder_ident (builder, 0, "order_key"),
- gda_sql_builder_param (builder, 0, "orderkey", G_TYPE_STRING, TRUE));
+ gda_sql_builder_add_id (builder, 0, "order_key"),
+ gda_sql_builder_add_param (builder, 0, "orderkey", G_TYPE_STRING, TRUE));
stmt = gda_sql_builder_get_statement (builder, error);
g_object_unref (G_OBJECT (builder));
if (!stmt)
@@ -792,41 +792,41 @@ browser_favorites_list (BrowserFavorites *bfav, guint session_id, BrowserFavorit
b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "fav.contents"), 0);
+ gda_sql_builder_add_id (b, 0, "fav.contents"), 0);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "fav.descr"), 0);
+ gda_sql_builder_add_id (b, 0, "fav.descr"), 0);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "fav.name"), 0);
+ gda_sql_builder_add_id (b, 0, "fav.name"), 0);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "fav.type"), 0);
+ gda_sql_builder_add_id (b, 0, "fav.type"), 0);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "fav.id"), 0);
+ gda_sql_builder_add_id (b, 0, "fav.id"), 0);
t1 = gda_sql_builder_select_add_target (b, 0,
- gda_sql_builder_ident (b, 0, FAVORITES_TABLE_NAME),
+ gda_sql_builder_add_id (b, 0, FAVORITES_TABLE_NAME),
"fav");
if (order_key > 0) {
t2 = gda_sql_builder_select_add_target (b, 0,
- gda_sql_builder_ident (b, 0, FAVORDER_TABLE_NAME),
+ gda_sql_builder_add_id (b, 0, FAVORDER_TABLE_NAME),
"o");
gda_sql_builder_select_join_targets (b, 0, t1, t2, GDA_SQL_SELECT_JOIN_LEFT,
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "fav.id"),
- gda_sql_builder_ident (b, 0, "o.fav_id"),
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "fav.id"),
+ gda_sql_builder_add_id (b, 0, "o.fav_id"),
0));
gda_sql_builder_select_order_by (b,
- gda_sql_builder_ident (b, 0, "o.rank"), TRUE, NULL);
+ gda_sql_builder_add_id (b, 0, "o.rank"), TRUE, NULL);
- and_cond_ids [and_cond_size] = gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "o.order_key"),
- gda_sql_builder_param (b, 0, "okey", G_TYPE_INT, FALSE),
+ and_cond_ids [and_cond_size] = gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "o.order_key"),
+ gda_sql_builder_add_param (b, 0, "okey", G_TYPE_INT, FALSE),
0);
and_cond_size++;
}
- and_cond_ids [and_cond_size] = gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "fav.session"),
- gda_sql_builder_param (b, 0, "session", G_TYPE_INT, FALSE), 0);
+ and_cond_ids [and_cond_size] = gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "fav.session"),
+ gda_sql_builder_add_param (b, 0, "session", G_TYPE_INT, FALSE), 0);
and_cond_size++;
gint i;
@@ -835,22 +835,22 @@ browser_favorites_list (BrowserFavorites *bfav, guint session_id, BrowserFavorit
if (type & flag) {
gchar *str;
str = g_strdup_printf ("'%s'", favorite_type_to_string (flag));
- or_cond_ids [or_cond_size] = gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "fav.type"),
- gda_sql_builder_ident (b, 0, str),
+ or_cond_ids [or_cond_size] = gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "fav.type"),
+ gda_sql_builder_add_id (b, 0, str),
0);
g_free (str);
or_cond_size++;
}
}
if (or_cond_size >= 1) {
- and_cond_ids [and_cond_size] = gda_sql_builder_cond_v (b, 0, GDA_SQL_OPERATOR_TYPE_OR,
+ and_cond_ids [and_cond_size] = gda_sql_builder_add_cond_v (b, 0, GDA_SQL_OPERATOR_TYPE_OR,
or_cond_ids, or_cond_size);
and_cond_size++;
}
gda_sql_builder_set_where (b,
- gda_sql_builder_cond_v (b, 0, GDA_SQL_OPERATOR_TYPE_AND, and_cond_ids, and_cond_size));
+ gda_sql_builder_add_cond_v (b, 0, GDA_SQL_OPERATOR_TYPE_AND, and_cond_ids, and_cond_size));
#ifdef GDA_DEBUG_NO
{
GdaSqlStatement *sqlst;
@@ -977,9 +977,9 @@ browser_favorites_delete (BrowserFavorites *bfav, guint session_id,
/* remove entry from favorites' list */
b = gda_sql_builder_new (GDA_SQL_STATEMENT_DELETE);
gda_sql_builder_set_table (b, FAVORITES_TABLE_NAME);
- gda_sql_builder_set_where (b, gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "id"),
- gda_sql_builder_param (b, 0, "id", G_TYPE_INT, FALSE),
+ gda_sql_builder_set_where (b, gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "id"),
+ gda_sql_builder_add_param (b, 0, "id", G_TYPE_INT, FALSE),
0));
stmt = gda_sql_builder_get_statement (b, error);
@@ -999,9 +999,9 @@ browser_favorites_delete (BrowserFavorites *bfav, guint session_id,
/* remove entry from favorites' order */
b = gda_sql_builder_new (GDA_SQL_STATEMENT_DELETE);
gda_sql_builder_set_table (b, FAVORDER_TABLE_NAME);
- gda_sql_builder_set_where (b, gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "fav_id"),
- gda_sql_builder_param (b, 0, "id", G_TYPE_INT, FALSE),
+ gda_sql_builder_set_where (b, gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "fav_id"),
+ gda_sql_builder_add_param (b, 0, "id", G_TYPE_INT, FALSE),
0));
stmt = gda_sql_builder_get_statement (b, error);
@@ -1089,23 +1089,23 @@ browser_favorites_get (BrowserFavorites *bfav, gint fav_id,
b = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "id"), 0);
+ gda_sql_builder_add_id (b, 0, "id"), 0);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "type"), 0);
+ gda_sql_builder_add_id (b, 0, "type"), 0);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "name"), 0);
+ gda_sql_builder_add_id (b, 0, "name"), 0);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "descr"), 0);
+ gda_sql_builder_add_id (b, 0, "descr"), 0);
gda_sql_builder_add_field (b,
- gda_sql_builder_ident (b, 0, "contents"), 0);
+ gda_sql_builder_add_id (b, 0, "contents"), 0);
gda_sql_builder_select_add_target (b, 0,
- gda_sql_builder_ident (b, 0, FAVORITES_TABLE_NAME),
+ gda_sql_builder_add_id (b, 0, FAVORITES_TABLE_NAME),
NULL);
gda_sql_builder_set_where (b,
- gda_sql_builder_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
- gda_sql_builder_ident (b, 0, "id"),
- gda_sql_builder_param (b, 0, "id", G_TYPE_INT, FALSE), 0));
+ gda_sql_builder_add_cond (b, 0, GDA_SQL_OPERATOR_TYPE_EQ,
+ gda_sql_builder_add_id (b, 0, "id"),
+ gda_sql_builder_add_param (b, 0, "id", G_TYPE_INT, FALSE), 0));
stmt = gda_sql_builder_get_statement (b, error);
g_object_unref (G_OBJECT (b));
if (!stmt)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
