Blob Blame History Raw
--- libgda-1.9.100/libgda/gda-data-model-private.h.syslibs	2005-09-21 22:06:54.000000000 +0200
+++ libgda-1.9.100/libgda/gda-data-model-private.h	2006-02-13 23:01:32.000000000 +0100
@@ -21,8 +21,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if !defined(__gda_data_model_h__)
-#  define __gda_data_model_h__
+#if !defined(__gda_data_model_private_h__)
+#  define __gda_data_model_private_h__
 
 #include <glib-object.h>
 #include <libxml/parser.h>
--- libgda-1.9.100/providers/sqlite/utils.c.syslibs	2006-02-13 23:04:39.000000000 +0100
+++ libgda-1.9.100/providers/sqlite/utils.c	2006-02-13 23:06:30.000000000 +0100
@@ -25,8 +25,8 @@
 #include <libgda/gda-intl.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sqlite3.h>
 #include "gda-sqlite.h"
-#include "sqliteInt.h"
 
 void
 gda_sqlite_update_types_hash (SQLITEcnc *scnc)
@@ -38,6 +38,7 @@
 		scnc->types = types;
 	}
 
+#if 0
 	if (SQLITE_VERSION_NUMBER >= 3000000) {
 		Db *db;
 		gint i;
@@ -86,6 +87,7 @@
 			}
 		}
 	}
+#endif	
 }
 
 void
--- libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c.syslibs	2005-09-28 13:39:45.000000000 +0200
+++ libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c	2006-02-13 23:01:32.000000000 +0100
@@ -26,6 +26,8 @@
 #endif
 
 #include <stdlib.h>
+#include <string.h>
+#include <sqlite3.h>
 #include <libgda/gda-intl.h>
 #include <libgda/gda-data-model-array.h>
 #include <libgda/gda-data-model-private.h>
@@ -33,7 +35,6 @@
 #include "gda-sqlite.h"
 #include "gda-sqlite-provider.h"
 #include "gda-sqlite-recordset.h"
-#include "sqliteInt.h"
 
 static void gda_sqlite_provider_class_init (GdaSqliteProviderClass *klass);
 static void gda_sqlite_provider_init       (GdaSqliteProvider *provider,
@@ -260,6 +261,7 @@
 		}
 	}
 
+#if 0
 	if (0) {
 		/* show all databases in this handle */
 		Db *db;
@@ -270,6 +272,7 @@
 			g_print ("/// %s\n", db->zName);
 		}
 	}
+#endif
 
 	return TRUE;
 }
@@ -1054,6 +1057,7 @@
 
 		/* extra attributes */
 		nvalue = NULL;
+#if 0
 		if (SQLITE_VERSION_NUMBER >= 3000000) {
 			Table *table;
 				
@@ -1066,6 +1070,7 @@
 			if ((table->iPKey == i) && table->autoInc)
 				nvalue = gda_value_new_string ("AUTO_INCREMENT");
 		}
+#endif
 
 		if (!nvalue)
 			nvalue = gda_value_new_null ();
@@ -1155,7 +1160,7 @@
 		gda_connection_add_event_string (cnc, _("Invalid SQLITE handle"));
 		return NULL;
 	}
-	g_assert ((scnc->connection->flags & SQLITE_Initialized) || scnc->connection->init.busy);
+/*	g_assert ((scnc->connection->flags & SQLITE_Initialized) || scnc->connection->init.busy); */
 
 	/* create the recordset */
 	recset = GDA_DATA_MODEL_ARRAY (gda_data_model_array_new 
@@ -1204,6 +1209,7 @@
 		g_assert (gda_provider_init_schema_model (GDA_DATA_MODEL (recset), GDA_CONNECTION_SCHEMA_PROCEDURES));
 	}
 
+#if 0
 	if (SQLITE_VERSION_NUMBER >= 3000000) {
 		Hash *func_hash;
 		HashElem *func_elem;
@@ -1290,6 +1296,7 @@
 		g_list_foreach (list, add_g_list_row, recset);
 		g_list_free (list);
 	}
+#endif
 
 	return GDA_DATA_MODEL (recset);
 }
--- libgda-1.9.100/providers/sqlite/Makefile.am.syslibs	2005-06-01 21:14:12.000000000 +0200
+++ libgda-1.9.100/providers/sqlite/Makefile.am	2006-02-13 23:01:32.000000000 +0100
@@ -1,4 +1,4 @@
-SUBDIRS = sqlite-src
+SUBDIRS = 
 
 providerdir=$(libdir)/libgda-$(GDA_MAJOR_VERSION).$(GDA_MINOR_VERSION)/providers
 provider_LTLIBRARIES = libgda-sqlite.la
@@ -27,7 +27,6 @@
 libgda_sqlite_la_LDFLAGS = -export-dynamic -module -avoid-version
 libgda_sqlite_la_LIBADD = \
 	$(LIBGDA_LIBS) \
-	$(top_builddir)/libgda/libgda-3.la \
-	$(top_builddir)/providers/sqlite/sqlite-src/libsqlite.la 
+	$(top_builddir)/libgda/libgda-3.la -lsqlite3
 
 EXTRA_DIST = $(config_DATA)
--- libgda-1.9.100/configure.in.syslibs	2006-02-13 23:01:32.000000000 +0100
+++ libgda-1.9.100/configure.in	2006-02-13 23:01:32.000000000 +0100
@@ -981,7 +981,6 @@
 providers/oracle/Makefile
 providers/postgres/Makefile
 providers/sqlite/Makefile
-providers/sqlite/sqlite-src/Makefile
 providers/sybase/Makefile
 providers/xbase/Makefile
 report/Makefile