From: Andrea Zagli Date: Sat, 5 Jun 2010 06:53:19 +0000 (+0200) Subject: Added username and password to GdaEx::new_from_dsn. X-Git-Tag: 0.2.0~1 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=103db55dbcae7055ea1ee1d462e918851c29e6f1;p=libgdaex Added username and password to GdaEx::new_from_dsn. Some adjustments to gtk-doc. --- diff --git a/.gitignore b/.gitignore index 7ac4dbc..7f42ddd 100644 --- a/.gitignore +++ b/.gitignore @@ -11,11 +11,7 @@ config.status config.sub configure depcomp -docs/Makefile -docs/Makefile.in -docs/reference/Makefile -docs/reference/Makefile.in -docs/reference/version.xml +version.xml gtk-doc.make install-sh libgdaex.pc @@ -24,14 +20,13 @@ ltmain.sh m4/ missing src/.deps/ -src/Makefile -src/Makefile.in stamp-h1 *.stamp docs/reference/html/ docs/reference/xml/ src/.libs/ -src/gdaex.lo -src/gdaex.o -src/libgdaex.la +*.lo +*.o +*.la *.bak +libgdaex*tar* diff --git a/ChangeLog b/ChangeLog index c6e3363..f1a8d3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,15 @@ +commit 04c09a62f54da07928a60d37f08f8d10262e5e6d +Author: Andrea Zagli +Date: 2009-09-27 + + Added support for ChangeLog automatic generation. + +M ChangeLog +M Makefile.am + commit 29da0b572d2affd66cc906d341632c79c2af6db4 Author: Andrea Zagli -Date: 2009-09-06 +Date: 2009-09-06 Adjustments. diff --git a/docs/reference/libgdaex-decl-list.txt b/docs/reference/libgdaex-decl-list.txt index 06d40e3..6eb7503 100644 --- a/docs/reference/libgdaex-decl-list.txt +++ b/docs/reference/libgdaex-decl-list.txt @@ -1,13 +1,14 @@
libgdaex +GdaEx TYPE_GDAEX GDAEX GDAEX_CLASS IS_GDAEX IS_GDAEX_CLASS GDAEX_GET_CLASS -GdaEx GdaEx +GdaExClass gdaex_get_type gdaex_new_from_dsn gdaex_new_from_string diff --git a/docs/reference/libgdaex-decl.txt b/docs/reference/libgdaex-decl.txt index e6f2a09..1b8a3cd 100644 --- a/docs/reference/libgdaex-decl.txt +++ b/docs/reference/libgdaex-decl.txt @@ -45,150 +45,150 @@ struct _GdaExClass gdaex_get_type GType -void +void gdaex_new_from_dsn GdaEx * -const gchar *dsn +const gchar *dsn, const gchar *username, const gchar *password gdaex_new_from_string GdaEx * -const gchar *cnc_string +const gchar *cnc_string gdaex_new_from_connection GdaEx * -GdaConnection *conn +GdaConnection *conn gdaex_get_gdaconnection const GdaConnection * -GdaEx *gdaex +GdaEx *gdaex gdaex_get_provider const gchar * -GdaEx *gdaex +GdaEx *gdaex gdaex_query GdaDataModel * -GdaEx *gdaex, const gchar *sql +GdaEx *gdaex, const gchar *sql gdaex_data_model_get_field_value_stringify_at gchar * -GdaDataModel *data_model,gint row,const gchar *field_name +GdaDataModel *data_model, gint row, const gchar *field_name gdaex_data_model_get_field_value_integer_at gint -GdaDataModel *data_model,gint row,const gchar *field_name +GdaDataModel *data_model, gint row, const gchar *field_name gdaex_data_model_get_field_value_float_at gfloat -GdaDataModel *data_model,gint row,const gchar *field_name +GdaDataModel *data_model, gint row, const gchar *field_name gdaex_data_model_get_field_value_double_at gdouble -GdaDataModel *data_model,gint row,const gchar *field_name +GdaDataModel *data_model, gint row, const gchar *field_name gdaex_data_model_get_field_value_boolean_at gboolean -GdaDataModel *data_model,gint row,const gchar *field_name +GdaDataModel *data_model, gint row, const gchar *field_name gdaex_data_model_get_field_value_gdatimestamp_at GdaTimestamp * -GdaDataModel *data_model,gint row,const gchar *field_name +GdaDataModel *data_model, gint row, const gchar *field_name gdaex_data_model_get_field_value_gdate_at GDate * -GdaDataModel *data_model,gint row,const gchar *field_name +GdaDataModel *data_model, gint row, const gchar *field_name gdaex_data_model_get_field_value_tm_at struct tm * -GdaDataModel *data_model,gint row,const gchar *field_name +GdaDataModel *data_model, gint row, const gchar *field_name gdaex_data_model_get_value_stringify_at gchar * -GdaDataModel *data_model,gint row,gint col +GdaDataModel *data_model, gint row, gint col gdaex_data_model_get_value_integer_at gint -GdaDataModel *data_model,gint row,gint col +GdaDataModel *data_model, gint row, gint col gdaex_data_model_get_value_float_at gfloat -GdaDataModel *data_model,gint row,gint col +GdaDataModel *data_model, gint row, gint col gdaex_data_model_get_value_double_at gdouble -GdaDataModel *data_model,gint row,gint col +GdaDataModel *data_model, gint row, gint col gdaex_data_model_get_value_boolean_at gboolean -GdaDataModel *data_model,gint row,gint col +GdaDataModel *data_model, gint row, gint col gdaex_data_model_get_value_gdatimestamp_at GdaTimestamp * -GdaDataModel *data_model,gint row,gint col +GdaDataModel *data_model, gint row, gint col gdaex_data_model_get_value_gdate_at GDate * -GdaDataModel *data_model,gint row,gint col +GdaDataModel *data_model, gint row, gint col gdaex_data_model_get_value_tm_at struct tm * -GdaDataModel *data_model,gint row,gint col +GdaDataModel *data_model, gint row, gint col gdaex_begin gboolean -GdaEx *gdaex +GdaEx *gdaex gdaex_execute gint -GdaEx *gdaex, const gchar *sql +GdaEx *gdaex, const gchar *sql gdaex_commit gboolean -GdaEx *gdaex +GdaEx *gdaex gdaex_rollback gboolean -GdaEx *gdaex +GdaEx *gdaex gdaex_free void -GdaEx *gdaex +GdaEx *gdaex gdaex_strescape gchar * -const gchar *source, const gchar *exceptions +const gchar *source, const gchar *exceptions gdaex_get_chr_quoting gchar -GdaEx *gdaex +GdaEx *gdaex diff --git a/docs/reference/libgdaex-sections.txt b/docs/reference/libgdaex-sections.txt index 5a6b590..655c362 100644 --- a/docs/reference/libgdaex-sections.txt +++ b/docs/reference/libgdaex-sections.txt @@ -1,29 +1,28 @@
-libgdaobj -GdaO -gdao_new -gdao_new_from_string -gdao_new_from_connection -gdao_get_gdaclient -gdao_get_gdaconnection -gdao_get_provider -gdao_query -gdao_data_model_get_field_value_stringify_at -gdao_data_model_get_field_value_integer_at -gdao_data_model_get_field_value_float_at -gdao_data_model_get_field_value_double_at -gdao_data_model_get_field_value_boolean_at -gdao_data_model_get_field_value_gdate_at -gdao_data_model_get_value_stringify_at -gdao_data_model_get_value_integer_at -gdao_data_model_get_value_float_at -gdao_data_model_get_value_double_at -gdao_data_model_get_value_boolean_at -gdao_data_model_get_value_gdate_at -gdao_begin -gdao_execute -gdao_commit -gdao_rollback -gdao_free +libgdaex +GdaEx +gdaex_new_from_dsn +gdaex_new_from_string +gdaex_new_from_connection +gdaex_get_gdaconnection +gdaex_get_provider +gdaex_query +gdaex_data_model_get_field_value_stringify_at +gdaex_data_model_get_field_value_integer_at +gdaex_data_model_get_field_value_float_at +gdaex_data_model_get_field_value_double_at +gdaex_data_model_get_field_value_boolean_at +gdaex_data_model_get_field_value_gdate_at +gdaex_data_model_get_value_stringify_at +gdaex_data_model_get_value_integer_at +gdaex_data_model_get_value_float_at +gdaex_data_model_get_value_double_at +gdaex_data_model_get_value_boolean_at +gdaex_data_model_get_value_gdate_at +gdaex_begin +gdaex_execute +gdaex_commit +gdaex_rollback +gdaex_free
diff --git a/docs/reference/libgdaex-undeclared.txt b/docs/reference/libgdaex-undeclared.txt index 4035c48..e69de29 100644 --- a/docs/reference/libgdaex-undeclared.txt +++ b/docs/reference/libgdaex-undeclared.txt @@ -1,25 +0,0 @@ -GdaO -gdao_begin -gdao_commit -gdao_data_model_get_field_value_boolean_at -gdao_data_model_get_field_value_double_at -gdao_data_model_get_field_value_float_at -gdao_data_model_get_field_value_gdate_at -gdao_data_model_get_field_value_integer_at -gdao_data_model_get_field_value_stringify_at -gdao_data_model_get_value_boolean_at -gdao_data_model_get_value_double_at -gdao_data_model_get_value_float_at -gdao_data_model_get_value_gdate_at -gdao_data_model_get_value_integer_at -gdao_data_model_get_value_stringify_at -gdao_execute -gdao_free -gdao_get_gdaclient -gdao_get_gdaconnection -gdao_get_provider -gdao_new -gdao_new_from_connection -gdao_new_from_string -gdao_query -gdao_rollback diff --git a/docs/reference/libgdaex-undocumented.txt b/docs/reference/libgdaex-undocumented.txt index 6f2c8c3..5f833c1 100644 --- a/docs/reference/libgdaex-undocumented.txt +++ b/docs/reference/libgdaex-undocumented.txt @@ -1,10 +1,13 @@ -33% symbol docs coverage. -10 symbols documented. -1 symbols incomplete. -20 not documented. +28% symbol docs coverage. +9 symbols documented. +4 symbols incomplete. +23 not documented. -gdaex_data_model_get_field_value_boolean_at (row, field_name) +GdaEx () +gdaex_begin (Returns) +gdaex_commit (Returns) +gdaex_data_model_get_field_value_boolean_at gdaex_data_model_get_field_value_double_at gdaex_data_model_get_field_value_float_at gdaex_data_model_get_field_value_gdate_at @@ -20,10 +23,12 @@ gdaex_data_model_get_value_gdatimestamp_at gdaex_data_model_get_value_integer_at gdaex_data_model_get_value_stringify_at gdaex_data_model_get_value_tm_at +gdaex_free gdaex_get_chr_quoting gdaex_get_gdaconnection gdaex_get_provider gdaex_new_from_string +gdaex_rollback (Returns) -libgdaobj:Short_Description +libgdaex:Short_Description diff --git a/docs/reference/libgdaex-unused.txt b/docs/reference/libgdaex-unused.txt index 1b27fde..5ab5090 100644 --- a/docs/reference/libgdaex-unused.txt +++ b/docs/reference/libgdaex-unused.txt @@ -1,38 +1,14 @@ GDAEX GDAEX_CLASS GDAEX_GET_CLASS -GdaEx GdaExClass IS_GDAEX IS_GDAEX_CLASS TYPE_GDAEX -gdaex_begin -gdaex_commit -gdaex_data_model_get_field_value_boolean_at -gdaex_data_model_get_field_value_double_at -gdaex_data_model_get_field_value_float_at -gdaex_data_model_get_field_value_gdate_at gdaex_data_model_get_field_value_gdatimestamp_at -gdaex_data_model_get_field_value_integer_at -gdaex_data_model_get_field_value_stringify_at gdaex_data_model_get_field_value_tm_at -gdaex_data_model_get_value_boolean_at -gdaex_data_model_get_value_double_at -gdaex_data_model_get_value_float_at -gdaex_data_model_get_value_gdate_at gdaex_data_model_get_value_gdatimestamp_at -gdaex_data_model_get_value_integer_at -gdaex_data_model_get_value_stringify_at gdaex_data_model_get_value_tm_at -gdaex_execute -gdaex_free gdaex_get_chr_quoting -gdaex_get_gdaconnection -gdaex_get_provider gdaex_get_type -gdaex_new_from_connection -gdaex_new_from_dsn -gdaex_new_from_string -gdaex_query -gdaex_rollback gdaex_strescape diff --git a/docs/reference/tmpl/libgdaex-unused.sgml b/docs/reference/tmpl/libgdaex-unused.sgml index fe9fd42..096416e 100644 --- a/docs/reference/tmpl/libgdaex-unused.sgml +++ b/docs/reference/tmpl/libgdaex-unused.sgml @@ -1,24 +1,28 @@ - + + + + + - + - + - + - + libgdaobj diff --git a/docs/reference/tmpl/libgdaex.sgml b/docs/reference/tmpl/libgdaex.sgml index 7711c83..15d6bec 100644 --- a/docs/reference/tmpl/libgdaex.sgml +++ b/docs/reference/tmpl/libgdaex.sgml @@ -17,3 +17,247 @@ libgdaobj + + + + + + + + +@parent: + + + + + + +@dsn: +@username: +@password: +@Returns: + + + + + + + +@cnc_string: +@Returns: + + + + + + + +@conn: +@Returns: + + + + + + + +@gdaex: +@Returns: + + + + + + + +@gdaex: +@Returns: + + + + + + + +@gdaex: +@sql: +@Returns: + + + + + + + +@data_model: +@row: +@field_name: +@Returns: + + + + + + + +@data_model: +@row: +@field_name: +@Returns: + + + + + + + +@data_model: +@row: +@field_name: +@Returns: + + + + + + + +@data_model: +@row: +@field_name: +@Returns: + + + + + + + +@data_model: +@row: +@field_name: +@Returns: + + + + + + + +@data_model: +@row: +@field_name: +@Returns: + + + + + + + +@data_model: +@row: +@col: +@Returns: + + + + + + + +@data_model: +@row: +@col: +@Returns: + + + + + + + +@data_model: +@row: +@col: +@Returns: + + + + + + + +@data_model: +@row: +@col: +@Returns: + + + + + + + +@data_model: +@row: +@col: +@Returns: + + + + + + + +@data_model: +@row: +@col: +@Returns: + + + + + + + +@gdaex: +@Returns: + + + + + + + +@gdaex: +@sql: +@Returns: + + + + + + + +@gdaex: +@Returns: + + + + + + + +@gdaex: +@Returns: + + + + + + + +@gdaex: + + diff --git a/docs/reference/tmpl/libgdaobj.sgml b/docs/reference/tmpl/libgdaobj.sgml deleted file mode 100644 index 7711c83..0000000 --- a/docs/reference/tmpl/libgdaobj.sgml +++ /dev/null @@ -1,19 +0,0 @@ - -libgdaobj - - - - - - - - - - - - - - - - - diff --git a/src/gdaex.c b/src/gdaex.c index 028862e..4d7142e 100644 --- a/src/gdaex.c +++ b/src/gdaex.c @@ -1,7 +1,7 @@ /* * gdaex.c * - * Copyright (C) 2005-2009 Andrea Zagli + * Copyright (C) 2005-2010 Andrea Zagli * * This file is part of libgdaex. * @@ -87,13 +87,16 @@ static GdaEx * If @username and @password are both NULL or empty, it will be used those * defined into datasource. * - * Return value: the newly created #GdaEx. + * Returns: the newly created #GdaEx. */ GdaEx -*gdaex_new_from_dsn (const gchar *dsn) +*gdaex_new_from_dsn (const gchar *dsn, const gchar *username, const gchar *password) { GdaEx *gdaex; GdaExPrivate *priv; + gchar *new_user; + gchar *new_pwd; + gchar *auth_string; GError *error; @@ -113,10 +116,55 @@ GdaEx priv = GDAEX_GET_PRIVATE (gdaex); + auth_string = NULL; + new_user = NULL; + new_pwd = NULL; + + if (username != NULL) + { + new_user = g_strstrip (g_strdup (username)); + if (g_strcmp0 (new_user, "") != 0) + { + new_user = gda_rfc1738_encode (new_user); + } + else + { + new_user = NULL; + } + } + if (password != NULL) + { + new_pwd = g_strstrip (g_strdup (password)); + if (g_strcmp0 (new_pwd, "") != 0) + { + new_pwd = gda_rfc1738_encode (new_pwd); + } + else + { + new_pwd = NULL; + } + } + + if (new_user != NULL || new_pwd != NULL) + { + auth_string = g_strdup (""); + if (new_user != NULL) + { + auth_string = g_strdup_printf ("USERNAME=%s", new_user); + } + if (new_pwd != NULL) + { + auth_string = g_strconcat (auth_string, + (new_user != NULL ? ";" : ""), + g_strdup_printf ("PASSWORD=%s", new_pwd), + NULL); + } + } + /* open database connection */ error = NULL; priv->gda_conn = gda_connection_open_from_dsn (dsn, - NULL, + auth_string, GDA_CONNECTION_OPTIONS_NONE, &error); if (error != NULL) @@ -133,7 +181,7 @@ GdaEx * gdaex_new_from_string: * @cnc_string: the connection string. * - * Return value: the newly created #GdaEx. + * Returns: the newly created #GdaEx. */ GdaEx *gdaex_new_from_string (const gchar *cnc_string) @@ -181,7 +229,7 @@ GdaEx * * Returns a #GdaEx from an existing #GdaConnection. * - * Return value: the newly created #GdaEx. + * Returns: the newly created #GdaEx. */ GdaEx *gdaex_new_from_connection (GdaConnection *conn) @@ -204,7 +252,7 @@ GdaEx * gdaex_get_gdaconnection: * @gdaex: a #GdaEx object. * - * Return value: the #GdaConnection associated to the #GdaEx. + * Returns: the #GdaConnection associated to the #GdaEx. */ const GdaConnection *gdaex_get_gdaconnection (GdaEx *gdaex) @@ -220,7 +268,7 @@ const GdaConnection * gdaex_get_provider: * @gdaex: a #GdaEx object. * - * Return value: the provider id associated to the #GdaEx. + * Returns: the provider id associated to the #GdaEx. */ const gchar *gdaex_get_provider (GdaEx *gdaex) @@ -239,7 +287,7 @@ const gchar * * Execute a selection query (SELECT). * - * Return value: a #GdaDataModel, or #NULL if query fails. + * Returns: a #GdaDataModel, or #NULL if query fails. */ GdaDataModel *gdaex_query (GdaEx *gdaex, const gchar *sql) @@ -267,7 +315,7 @@ GdaDataModel * gdaex_data_model_get_field_value_stringify_at: * @data_model: a #GdaDataModel object. * @row: - * @field_name: + * @field_name: the field's name. * * Returns: the @field_name's #GValue as #gchar (stringify) */ @@ -302,7 +350,7 @@ gchar * gdaex_data_model_get_field_value_integer_at: * @data_model: a #GdaDataModel object. * @row: - * @field_name: + * @field_name: the field's name. * * Returns: the @field_name's #GValue as #gint */ @@ -332,7 +380,7 @@ gdaex_data_model_get_field_value_integer_at (GdaDataModel *data_model, * gdaex_data_model_get_field_value_float_at: * @data_model: a #GdaDataModel object. * @row: - * @field_name: + * @field_name: the field's name. * * Returns: the @field_name's #GValue as #gfloat */ @@ -362,7 +410,7 @@ gdaex_data_model_get_field_value_float_at (GdaDataModel *data_model, * gdaex_data_model_get_field_value_double_at: * @data_model: a #GdaDataModel object. * @row: - * @field_name: + * @field_name: the field's name. * * Returns: the @field_name's #GValue as #gdouble */ @@ -392,9 +440,9 @@ gdaex_data_model_get_field_value_double_at (GdaDataModel *data_model, * gdaex_data_model_get_field_value_boolean_at: * @data_model: a #GdaDataModel object. * @row: - * @field_name: + * @field_name: the field's name. * - * return the @field_name's #GValue as #gboolean + * Returns: the @field_name's #GValue as #gboolean */ gboolean gdaex_data_model_get_field_value_boolean_at (GdaDataModel *data_model, @@ -422,7 +470,7 @@ gdaex_data_model_get_field_value_boolean_at (GdaDataModel *data_model, * gdaex_data_model_get_field_value_gdatimestamp_at: * @data_model: a #GdaDataModel object. * @row: - * @field_name: + * @field_name: the field's name. * * Returns: the @field_name's #GValue as #GdaTimestamp. */ @@ -457,7 +505,7 @@ GdaTimestamp * gdaex_data_model_get_field_value_gdate_at: * @data_model: a #GdaDataModel object. * @row: - * @field_name: + * @field_name: the field's name. * * Returns: the @field_name's #GValue as #GDate. */ @@ -493,7 +541,7 @@ GDate * gdaex_data_model_get_field_value_tm_at: * @data_model: a #GdaDataModel object. * @row: - * @field_name: + * @field_name: the field's name. * * Returns: the @field_name's value as a struct tm. */ @@ -898,6 +946,8 @@ struct tm * @gdaex: a #GdaEx object. * * Begin a new transaction. + * + * Returns: TRUE if there isn't errors. */ gboolean gdaex_begin (GdaEx *gdaex) @@ -930,7 +980,7 @@ gdaex_begin (GdaEx *gdaex) * * Execute a command query (INSERT, UPDATE, DELETE). * - * Return value: number of records affected by the query execution. + * Returns: number of records affected by the query execution. */ gint gdaex_execute (GdaEx *gdaex, const gchar *sql) @@ -960,6 +1010,8 @@ gdaex_execute (GdaEx *gdaex, const gchar *sql) * @gdaex: a #GdaEx object. * * Commit a transaction. + * + * Returns: TRUE if there isn't errors. */ gboolean gdaex_commit (GdaEx *gdaex) @@ -1000,6 +1052,8 @@ gdaex_commit (GdaEx *gdaex) * @gdaex: a #GdaEx object. * * Rollback a transaction. + * + * Returns: TRUE if there isn't errors. */ gboolean gdaex_rollback (GdaEx *gdaex) diff --git a/src/libgdaex.h b/src/libgdaex.h index 793ec63..3e3be89 100644 --- a/src/libgdaex.h +++ b/src/libgdaex.h @@ -56,7 +56,9 @@ struct _GdaExClass GType gdaex_get_type (void) G_GNUC_CONST; -GdaEx *gdaex_new_from_dsn (const gchar *dsn); +GdaEx *gdaex_new_from_dsn (const gchar *dsn, + const gchar *username, + const gchar *password); GdaEx *gdaex_new_from_string (const gchar *cnc_string); GdaEx *gdaex_new_from_connection (GdaConnection *conn);