libgda r3372 - in branches/LIBGDA_4.0: . doc/C/tmpl libgda tools

[vivien svn gnome org]

Author: vivien
Date: Tue Apr  7 19:05:19 2009
New Revision: 3372
URL: http://svn.gnome.org/viewvc/libgda?rev=3372&view=rev

Log:
2009-04-07  Vivien Malerba <malerba gnome-db org>

	* configure.in:
	  - set version to 4.0.2
	  - detect uint8_t presence
	* libgda/gda-meta-store.c:
	  - correction in gda_meta_store_schema_get_structure()
	  - correction in the "cnc" property
	* tools/web-server.c: don't check for uint8_t
	* doc/C: doc. updates


Modified:
   branches/LIBGDA_4.0/ChangeLog
   branches/LIBGDA_4.0/configure.in
   branches/LIBGDA_4.0/doc/C/tmpl/gda-data-model-iter.sgml
   branches/LIBGDA_4.0/doc/C/tmpl/gda-sql-parser.sgml
   branches/LIBGDA_4.0/libgda/gda-meta-store.c
   branches/LIBGDA_4.0/tools/web-server.c

Modified: branches/LIBGDA_4.0/configure.in
==============================================================================
--- branches/LIBGDA_4.0/configure.in	(original)
+++ branches/LIBGDA_4.0/configure.in	Tue Apr  7 19:05:19 2009
@@ -1,6 +1,6 @@
 m4_define(major, 4)
 m4_define(minor, 0)
-m4_define(micro, 1)
+m4_define(micro, 2)
 
 AC_INIT(GNU Data Access, major.minor.micro, gnome-db-list gnome org, libgda)
 AC_PREREQ(2.59)
@@ -48,6 +48,7 @@
 AC_SUBST(INTLTOOL_XML_RULE)
 AC_CHECK_SIZEOF(unsigned int,0)
 AC_CHECK_SIZEOF(unsigned long int,0)
+AC_CHECK_TYPE(uint8_t, unsigned char)
 
 dnl **********************
 dnl Cross compilation test

Modified: branches/LIBGDA_4.0/doc/C/tmpl/gda-data-model-iter.sgml
==============================================================================
--- branches/LIBGDA_4.0/doc/C/tmpl/gda-data-model-iter.sgml	(original)
+++ branches/LIBGDA_4.0/doc/C/tmpl/gda-data-model-iter.sgml	Tue Apr  7 19:05:19 2009
@@ -33,7 +33,7 @@
   gda_data_model_iter_move_next() which moves to the first row).
 </para>
 <para>
-  The gda_data_model_iter_move_at_row() method, if the iterator can be moved both forward and backwards, can move the 
+  The gda_data_model_iter_move_to_row() method, if the iterator can be moved both forward and backwards, can move the 
   iterator to a specific row (sometimes faster than moving it forward or backwards a number of times).
 </para>
 <para>

Modified: branches/LIBGDA_4.0/doc/C/tmpl/gda-sql-parser.sgml
==============================================================================
--- branches/LIBGDA_4.0/doc/C/tmpl/gda-sql-parser.sgml	(original)
+++ branches/LIBGDA_4.0/doc/C/tmpl/gda-sql-parser.sgml	Tue Apr  7 19:05:19 2009
@@ -85,7 +85,7 @@
   The #GdaSqlParser object internally uses a LEMON generated parser (the same as the one used by SQLite).
 </para>
 <para>
-  The #GdaConnection object implements its own locking mechanism so it is thread-safe.
+  The #GdaSqlParser object implements its own locking mechanism so it is thread-safe.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->

Modified: branches/LIBGDA_4.0/libgda/gda-meta-store.c
==============================================================================
--- branches/LIBGDA_4.0/libgda/gda-meta-store.c	(original)
+++ branches/LIBGDA_4.0/libgda/gda-meta-store.c	Tue Apr  7 19:05:19 2009
@@ -713,7 +713,7 @@
 			break;
 		case PROP_CNC_OBJECT:
 			if (!store->priv->cnc)
-				store->priv->cnc = g_value_get_object (value);
+				store->priv->cnc = g_value_dup_object (value);
 			break;
 		case PROP_CATALOG:
 			g_free (store->priv->catalog);
@@ -2943,6 +2943,7 @@
 	GdaMetaStruct *mstruct;
 	GdaDataModel *model;
 	gint i, nrows;
+	GdaMetaStore *real_store;
 
 	g_return_val_if_fail (GDA_IS_META_STORE (store), NULL);
 
@@ -2951,12 +2952,14 @@
 		return NULL;
 
 	/* create a GdaMetaStruct */
-	model = gda_meta_store_extract (store, "SELECT table_catalog, table_schema, table_name FROM _tables", 
+	real_store = gda_connection_get_meta_store (store->priv->cnc);
+	model = gda_meta_store_extract (real_store,
+					"SELECT table_catalog, table_schema, table_name FROM _tables", 
 					error, NULL);
 	if (!model)
 		return NULL;
 
-	mstruct = gda_meta_struct_new (store, GDA_META_STRUCT_FEATURE_ALL);
+	mstruct = gda_meta_struct_new (real_store, GDA_META_STRUCT_FEATURE_ALL);
 	nrows = gda_data_model_get_n_rows (model);
 	for (i = 0; i < nrows; i++) {
 		/* FIXME: only take into account the database objects which have a corresponding DbObject */
@@ -2981,8 +2984,9 @@
 
 	klass = (GdaMetaStoreClass *) G_OBJECT_GET_CLASS (store);
 	all_db_obj_list = g_slist_copy (klass->cpriv->db_objects);
-	if (store->priv->p_db_objects)
-		all_db_obj_list = g_slist_concat (all_db_obj_list, g_slist_copy (store->priv->p_db_objects));
+	if (real_store->priv->p_db_objects)
+		all_db_obj_list = g_slist_concat (all_db_obj_list,
+						  g_slist_copy (real_store->priv->p_db_objects));
 
 	for (list = all_db_obj_list; list; list = list->next) {
 		DbObject *dbobj = DB_OBJECT (list->data);

Modified: branches/LIBGDA_4.0/tools/web-server.c
==============================================================================
--- branches/LIBGDA_4.0/tools/web-server.c	(original)
+++ branches/LIBGDA_4.0/tools/web-server.c	Tue Apr  7 19:05:19 2009
@@ -33,6 +33,10 @@
 #include "global.h"
 #include "md5.h"
 
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
 #define MAX_CHALLENGES 10
 #define MAX_AUTH_COOKIES 10
 
@@ -475,10 +479,6 @@
 	return TRUE;
 }
 
-#ifdef G_OS_WIN32
-typedef guint8 uint8_t;
-#endif
-
 #define PAD_LEN 64  /* PAD length */
 #define SIG_LEN 16  /* MD5 digest length */
 /*