libgda r3305 - in trunk: . doc/C doc/C/tmpl libgda libgda-report/DocBook libgda-report/RML libgda/handlers libgda/sql-parser libgda/sqlite libgda/sqlite/virtual providers/postgres
- From: vivien svn gnome org
- To: svn-commits-list gnome org
- Subject: libgda r3305 - in trunk: . doc/C doc/C/tmpl libgda libgda-report/DocBook libgda-report/RML libgda/handlers libgda/sql-parser libgda/sqlite libgda/sqlite/virtual providers/postgres
- Date: Wed, 28 Jan 2009 21:11:02 +0000 (UTC)
Author: vivien
Date: Wed Jan 28 21:11:02 2009
New Revision: 3305
URL: http://svn.gnome.org/viewvc/libgda?rev=3305&view=rev
Log:
2009-01-28 Vivien Malerba <malerba gnome-db org>
* libgda/sqlite/virtual/gda-vconnection-hub.h:
* libgda/gda-easy.c:
* libgda/sql-parser/gda-statement-struct.c:
* libgda/sql-parser/gda-statement-struct-parts.h:
* libgda/gda-set.h:
* libgda/gda-server-provider.c:
* libgda/gda-server-provider-extra.c:
* libgda-report/DocBook/gda-report-docbook-document.c:
* libgda-report/RML/gda-report-rml-document.c:
* libgda/gda-meta-struct.c:
* libgda/gda-holder.[ch]:
* libgda/gda-data-model-array.c:
* libgda/gda-data-model.c:
* libgda/gda-data-model-bdb.c:
* libgda/gda-column.h: doc updates
* libgda/libgda.symbols:
* providers/postgres/gda-postgres-handler-bin.c:
* libgda/sqlite/gda-sqlite-handler-bin.c:
* libgda/gda-column.h:
* libgda/handlers/gda-handler-time.c:
* libgda/handlers/gda-handler-boolean.c:
* libgda/handlers/gda-handler-numerical.c:
* libgda/handlers/gda-handler-type.c:
* libgda/handlers/gda-handler-string.c:
* libgda/handlers/gda-handler-bin.c:
* libgda/gda-data-handler.c:
* libgda/gda-data-handler.h: removed unused methods
Modified:
trunk/ChangeLog
trunk/doc/C/libgda-4.0-sections.txt
trunk/doc/C/tmpl/gda-column.sgml
trunk/doc/C/tmpl/gda-data-handler.sgml
trunk/libgda-report/DocBook/gda-report-docbook-document.c
trunk/libgda-report/RML/gda-report-rml-document.c
trunk/libgda/gda-column.h
trunk/libgda/gda-data-handler.c
trunk/libgda/gda-data-handler.h
trunk/libgda/gda-data-model-array.c
trunk/libgda/gda-data-model-bdb.c
trunk/libgda/gda-data-model.c
trunk/libgda/gda-data-proxy.c
trunk/libgda/gda-easy.c
trunk/libgda/gda-holder.c
trunk/libgda/gda-holder.h
trunk/libgda/gda-meta-store.c
trunk/libgda/gda-meta-struct.h
trunk/libgda/gda-server-operation.c
trunk/libgda/gda-server-provider-extra.c
trunk/libgda/gda-server-provider.c
trunk/libgda/gda-set.h
trunk/libgda/handlers/gda-handler-bin.c
trunk/libgda/handlers/gda-handler-boolean.c
trunk/libgda/handlers/gda-handler-numerical.c
trunk/libgda/handlers/gda-handler-string.c
trunk/libgda/handlers/gda-handler-time.c
trunk/libgda/handlers/gda-handler-type.c
trunk/libgda/libgda.symbols
trunk/libgda/sql-parser/gda-statement-struct-parts.h
trunk/libgda/sql-parser/gda-statement-struct.c
trunk/libgda/sqlite/gda-sqlite-handler-bin.c
trunk/libgda/sqlite/virtual/gda-vconnection-hub.h
trunk/providers/postgres/gda-postgres-handler-bin.c
Modified: trunk/doc/C/libgda-4.0-sections.txt
==============================================================================
--- trunk/doc/C/libgda-4.0-sections.txt (original)
+++ trunk/doc/C/libgda-4.0-sections.txt Wed Jan 28 21:11:02 2009
@@ -792,9 +792,7 @@
gda_data_handler_get_value_from_sql
gda_data_handler_get_value_from_str
gda_data_handler_get_sane_init_value
-gda_data_handler_get_nb_g_types
gda_data_handler_accepts_g_type
-gda_data_handler_get_g_type_index
gda_data_handler_get_descr
<SUBSECTION Standard>
GDA_DATA_HANDLER
Modified: trunk/doc/C/tmpl/gda-column.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-column.sgml (original)
+++ trunk/doc/C/tmpl/gda-column.sgml Wed Jan 28 21:11:02 2009
@@ -6,7 +6,8 @@
<!-- ##### SECTION Long_Description ##### -->
<para>
-
+ The #GdaColumn object represents a #GdaDataModel's column and
+ handle all its properties.
</para>
<!-- ##### SECTION See_Also ##### -->
Modified: trunk/doc/C/tmpl/gda-data-handler.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-data-handler.sgml (original)
+++ trunk/doc/C/tmpl/gda-data-handler.sgml Wed Jan 28 21:11:02 2009
@@ -97,15 +97,6 @@
@Returns:
-<!-- ##### FUNCTION gda_data_handler_get_nb_g_types ##### -->
-<para>
-
-</para>
-
- dh:
- Returns:
-
-
<!-- ##### FUNCTION gda_data_handler_accepts_g_type ##### -->
<para>
@@ -116,16 +107,6 @@
@Returns:
-<!-- ##### FUNCTION gda_data_handler_get_g_type_index ##### -->
-<para>
-
-</para>
-
- dh:
- index:
- Returns:
-
-
<!-- ##### FUNCTION gda_data_handler_get_descr ##### -->
<para>
Modified: trunk/libgda-report/DocBook/gda-report-docbook-document.c
==============================================================================
--- trunk/libgda-report/DocBook/gda-report-docbook-document.c (original)
+++ trunk/libgda-report/DocBook/gda-report-docbook-document.c Wed Jan 28 21:11:02 2009
@@ -238,9 +238,9 @@
/**
* gda_report_docbook_document_new
- * @fo_file: a FO file name, or %NULL
+ * @engine: a #GdaReportEngine, or %NULL
*
- * Creates a new #GdaReportDocbookDocument using @fo_file as a base
+ * Creates a new #GdaReportDocbookDocument using @engine if specified
*
* Returns: a new #GdaReportDocbookDocument object
*/
Modified: trunk/libgda-report/RML/gda-report-rml-document.c
==============================================================================
--- trunk/libgda-report/RML/gda-report-rml-document.c (original)
+++ trunk/libgda-report/RML/gda-report-rml-document.c Wed Jan 28 21:11:02 2009
@@ -168,9 +168,9 @@
/**
* gda_report_rml_document_new
- * @rml_file: a RML file name, or %NULL
+ * @engine: a #GdaReportEngine, or %NULL
*
- * Creates a new #GdaReportRmlDocument using @rml_file as a base
+ * Creates a new #GdaReportRmlDocument using @engine if specified
*
* Returns: a new #GdaReportRmlDocument object
*/
Modified: trunk/libgda/gda-column.h
==============================================================================
--- trunk/libgda/gda-column.h (original)
+++ trunk/libgda/gda-column.h Wed Jan 28 21:11:02 2009
@@ -86,6 +86,9 @@
/**
* gda_column_set_attribute_static
+ * @holder: a #GdaHolder
+ * @attribute: attribute's name
+ * @value: the value to set the attribute to, or %NULL
*
* This function is similar to gda_column_set_attribute() but for static strings
*/
Modified: trunk/libgda/gda-data-handler.c
==============================================================================
--- trunk/libgda/gda-data-handler.c (original)
+++ trunk/libgda/gda-data-handler.c Wed Jan 28 21:11:02 2009
@@ -118,8 +118,8 @@
/**
* gda_data_handler_get_value_from_sql
* @dh: an object which implements the #GdaDataHandler interface
- * @sql:
- * @type:
+ * @sql: an SQL string
+ * @type: a GType
*
* Creates a new GValue which represents the SQL value given as argument. This is
* the opposite of the function gda_data_handler_get_sql_from_value(). The type argument
@@ -150,8 +150,8 @@
/**
* gda_data_handler_get_value_from_str
* @dh: an object which implements the #GdaDataHandler interface
- * @str:
- * @type:
+ * @str: a string
+ * @type: a GType
*
* Creates a new GValue which represents the STR value given as argument. This is
* the opposite of the function gda_data_handler_get_str_from_value(). The type argument
@@ -188,7 +188,7 @@
/**
* gda_data_handler_get_sane_init_value
* @dh: an object which implements the #GdaDataHandler interface
- * @type:
+ * @type: a GTYpe
*
* Creates a new GValue which holds a sane initial value to be used if no value is specifically
* provided. For example for a simple string, this would return a new value containing the "" string.
@@ -208,28 +208,9 @@
}
/**
- * gda_data_handler_get_nb_g_types
- * @dh: an object which implements the #GdaDataHandler interface
- *
- * Get the number of GType types the GdaDataHandler can handle correctly
- *
- * Returns: the number.
- */
-guint
-gda_data_handler_get_nb_g_types (GdaDataHandler *dh)
-{
- g_return_val_if_fail (dh && GDA_IS_DATA_HANDLER (dh), 0);
-
- if (GDA_DATA_HANDLER_GET_IFACE (dh)->get_nb_g_types)
- return (GDA_DATA_HANDLER_GET_IFACE (dh)->get_nb_g_types) (dh);
-
- return 0;
-}
-
-/**
* gda_data_handler_accepts_g_type
* @dh: an object which implements the #GdaDataHandler interface
- * @type:
+ * @type: a #GType
*
* Checks wether the GdaDataHandler is able to handle the gda type given as argument.
*
@@ -247,28 +228,6 @@
}
/**
- * gda_data_handler_get_g_type_index
- * @dh: an object which implements the #GdaDataHandler interface
- * @index:
- *
- * Get the GType handled by the GdaDataHandler, at the given position (starting at zero).
- *
- * Returns: the GType
- */
-GType
-gda_data_handler_get_g_type_index (GdaDataHandler *dh, guint index)
-{
- g_return_val_if_fail (dh && GDA_IS_DATA_HANDLER (dh), G_TYPE_INVALID);
- g_return_val_if_fail (index < gda_data_handler_get_nb_g_types (dh),
- G_TYPE_INVALID);
-
- if (GDA_DATA_HANDLER_GET_IFACE (dh)->get_g_type_index)
- return (GDA_DATA_HANDLER_GET_IFACE (dh)->get_g_type_index) (dh, index);
-
- return G_TYPE_INVALID;
-}
-
-/**
* gda_data_handler_get_descr
* @dh: an object which implements the #GdaDataHandler interface
*
Modified: trunk/libgda/gda-data-handler.h
==============================================================================
--- trunk/libgda/gda-data-handler.h (original)
+++ trunk/libgda/gda-data-handler.h Wed Jan 28 21:11:02 2009
@@ -46,8 +46,6 @@
GValue *(* get_value_from_str) (GdaDataHandler *dh, const gchar *str, GType type);
GValue *(* get_sane_init_value) (GdaDataHandler *dh, GType type);
- guint (* get_nb_g_types) (GdaDataHandler *dh);
- GType (* get_g_type_index) (GdaDataHandler *dh, guint index);
gboolean (* accepts_g_type) (GdaDataHandler *dh, GType type);
const gchar *(* get_descr) (GdaDataHandler *dh);
};
@@ -65,8 +63,6 @@
GValue *gda_data_handler_get_sane_init_value (GdaDataHandler *dh, GType type);
/* information about the data handler itself */
-guint gda_data_handler_get_nb_g_types (GdaDataHandler *dh);
-GType gda_data_handler_get_g_type_index (GdaDataHandler *dh, guint index);
gboolean gda_data_handler_accepts_g_type (GdaDataHandler *dh, GType type);
const gchar *gda_data_handler_get_descr (GdaDataHandler *dh);
Modified: trunk/libgda/gda-data-model-array.c
==============================================================================
--- trunk/libgda/gda-data-model-array.c (original)
+++ trunk/libgda/gda-data-model-array.c Wed Jan 28 21:11:02 2009
@@ -370,7 +370,7 @@
/**
* gda_data_model_array_get_row
* @model: a #GdaDataModelArray object
- * @row:
+ * @row: row number (starting from 0)
* @error: a place to store errors, or %NULL
*
* Get a pointer to a row in @model
Modified: trunk/libgda/gda-data-model-bdb.c
==============================================================================
--- trunk/libgda/gda-data-model-bdb.c (original)
+++ trunk/libgda/gda-data-model-bdb.c Wed Jan 28 21:11:02 2009
@@ -417,7 +417,7 @@
/**
* gda_data_model_bdb_new
- * @filename:
+ * @filename: name of the file containing the database
* @db_name: the name of the database within @filename, or %NULL
*
* Creates a new #GdaDataModel object to access the contents of the Berkeley DB file @file,
Modified: trunk/libgda/gda-data-model.c
==============================================================================
--- trunk/libgda/gda-data-model.c (original)
+++ trunk/libgda/gda-data-model.c Wed Jan 28 21:11:02 2009
@@ -750,12 +750,18 @@
* Creates a new iterator object #GdaDataModelIter object which can be used to iterate through
* rows in @model.
*
- * The row the returned #GdaDataModelIter represents is undefined. For models which can be accessed
- * randomly the corresponding row can be set using gda_data_model_iter_move_to_row(),
- * and for models which are accessible sequentially only then the first row will be
- * fetched using gda_data_model_iter_move_next().
+ * Depending on the data model's implementation, a new #GdaDataModelIter object may be created,
+ * or a reference to an already existing #GdaDataModelIter may be returned.
*
- * Returns: a new #GdaDataModelIter object, or %NULL if an error occurred
+ * If a new #GdaDataModelIter is created, then the row it represents is undefined.
+ *
+ * For models which can be accessed
+ * randomly, any row can be set using gda_data_model_iter_move_to_row(),
+ * and for models which are accessible sequentially only then use
+ * gda_data_model_iter_move_next() (and gda_data_model_iter_move_prev() if
+ * supported).
+ *
+ * Returns: a #GdaDataModelIter object, or %NULL if an error occurred
*/
GdaDataModelIter *
gda_data_model_create_iter (GdaDataModel *model)
@@ -1474,6 +1480,7 @@
* gda_data_model_add_data_from_xml_node
* @model: a #GdaDataModel.
* @node: an XML node representing a <gda_array_data> XML node.
+ * @error: a place to store errors, or %NULL
*
* Adds the data from an XML node to the given data model (see the DTD for that node
* in the $prefix/share/libgda/dtd/libgda-array.dtd file).
Modified: trunk/libgda/gda-data-proxy.c
==============================================================================
--- trunk/libgda/gda-data-proxy.c (original)
+++ trunk/libgda/gda-data-proxy.c Wed Jan 28 21:11:02 2009
@@ -1259,13 +1259,15 @@
* gda_data_proxy_get_values
* @proxy: a #GdaDataProxy object
* @proxy_row: a proxy row
- * @cols_index:
- * @n_cols:
+ * @cols_index: array containing the columns for which the values are requested
+ * @n_cols: size of @cols_index
*
- * Retreive a whole list of values from the @proxy store. This function calls gda_data_proxy_get_value()
- * for each column index specified in @cols_index, and generates a #GSlist on the way.
+ * Retreive a whole list of values from the @proxy data model. This function
+ * calls gda_data_proxy_get_value()
+ * for each column index specified in @cols_index, and generates a #GSList on the way.
*
- * Returns: a new list of values (the list must be freed, not the values), or %NULL if an error occurred
+ * Returns: a new list of values (the list must be freed, not the values),
+ * or %NULL if an error occurred
*/
GSList *
gda_data_proxy_get_values (GdaDataProxy *proxy, gint proxy_row, gint *cols_index, gint n_cols)
Modified: trunk/libgda/gda-easy.c
==============================================================================
--- trunk/libgda/gda-easy.c (original)
+++ trunk/libgda/gda-easy.c Wed Jan 28 21:11:02 2009
@@ -725,7 +725,7 @@
* @condition_column_name: the name of the column to used in the WHERE condition clause
* @condition_value: the @condition_column_type's GType
* @error: a place to store errors, or %NULL
- * ...: a list of string/GValue pairs with the name of the column to use and the
+ * @...: a list of string/GValue pairs with the name of the column to use and the
* GValue pointer containing the value to update the column to (value can be %NULL), finished by a %NULL. There must be
* at least one column name and value
*
Modified: trunk/libgda/gda-holder.c
==============================================================================
--- trunk/libgda/gda-holder.c (original)
+++ trunk/libgda/gda-holder.c Wed Jan 28 21:11:02 2009
@@ -400,8 +400,8 @@
* @id: the id of the holder to create, or %NULL
* @...: value to set
*
- * Creates a new #GdaHolder object named @name, of type @type, and containing the value passed
- * as the last argument.
+ * Creates a new #GdaHolder object with an ID set to @id, of type @type,
+ * and containing the value passed as the last argument.
*
* Note that this function is a utility function and that anly a limited set of types are supported. Trying
* to use an unsupported type will result in a warning, and the returned value holder holding a safe default
@@ -1384,7 +1384,7 @@
/**
* gda_holder_set_not_null
* @holder: a #GdaHolder object
- * @not_null:
+ * @not_null: TRUE if @holder should not accept %NULL values
*
* Sets if the holder can have a NULL value. If @not_null is TRUE, then that won't be allowed
*/
@@ -1492,10 +1492,13 @@
* gda_holder_set_bind
* @holder: a #GdaHolder
* @bind_to: a #GdaHolder or %NULL
+ * @error: a place to store errors, or %NULL
*
* Sets @holder to change when @bind_to changes (and does not make @bind_to change when @holder changes).
*
* If @bind_to is %NULL, then @holder will not be bound anymore.
+ *
+ * Returns: TRUE if no error occurred
*/
gboolean
gda_holder_set_bind (GdaHolder *holder, GdaHolder *bind_to, GError **error)
Modified: trunk/libgda/gda-holder.h
==============================================================================
--- trunk/libgda/gda-holder.h (original)
+++ trunk/libgda/gda-holder.h Wed Jan 28 21:11:02 2009
@@ -68,8 +68,40 @@
GType gda_holder_get_g_type (GdaHolder *holder);
const gchar *gda_holder_get_id (GdaHolder *holder);
+/**
+ * gda_holder_new_string
+ * @id: a string
+ * @str: a string
+ *
+ * Creates a new boolean #GdaHolder object with an ID set to @id, and a value initialized to
+ * @str.
+ *
+ * Returns: a new #GdaHolder
+ */
#define gda_holder_new_string(id,str) gda_holder_new_inline (G_TYPE_STRING, (id), (str))
+
+/**
+ * gda_holder_new_boolean
+ * @id: a string
+ * @abool: a boolean value
+ *
+ * Creates a new boolean #GdaHolder object with an ID set to @id, and a value initialized to
+ * @abool.
+ *
+ * Returns: a new #GdaHolder
+ */
#define gda_holder_new_boolean(id,abool) gda_holder_new_inline (G_TYPE_BOOLEAN, (id), (abool))
+
+/**
+ * gda_holder_new_int
+ * @id: a string
+ * @anint: an int value
+ *
+ * Creates a new boolean #GdaHolder object with an ID set to @id, and a value initialized to
+ * @anint.
+ *
+ * Returns: a new #GdaHolder
+ */
#define gda_holder_new_int(id,anint) gda_holder_new_inline (G_TYPE_INT, (id), (anint))
const GValue *gda_holder_get_value (GdaHolder *holder);
@@ -104,6 +136,9 @@
/**
* gda_holder_set_attribute_static
+ * @holder: a #GdaHolder
+ * @attribute: attribute's name
+ * @value: a #GValue, or %NULL
*
* This function is similar to gda_holder_set_attribute() but for static strings
*/
Modified: trunk/libgda/gda-meta-store.c
==============================================================================
--- trunk/libgda/gda-meta-store.c (original)
+++ trunk/libgda/gda-meta-store.c Wed Jan 28 21:11:02 2009
@@ -592,21 +592,21 @@
/**
* gda_meta_store_new
- * @string: a connection string, or %NULL for an in-memory internal database
+ * @cnc_string: a connection string, or %NULL for an in-memory internal database
*
* Create a new #GdaMetaStore object.
*
* Returns: the newly created object, or %NULL if an error occurred
*/
GdaMetaStore *
-gda_meta_store_new (const gchar *string)
+gda_meta_store_new (const gchar *cnc_string)
{
GObject *obj;
GdaMetaStore *store;
g_static_rec_mutex_lock (&init_mutex);
- if (string)
- obj = g_object_new (GDA_TYPE_META_STORE, "cnc-string", string, NULL);
+ if (cnc_string)
+ obj = g_object_new (GDA_TYPE_META_STORE, "cnc-string", cnc_string, NULL);
else
obj = g_object_new (GDA_TYPE_META_STORE, "cnc-string", "SQLite://DB_NAME=__gda_tmp", NULL);
g_static_rec_mutex_unlock (&init_mutex);
Modified: trunk/libgda/gda-meta-struct.h
==============================================================================
--- trunk/libgda/gda-meta-struct.h (original)
+++ trunk/libgda/gda-meta-struct.h Wed Jan 28 21:11:02 2009
@@ -154,10 +154,13 @@
GDestroyNotify destroy);
/**
* gda_meta_table_column_set_attribute_static
+ * @column: a #GdaMetaTableColumn
+ * @attribute: attribute's name
+ * @value: a #GValue, or %NULL
*
* This function is similar to gda_meta_table_column_set_attribute() but for static strings
*/
-#define gda_meta_table_column_set_attribute_static(holder,attribute,value) gda_meta_table_column_set_attribute((holder),(attribute),(value),NULL)
+#define gda_meta_table_column_set_attribute_static(column,attribute,value) gda_meta_table_column_set_attribute((column),(attribute),(value),NULL)
void gda_meta_table_column_foreach_attribute (GdaMetaTableColumn *tcol, GdaAttributesManagerFunc func, gpointer data);
Modified: trunk/libgda/gda-server-operation.c
==============================================================================
--- trunk/libgda/gda-server-operation.c (original)
+++ trunk/libgda/gda-server-operation.c Wed Jan 28 21:11:02 2009
@@ -955,6 +955,7 @@
/**
* gda_server_operation_new
+ * @op_type: type of operation
* @xml_file: a file which has the specifications for the GdaServerOperation object to create
*
* IMPORTANT NOTE: Using this funtion is not the recommended way of creating a #GdaServerOperation object, the
Modified: trunk/libgda/gda-server-provider-extra.c
==============================================================================
--- trunk/libgda/gda-server-provider-extra.c (original)
+++ trunk/libgda/gda-server-provider-extra.c Wed Jan 28 21:11:02 2009
@@ -37,7 +37,7 @@
/**
* gda_server_provider_internal_get_parser
- * @prov:
+ * @prov: a #GdaServerProvider
*
* This is a factory method to get a unique instance of a #GdaSqlParser object
* for each #GdaServerProvider object
Modified: trunk/libgda/gda-server-provider.c
==============================================================================
--- trunk/libgda/gda-server-provider.c (original)
+++ trunk/libgda/gda-server-provider.c Wed Jan 28 21:11:02 2009
@@ -742,6 +742,7 @@
* @cnc: a #GdaConnection object, or %NULL
* @string: the SQL string to convert to a value
* @preferred_type: a #GType, or G_TYPE_INVALID
+ * @dbms_type: place to get the actual database type used if the conversion succeeded, or %NULL
*
* Use @provider to create a new #GValue from a single string representation.
*
@@ -754,6 +755,10 @@
* - the provider does not handle @preferred_type
* - the provider could not make a #GValue from @string
*
+ * If @dbms_type is not %NULL, then if will contain a constant string representing
+ * the database type used for the conversion if the conversion was successfull, or %NULL
+ * otherwise.
+ *
* Returns: a new #GValue, or %NULL
*/
GValue *
@@ -767,6 +772,9 @@
g_return_val_if_fail (GDA_IS_SERVER_PROVIDER (provider), NULL);
g_return_val_if_fail (!cnc || GDA_IS_CONNECTION (cnc), NULL);
+ if (dbms_type)
+ *dbms_type = NULL;
+
if (cnc)
gda_lockable_lock ((GdaLockable*) cnc);
if (preferred_type != G_TYPE_INVALID) {
Modified: trunk/libgda/gda-set.h
==============================================================================
--- trunk/libgda/gda-set.h (original)
+++ trunk/libgda/gda-set.h Wed Jan 28 21:11:02 2009
@@ -136,10 +136,10 @@
gboolean gda_set_is_valid (GdaSet *set, GError **error);
/* public data lookup functions */
-GdaSetNode *gda_set_get_node (GdaSet *set, GdaHolder *param);
+GdaSetNode *gda_set_get_node (GdaSet *set, GdaHolder *holder);
GdaSetSource *gda_set_get_source_for_model (GdaSet *set, GdaDataModel *model);
-GdaSetSource *gda_set_get_source (GdaSet *set, GdaHolder *param);
-GdaSetGroup *gda_set_get_group (GdaSet *set, GdaHolder *param);
+GdaSetSource *gda_set_get_source (GdaSet *set, GdaHolder *holder);
+GdaSetGroup *gda_set_get_group (GdaSet *set, GdaHolder *holder);
G_END_DECLS
Modified: trunk/libgda/handlers/gda-handler-bin.c
==============================================================================
--- trunk/libgda/handlers/gda-handler-bin.c (original)
+++ trunk/libgda/handlers/gda-handler-bin.c Wed Jan 28 21:11:02 2009
@@ -1,6 +1,6 @@
/* gda-handler-bin.c
*
- * Copyright (C) 2005 - 2008 Vivien Malerba
+ * Copyright (C) 2005 - 2009 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -38,8 +38,6 @@
GType type);
static GValue *gda_handler_bin_get_value_from_str (GdaDataHandler *dh, const gchar *sql,
GType type);
-static guint gda_handler_bin_get_nb_g_types (GdaDataHandler *dh);
-static GType gda_handler_bin_get_g_type_index (GdaDataHandler *dh, guint index);
static gboolean gda_handler_bin_accepts_g_type (GdaDataHandler * dh, GType type);
static const gchar *gda_handler_bin_get_descr (GdaDataHandler *dh);
@@ -96,9 +94,7 @@
iface->get_value_from_sql = gda_handler_bin_get_value_from_sql;
iface->get_value_from_str = gda_handler_bin_get_value_from_str;
iface->get_sane_init_value = NULL;
- iface->get_nb_g_types = gda_handler_bin_get_nb_g_types;
iface->accepts_g_type = gda_handler_bin_accepts_g_type;
- iface->get_g_type_index = gda_handler_bin_get_g_type_index;
iface->get_descr = gda_handler_bin_get_descr;
}
@@ -286,19 +282,6 @@
return value;
}
-static guint
-gda_handler_bin_get_nb_g_types (GdaDataHandler *iface)
-{
- GdaHandlerBin *hdl;
-
- g_return_val_if_fail (iface && GDA_IS_HANDLER_BIN (iface), 0);
- hdl = GDA_HANDLER_BIN (iface);
- g_return_val_if_fail (hdl->priv, 0);
-
- return hdl->priv->nb_g_types;
-}
-
-
static gboolean
gda_handler_bin_accepts_g_type (GdaDataHandler *iface, GType type)
{
@@ -320,19 +303,6 @@
return found;
}
-static GType
-gda_handler_bin_get_g_type_index (GdaDataHandler *iface, guint index)
-{
- GdaHandlerBin *hdl;
-
- g_return_val_if_fail (iface && GDA_IS_HANDLER_BIN (iface), G_TYPE_INVALID);
- hdl = GDA_HANDLER_BIN (iface);
- g_return_val_if_fail (hdl->priv, G_TYPE_INVALID);
- g_return_val_if_fail (index < hdl->priv->nb_g_types, G_TYPE_INVALID);
-
- return hdl->priv->valid_g_types[index];
-}
-
static const gchar *
gda_handler_bin_get_descr (GdaDataHandler *iface)
{
Modified: trunk/libgda/handlers/gda-handler-boolean.c
==============================================================================
--- trunk/libgda/handlers/gda-handler-boolean.c (original)
+++ trunk/libgda/handlers/gda-handler-boolean.c Wed Jan 28 21:11:02 2009
@@ -1,6 +1,6 @@
/* gda-handler-boolean.c
*
- * Copyright (C) 2003 - 2008 Vivien Malerba
+ * Copyright (C) 2003 - 2009 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -38,8 +38,6 @@
static GValue *gda_handler_boolean_get_sane_init_value (GdaDataHandler * dh, GType type);
-static guint gda_handler_boolean_get_nb_g_types (GdaDataHandler *dh);
-static GType gda_handler_boolean_get_g_type_index (GdaDataHandler *dh, guint index);
static gboolean gda_handler_boolean_accepts_g_type (GdaDataHandler * dh, GType type);
static const gchar *gda_handler_boolean_get_descr (GdaDataHandler *dh);
@@ -96,9 +94,7 @@
iface->get_value_from_sql = gda_handler_boolean_get_value_from_sql;
iface->get_value_from_str = gda_handler_boolean_get_value_from_str;
iface->get_sane_init_value = gda_handler_boolean_get_sane_init_value;
- iface->get_nb_g_types = gda_handler_boolean_get_nb_g_types;
iface->accepts_g_type = gda_handler_boolean_accepts_g_type;
- iface->get_g_type_index = gda_handler_boolean_get_g_type_index;
iface->get_descr = gda_handler_boolean_get_descr;
}
@@ -259,19 +255,6 @@
return value;
}
-static guint
-gda_handler_boolean_get_nb_g_types (GdaDataHandler *iface)
-{
- GdaHandlerBoolean *hdl;
-
- g_return_val_if_fail (iface && GDA_IS_HANDLER_BOOLEAN (iface), 0);
- hdl = GDA_HANDLER_BOOLEAN (iface);
- g_return_val_if_fail (hdl->priv, 0);
-
- return hdl->priv->nb_g_types;
-}
-
-
static gboolean
gda_handler_boolean_accepts_g_type (GdaDataHandler *iface, GType type)
{
@@ -293,19 +276,6 @@
return found;
}
-static GType
-gda_handler_boolean_get_g_type_index (GdaDataHandler *iface, guint index)
-{
- GdaHandlerBoolean *hdl;
-
- g_return_val_if_fail (iface && GDA_IS_HANDLER_BOOLEAN (iface), G_TYPE_INVALID);
- hdl = GDA_HANDLER_BOOLEAN (iface);
- g_return_val_if_fail (hdl->priv, G_TYPE_INVALID);
- g_return_val_if_fail (index < hdl->priv->nb_g_types, G_TYPE_INVALID);
-
- return hdl->priv->valid_g_types[index];
-}
-
static const gchar *
gda_handler_boolean_get_descr (GdaDataHandler *iface)
{
Modified: trunk/libgda/handlers/gda-handler-numerical.c
==============================================================================
--- trunk/libgda/handlers/gda-handler-numerical.c (original)
+++ trunk/libgda/handlers/gda-handler-numerical.c Wed Jan 28 21:11:02 2009
@@ -1,6 +1,6 @@
/* gda-handler-numerical.c
*
- * Copyright (C) 2003 - 2008 Vivien Malerba
+ * Copyright (C) 2003 - 2009 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -39,8 +39,6 @@
GType type);
static GValue *gda_handler_numerical_get_sane_init_value (GdaDataHandler * dh, GType type);
-static guint gda_handler_numerical_get_nb_g_types (GdaDataHandler *dh);
-static GType gda_handler_numerical_get_g_type_index (GdaDataHandler *dh, guint index);
static gboolean gda_handler_numerical_accepts_g_type (GdaDataHandler * dh, GType type);
static const gchar *gda_handler_numerical_get_descr (GdaDataHandler *dh);
@@ -97,9 +95,7 @@
iface->get_value_from_sql = gda_handler_numerical_get_value_from_sql;
iface->get_value_from_str = gda_handler_numerical_get_value_from_str;
iface->get_sane_init_value = gda_handler_numerical_get_sane_init_value;
- iface->get_nb_g_types = gda_handler_numerical_get_nb_g_types;
iface->accepts_g_type = gda_handler_numerical_accepts_g_type;
- iface->get_g_type_index = gda_handler_numerical_get_g_type_index;
iface->get_descr = gda_handler_numerical_get_descr;
}
@@ -337,20 +333,6 @@
return value;
}
-
-static guint
-gda_handler_numerical_get_nb_g_types (GdaDataHandler *iface)
-{
- GdaHandlerNumerical *hdl;
-
- g_return_val_if_fail (iface && GDA_IS_HANDLER_NUMERICAL (iface), 0);
- hdl = GDA_HANDLER_NUMERICAL (iface);
- g_return_val_if_fail (hdl->priv, 0);
-
- return hdl->priv->nb_g_types;
-}
-
-
static gboolean
gda_handler_numerical_accepts_g_type (GdaDataHandler *iface, GType type)
{
@@ -372,19 +354,6 @@
return found;
}
-static GType
-gda_handler_numerical_get_g_type_index (GdaDataHandler *iface, guint index)
-{
- GdaHandlerNumerical *hdl;
-
- g_return_val_if_fail (iface && GDA_IS_HANDLER_NUMERICAL (iface), G_TYPE_INVALID);
- hdl = GDA_HANDLER_NUMERICAL (iface);
- g_return_val_if_fail (hdl->priv, G_TYPE_INVALID);
- g_return_val_if_fail (index < hdl->priv->nb_g_types, G_TYPE_INVALID);
-
- return hdl->priv->valid_g_types[index];
-}
-
static const gchar *
gda_handler_numerical_get_descr (GdaDataHandler *iface)
{
Modified: trunk/libgda/handlers/gda-handler-string.c
==============================================================================
--- trunk/libgda/handlers/gda-handler-string.c (original)
+++ trunk/libgda/handlers/gda-handler-string.c Wed Jan 28 21:11:02 2009
@@ -1,6 +1,6 @@
/* gda-handler-string.c
*
- * Copyright (C) 2003 - 2008 Vivien Malerba
+ * Copyright (C) 2003 - 2009 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -39,8 +39,6 @@
GType type);
static GValue *gda_handler_string_get_sane_init_value (GdaDataHandler * dh, GType type);
-static guint gda_handler_string_get_nb_g_types (GdaDataHandler *dh);
-static GType gda_handler_string_get_g_type_index (GdaDataHandler *dh, guint index);
static gboolean gda_handler_string_accepts_g_type (GdaDataHandler * dh, GType type);
static const gchar *gda_handler_string_get_descr (GdaDataHandler *dh);
@@ -100,9 +98,7 @@
iface->get_value_from_sql = gda_handler_string_get_value_from_sql;
iface->get_value_from_str = gda_handler_string_get_value_from_str;
iface->get_sane_init_value = gda_handler_string_get_sane_init_value;
- iface->get_nb_g_types = gda_handler_string_get_nb_g_types;
iface->accepts_g_type = gda_handler_string_accepts_g_type;
- iface->get_g_type_index = gda_handler_string_get_g_type_index;
iface->get_descr = gda_handler_string_get_descr;
}
@@ -310,19 +306,6 @@
return value;
}
-static guint
-gda_handler_string_get_nb_g_types (GdaDataHandler *iface)
-{
- GdaHandlerString *hdl;
-
- g_return_val_if_fail (iface && GDA_IS_HANDLER_STRING (iface), 0);
- hdl = GDA_HANDLER_STRING (iface);
- g_return_val_if_fail (hdl->priv, 0);
-
- return hdl->priv->nb_g_types;
-}
-
-
static gboolean
gda_handler_string_accepts_g_type (GdaDataHandler *iface, GType type)
{
@@ -344,19 +327,6 @@
return found;
}
-static GType
-gda_handler_string_get_g_type_index (GdaDataHandler *iface, guint index)
-{
- GdaHandlerString *hdl;
-
- g_return_val_if_fail (iface && GDA_IS_HANDLER_STRING (iface), G_TYPE_INVALID);
- hdl = GDA_HANDLER_STRING (iface);
- g_return_val_if_fail (hdl->priv, G_TYPE_INVALID);
- g_return_val_if_fail (index < hdl->priv->nb_g_types, G_TYPE_INVALID);
-
- return hdl->priv->valid_g_types[index];
-}
-
static const gchar *
gda_handler_string_get_descr (GdaDataHandler *iface)
{
Modified: trunk/libgda/handlers/gda-handler-time.c
==============================================================================
--- trunk/libgda/handlers/gda-handler-time.c (original)
+++ trunk/libgda/handlers/gda-handler-time.c Wed Jan 28 21:11:02 2009
@@ -1,6 +1,6 @@
/* gda-handler-time.c
*
- * Copyright (C) 2003 - 2008 Vivien Malerba
+ * Copyright (C) 2003 - 2009 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -51,8 +51,6 @@
static GValue *gda_handler_time_get_sane_init_value (GdaDataHandler * dh, GType type);
-static guint gda_handler_time_get_nb_g_types (GdaDataHandler *dh);
-static GType gda_handler_time_get_g_type_index (GdaDataHandler *dh, guint index);
static gboolean gda_handler_time_accepts_g_type (GdaDataHandler * dh, GType type);
static const gchar *gda_handler_time_get_descr (GdaDataHandler *dh);
@@ -122,9 +120,7 @@
iface->get_value_from_sql = gda_handler_time_get_value_from_sql;
iface->get_value_from_str = gda_handler_time_get_value_from_str;
iface->get_sane_init_value = gda_handler_time_get_sane_init_value;
- iface->get_nb_g_types = gda_handler_time_get_nb_g_types;
iface->accepts_g_type = gda_handler_time_accepts_g_type;
- iface->get_g_type_index = gda_handler_time_get_g_type_index;
iface->get_descr = gda_handler_time_get_descr;
}
@@ -236,18 +232,18 @@
/**
* gda_handler_time_set_sql_spec
* @dh: a #GdaHandlerTime object
- * @first:
- * @sec:
- * @third:
- * @separator:
+ * @first: what comes first in the date representation
+ * @sec: what comes second in the date representation
+ * @third: what comes third in the date representation
+ * @separator: separator character used between year, month and day
* @twodigits_years: TRUE if year part of date must be rendered on 2 digits
*
* Specifies the SQL output style of the @dh data handler. The general format is "FIRSTsSECsTHIRD"
* where FIRST, SEC and THIRD are specified by @first, @sec and @trird and 's' is the separator,
* specified by @separator.
*
- * The default implementation is FIRST=G_DATE_MONTH, SEC=G_DATE_DAY and THIRD=G_DATE_YEAR (the year is
- * rendered on 4 digits) and the separator is '-'
+ * The default implementation is @first=G_DATE_MONTH, @sec=G_DATE_DAY and @third=G_DATE_YEAR
+ * (the year is rendered on 4 digits) and the separator is '-'
*/
void
gda_handler_time_set_sql_spec (GdaHandlerTime *dh, GDateDMY first, GDateDMY sec,
@@ -450,7 +446,7 @@
/**
* gda_handler_time_get_format
- * @hdl: a #GdaHandlerTime object
+ * @dh: a #GdaHandlerTime object
* @type: the type of data being handled
*
* Get a string representing the locale-dependant way to enter a date/time/datetime, using
@@ -459,27 +455,27 @@
* Returns: a new string
*/
gchar *
-gda_handler_time_get_format (GdaHandlerTime *hdl, GType type)
+gda_handler_time_get_format (GdaHandlerTime *dh, GType type)
{
gchar *str;
GString *string;
gint i;
- g_return_val_if_fail (GDA_IS_HANDLER_TIME (hdl), NULL);
- g_return_val_if_fail (hdl->priv, NULL);
+ g_return_val_if_fail (GDA_IS_HANDLER_TIME (dh), NULL);
+ g_return_val_if_fail (dh->priv, NULL);
string = g_string_new ("");
if ((type == G_TYPE_DATE) || (type == GDA_TYPE_TIMESTAMP)) {
for (i=0; i<3; i++) {
if (i > 0)
- g_string_append_c (string, hdl->priv->str_locale->separator);
- switch (hdl->priv->str_locale->dmy_order[i]) {
+ g_string_append_c (string, dh->priv->str_locale->separator);
+ switch (dh->priv->str_locale->dmy_order[i]) {
case G_DATE_DAY:
case G_DATE_MONTH:
g_string_append (string, "00");
break;
case G_DATE_YEAR:
- if (hdl->priv->str_locale->twodigit_years)
+ if (dh->priv->str_locale->twodigit_years)
g_string_append (string, "00");
else
g_string_append (string, "0000");
@@ -1058,20 +1054,6 @@
return value;
}
-
-static guint
-gda_handler_time_get_nb_g_types (GdaDataHandler *iface)
-{
- GdaHandlerTime *hdl;
-
- g_return_val_if_fail (iface && GDA_IS_HANDLER_TIME (iface), 0);
- hdl = GDA_HANDLER_TIME (iface);
- g_return_val_if_fail (hdl->priv, 0);
-
- return hdl->priv->nb_g_types;
-}
-
-
static gboolean
gda_handler_time_accepts_g_type (GdaDataHandler *iface, GType type)
{
@@ -1093,19 +1075,6 @@
return found;
}
-static GType
-gda_handler_time_get_g_type_index (GdaDataHandler *iface, guint index)
-{
- GdaHandlerTime *hdl;
-
- g_return_val_if_fail (iface && GDA_IS_HANDLER_TIME (iface), G_TYPE_INVALID);
- hdl = GDA_HANDLER_TIME (iface);
- g_return_val_if_fail (hdl->priv, G_TYPE_INVALID);
- g_return_val_if_fail (index < hdl->priv->nb_g_types, G_TYPE_INVALID);
-
- return hdl->priv->valid_g_types[index];
-}
-
static const gchar *
gda_handler_time_get_descr (GdaDataHandler *iface)
{
Modified: trunk/libgda/handlers/gda-handler-type.c
==============================================================================
--- trunk/libgda/handlers/gda-handler-type.c (original)
+++ trunk/libgda/handlers/gda-handler-type.c Wed Jan 28 21:11:02 2009
@@ -1,6 +1,6 @@
/* gda-handler-type.c
*
- * Copyright (C) 2005 - 2008 Vivien Malerba
+ * Copyright (C) 2005 - 2009 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -36,8 +36,6 @@
GType type);
static GValue *gda_handler_type_get_value_from_str (GdaDataHandler *dh, const gchar *sql,
GType type);
-static guint gda_handler_type_get_nb_g_types (GdaDataHandler *dh);
-static GType gda_handler_type_get_g_type_index (GdaDataHandler *dh, guint index);
static gboolean gda_handler_type_accepts_g_type (GdaDataHandler * dh, GType type);
static const gchar *gda_handler_type_get_descr (GdaDataHandler *dh);
@@ -94,9 +92,7 @@
iface->get_value_from_sql = gda_handler_type_get_value_from_sql;
iface->get_value_from_str = gda_handler_type_get_value_from_str;
iface->get_sane_init_value = NULL;
- iface->get_nb_g_types = gda_handler_type_get_nb_g_types;
iface->accepts_g_type = gda_handler_type_accepts_g_type;
- iface->get_g_type_index = gda_handler_type_get_g_type_index;
iface->get_descr = gda_handler_type_get_descr;
}
@@ -261,19 +257,6 @@
return value;
}
-static guint
-gda_handler_type_get_nb_g_types (GdaDataHandler *iface)
-{
- GdaHandlerType *hdl;
-
- g_return_val_if_fail (iface && GDA_IS_HANDLER_TYPE (iface), 0);
- hdl = GDA_HANDLER_TYPE (iface);
- g_return_val_if_fail (hdl->priv, 0);
-
- return hdl->priv->nb_g_types;
-}
-
-
static gboolean
gda_handler_type_accepts_g_type (GdaDataHandler *iface, GType type)
{
@@ -295,19 +278,6 @@
return found;
}
-static GType
-gda_handler_type_get_g_type_index (GdaDataHandler *iface, guint index)
-{
- GdaHandlerType *hdl;
-
- g_return_val_if_fail (iface && GDA_IS_HANDLER_TYPE (iface), G_TYPE_INVALID);
- hdl = GDA_HANDLER_TYPE (iface);
- g_return_val_if_fail (hdl->priv, G_TYPE_INVALID);
- g_return_val_if_fail (index < hdl->priv->nb_g_types, G_TYPE_INVALID);
-
- return hdl->priv->valid_g_types[index];
-}
-
static const gchar *
gda_handler_type_get_descr (GdaDataHandler *iface)
{
Modified: trunk/libgda/libgda.symbols
==============================================================================
--- trunk/libgda/libgda.symbols (original)
+++ trunk/libgda/libgda.symbols Wed Jan 28 21:11:02 2009
@@ -170,8 +170,6 @@
gda_data_comparator_set_key_columns
gda_data_handler_accepts_g_type
gda_data_handler_get_descr
- gda_data_handler_get_g_type_index
- gda_data_handler_get_nb_g_types
gda_data_handler_get_sane_init_value
gda_data_handler_get_sql_from_value
gda_data_handler_get_str_from_value
Modified: trunk/libgda/sql-parser/gda-statement-struct-parts.h
==============================================================================
--- trunk/libgda/sql-parser/gda-statement-struct-parts.h (original)
+++ trunk/libgda/sql-parser/gda-statement-struct-parts.h Wed Jan 28 21:11:02 2009
@@ -184,9 +184,9 @@
};
GdaSqlCase *gda_sql_case_new (GdaSqlAnyPart *parent);
-void gda_sql_case_free (GdaSqlCase *scase);
-GdaSqlCase *gda_sql_case_copy (GdaSqlCase *scase);
-gchar *gda_sql_case_serialize (GdaSqlCase *scase);
+void gda_sql_case_free (GdaSqlCase *sc);
+GdaSqlCase *gda_sql_case_copy (GdaSqlCase *sc);
+gchar *gda_sql_case_serialize (GdaSqlCase *sc);
/*
* Any expression in a SELECT ... before the FROM clause
Modified: trunk/libgda/sql-parser/gda-statement-struct.c
==============================================================================
--- trunk/libgda/sql-parser/gda-statement-struct.c (original)
+++ trunk/libgda/sql-parser/gda-statement-struct.c Wed Jan 28 21:11:02 2009
@@ -1275,6 +1275,7 @@
* gda_sql_statement_normalize
* @stmt: a pointer to a #GdaSqlStatement structure
* @cnc: a #GdaConnection object, or %NULL
+ * @error: a place to store errors, or %NULL
*
* "Normalizes" (in place) some parts of @stmt, which means @stmt may be modified.
* At the moment any "*" field in a SELECT statement will be replaced by one
Modified: trunk/libgda/sqlite/gda-sqlite-handler-bin.c
==============================================================================
--- trunk/libgda/sqlite/gda-sqlite-handler-bin.c (original)
+++ trunk/libgda/sqlite/gda-sqlite-handler-bin.c Wed Jan 28 21:11:02 2009
@@ -1,6 +1,6 @@
/* gda-sqlite-handler-bin.c
*
- * Copyright (C) 2006 - 2008 Vivien Malerba
+ * Copyright (C) 2006 - 2009 Vivien Malerba
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -36,8 +36,6 @@
GType type);
static GValue *gda_sqlite_handler_bin_get_value_from_str (GdaDataHandler *dh, const gchar *sql,
GType type);
-static guint gda_sqlite_handler_bin_get_nb_g_types (GdaDataHandler *dh);
-static GType gda_sqlite_handler_bin_get_g_type_index (GdaDataHandler *dh, guint index);
static gboolean gda_sqlite_handler_bin_accepts_g_type (GdaDataHandler * dh, GType type);
static const gchar *gda_sqlite_handler_bin_get_descr (GdaDataHandler *dh);
@@ -94,9 +92,7 @@
iface->get_value_from_sql = gda_sqlite_handler_bin_get_value_from_sql;
iface->get_value_from_str = gda_sqlite_handler_bin_get_value_from_str;
iface->get_sane_init_value = NULL;
- iface->get_nb_g_types = gda_sqlite_handler_bin_get_nb_g_types;
iface->accepts_g_type = gda_sqlite_handler_bin_accepts_g_type;
- iface->get_g_type_index = gda_sqlite_handler_bin_get_g_type_index;
iface->get_descr = gda_sqlite_handler_bin_get_descr;
}
@@ -339,19 +335,6 @@
return value;
}
-static guint
-gda_sqlite_handler_bin_get_nb_g_types (GdaDataHandler *iface)
-{
- GdaSqliteHandlerBin *hdl;
-
- g_return_val_if_fail (GDA_IS_SQLITE_HANDLER_BIN (iface), 0);
- hdl = GDA_SQLITE_HANDLER_BIN (iface);
- g_return_val_if_fail (hdl->priv, 0);
-
- return hdl->priv->nb_g_types;
-}
-
-
static gboolean
gda_sqlite_handler_bin_accepts_g_type (GdaDataHandler *iface, GType type)
{
@@ -373,19 +356,6 @@
return found;
}
-static GType
-gda_sqlite_handler_bin_get_g_type_index (GdaDataHandler *iface, guint index)
-{
- GdaSqliteHandlerBin *hdl;
-
- g_return_val_if_fail (GDA_IS_SQLITE_HANDLER_BIN (iface), G_TYPE_INVALID);
- hdl = GDA_SQLITE_HANDLER_BIN (iface);
- g_return_val_if_fail (hdl->priv, G_TYPE_INVALID);
- g_return_val_if_fail (index < hdl->priv->nb_g_types, G_TYPE_INVALID);
-
- return hdl->priv->valid_g_types[index];
-}
-
static const gchar *
gda_sqlite_handler_bin_get_descr (GdaDataHandler *iface)
{
Modified: trunk/libgda/sqlite/virtual/gda-vconnection-hub.h
==============================================================================
--- trunk/libgda/sqlite/virtual/gda-vconnection-hub.h (original)
+++ trunk/libgda/sqlite/virtual/gda-vconnection-hub.h Wed Jan 28 21:11:02 2009
@@ -53,7 +53,7 @@
gboolean gda_vconnection_hub_add (GdaVconnectionHub *hub,
GdaConnection *cnc, const gchar *ns, GError **error);
gboolean gda_vconnection_hub_remove (GdaVconnectionHub *hub, GdaConnection *cnc, GError **error);
-GdaConnection *gda_vconnection_hub_get_connection (GdaVconnectionHub *cnc, const gchar *ns);
+GdaConnection *gda_vconnection_hub_get_connection (GdaVconnectionHub *hub, const gchar *ns);
void gda_vconnection_hub_foreach (GdaVconnectionHub *hub,
GdaVConnectionHubFunc func, gpointer data);
Modified: trunk/providers/postgres/gda-postgres-handler-bin.c
==============================================================================
--- trunk/providers/postgres/gda-postgres-handler-bin.c (original)
+++ trunk/providers/postgres/gda-postgres-handler-bin.c Wed Jan 28 21:11:02 2009
@@ -1,5 +1,5 @@
/* GDA postgres provider
- * Copyright (C) 2007 - 2008 The GNOME Foundation.
+ * Copyright (C) 2007 - 2009 The GNOME Foundation.
*
* AUTHORS:
* Vivien Malerba <malerba gnome-db org>
@@ -39,8 +39,6 @@
GType type);
static GValue *gda_postgres_handler_bin_get_value_from_str (GdaDataHandler *dh, const gchar *sql,
GType type);
-static guint gda_postgres_handler_bin_get_nb_g_types (GdaDataHandler *dh);
-static GType gda_postgres_handler_bin_get_g_type_index (GdaDataHandler *dh, guint index);
static gboolean gda_postgres_handler_bin_accepts_g_type (GdaDataHandler * dh, GType type);
static const gchar *gda_postgres_handler_bin_get_descr (GdaDataHandler *dh);
@@ -98,9 +96,7 @@
iface->get_value_from_sql = gda_postgres_handler_bin_get_value_from_sql;
iface->get_value_from_str = gda_postgres_handler_bin_get_value_from_str;
iface->get_sane_init_value = NULL;
- iface->get_nb_g_types = gda_postgres_handler_bin_get_nb_g_types;
iface->accepts_g_type = gda_postgres_handler_bin_accepts_g_type;
- iface->get_g_type_index = gda_postgres_handler_bin_get_g_type_index;
iface->get_descr = gda_postgres_handler_bin_get_descr;
}
@@ -313,19 +309,6 @@
return value;
}
-static guint
-gda_postgres_handler_bin_get_nb_g_types (GdaDataHandler *iface)
-{
- GdaPostgresHandlerBin *hdl;
-
- g_return_val_if_fail (iface && GDA_IS_POSTGRES_HANDLER_BIN (iface), 0);
- hdl = GDA_POSTGRES_HANDLER_BIN (iface);
- g_return_val_if_fail (hdl->priv, 0);
-
- return hdl->priv->nb_g_types;
-}
-
-
static gboolean
gda_postgres_handler_bin_accepts_g_type (GdaDataHandler *iface, GType type)
{
@@ -347,19 +330,6 @@
return found;
}
-static GType
-gda_postgres_handler_bin_get_g_type_index (GdaDataHandler *iface, guint index)
-{
- GdaPostgresHandlerBin *hdl;
-
- g_return_val_if_fail (iface && GDA_IS_POSTGRES_HANDLER_BIN (iface), G_TYPE_INVALID);
- hdl = GDA_POSTGRES_HANDLER_BIN (iface);
- g_return_val_if_fail (hdl->priv, G_TYPE_INVALID);
- g_return_val_if_fail (index < hdl->priv->nb_g_types, G_TYPE_INVALID);
-
- return hdl->priv->valid_g_types[index];
-}
-
static const gchar *
gda_postgres_handler_bin_get_descr (GdaDataHandler *iface)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
