[dovecot-cvs] dovecot/src/lib-sql driver-mysql.c, 1.5, 1.6 driver-pgsql.c, 1.1, 1.2 sql-api-private.h, 1.1, 1.2 sql-api.h, 1.1, 1.2

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-sql
In directory talvi:/tmp/cvs-serv3502/lib-sql

Modified Files:
	driver-mysql.c driver-pgsql.c sql-api-private.h sql-api.h 
Log Message:
Added sql_get_flags() function, currently returning only
SQL_DB_FLAG_BLOCKING.



Index: driver-mysql.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-sql/driver-mysql.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- driver-mysql.c	7 Jan 2005 17:19:43 -0000	1.5
+++ driver-mysql.c	26 Feb 2005 23:16:51 -0000	1.6
@@ -244,6 +244,12 @@
 	pool_unref(db->pool);
 }
 
+static enum sql_db_flags
+driver_mysql_get_flags(struct sql_db *db __attr_unused__)
+{
+	return SQL_DB_FLAG_BLOCKING;
+}
+
 static int driver_mysql_connection_do_query(struct mysql_connection *conn,
 					    const char *query)
 {
@@ -453,6 +459,7 @@
 struct sql_db driver_mysql_db = {
 	driver_mysql_init,
 	driver_mysql_deinit,
+	driver_mysql_get_flags,
 	driver_mysql_exec,
 	driver_mysql_query
 };

Index: driver-pgsql.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-sql/driver-pgsql.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- driver-pgsql.c	15 Oct 2004 23:12:52 -0000	1.1
+++ driver-pgsql.c	26 Feb 2005 23:16:51 -0000	1.2
@@ -169,6 +169,12 @@
 	i_free(db);
 }
 
+static enum sql_db_flags
+driver_mysql_get_flags(struct sql_db *db __attr_unused__)
+{
+	return 0;
+}
+
 static void consume_results(void *context)
 {
 	struct pgsql_db *db = context;
@@ -552,6 +558,7 @@
 struct sql_db driver_pgsql_db = {
 	driver_pgsql_init,
 	driver_pgsql_deinit,
+        driver_mysql_get_flags,
 	driver_pgsql_exec,
 	driver_pgsql_query
 };

Index: sql-api-private.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-sql/sql-api-private.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sql-api-private.h	15 Oct 2004 23:12:52 -0000	1.1
+++ sql-api-private.h	26 Feb 2005 23:16:51 -0000	1.2
@@ -7,6 +7,8 @@
 	struct sql_db *(*init)(const char *connect_string);
 	void (*deinit)(struct sql_db *db);
 
+	enum sql_db_flags (*get_flags)(struct sql_db *db);
+
 	void (*exec)(struct sql_db *db, const char *query);
 	void (*query)(struct sql_db *db, const char *query,
 		      sql_query_callback_t *callback, void *context);

Index: sql-api.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-sql/sql-api.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sql-api.h	15 Oct 2004 23:12:52 -0000	1.1
+++ sql-api.h	26 Feb 2005 23:16:51 -0000	1.2
@@ -1,6 +1,11 @@
 #ifndef __SQL_API_H
 #define __SQL_API_H
 
+enum sql_db_flags {
+	/* Set if queries are not executed asynchronously */
+	SQL_DB_FLAG_BLOCKING		= 0x01,
+};
+
 /* This SQL API is designed to work asynchronously. The underlying drivers
    however may not. */
 
@@ -14,6 +19,9 @@
 struct sql_db *sql_init(const char *db_driver, const char *connect_string);
 void sql_deinit(struct sql_db *db);
 
+/* Returns SQL database state flags. */
+enum sql_db_flags sql_get_flags(struct sql_db *db);
+
 /* Execute SQL query without waiting for results. */
 void sql_exec(struct sql_db *db, const char *query);
 /* Execute SQL query and return result in callback. */