# HG changeset patch
# User nrich@ii.net
# Date 1228205454 0
# Node ID b3e05e361f4602abfc058f7e8b329d56d8f5d13e
# Parent  3aa8a37a3dd8c54277f73233b6f3ba1e379b96b4
Bugfix: PSQL array returns were not being indexed properly.

Changes:
    * statement:fetch() returns an iterator
    * statement:row() added to replace old statement:fetch() behaviour
    * statement:fetch() and statement:row() now take an optional boolean value to either return an array(false, default) or a hashmap (true)

diff -r 3aa8a37a3dd8 -r b3e05e361f46 dbd/mysql/statement.c
--- a/dbd/mysql/statement.c	Mon Dec 01 07:22:44 2008 +0000
+++ b/dbd/mysql/statement.c	Tue Dec 02 08:10:54 2008 +0000
@@ -189,8 +189,7 @@
     return 1;
 }
 
-static int statement_fetch_impl(lua_State *L, int named_columns) {
-    statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_MYSQL_STATEMENT);
+static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_columns) {
     int column_count;
     MYSQL_BIND *bind = NULL;
     const char *error_message = NULL;
@@ -303,18 +302,38 @@
     return 1;    
 }
 
-/*
- * array = statement:fetch()
- */
-static int statement_fetch(lua_State *L) {
-    return statement_fetch_impl(L, 0);
+static int next_iterator(lua_State *L) {
+    statement_t *statement = (statement_t *)luaL_checkudata(L, lua_upvalueindex(1), DBD_MYSQL_STATEMENT);
+    int named_columns = lua_toboolean(L, lua_upvalueindex(2));
+
+    return statement_fetch_impl(L, statement, named_columns);
 }
 
 /*
- * hashmap = statement:fetchtable()
+ * iterfunc = statement:fetch(named_indexes)
  */
-static int statement_fetchtable(lua_State *L) {
-    return statement_fetch_impl(L, 1);
+
+static int statement_fetch(lua_State *L) {
+    if (lua_gettop(L) == 1) {			
+	lua_pushvalue(L, 1);
+	lua_pushboolean(L, 0);
+    } else {
+        lua_pushvalue(L, 1);
+	lua_pushboolean(L, lua_toboolean(L, 2));
+    }
+
+    lua_pushcclosure(L, next_iterator, 2);
+    return 1;
+}
+
+/*
+ * table = statement:row(named_indexes)
+ */
+static int statement_row(lua_State *L) {
+    statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_MYSQL_STATEMENT);
+    int named_columns = lua_toboolean(L, 2);
+
+    return statement_fetch_impl(L, statement, named_columns);
 }
 
 /*
@@ -362,7 +381,7 @@
 	{"close", statement_close},
 	{"execute", statement_execute},
 	{"fetch", statement_fetch},
-	{"fetchtable", statement_fetchtable},
+	{"row", statement_row},
 	{NULL, NULL}
     };
 
diff -r 3aa8a37a3dd8 -r b3e05e361f46 dbd/postgresql/statement.c
--- a/dbd/postgresql/statement.c	Mon Dec 01 07:22:44 2008 +0000
+++ b/dbd/postgresql/statement.c	Tue Dec 02 08:10:54 2008 +0000
@@ -139,6 +139,7 @@
     statement->tuple = 0;
 
     params = malloc(num_bind_params * sizeof(params));
+    memset(params, 0, num_bind_params * sizeof(params));
 
     /*
      * convert and copy parameters into a string array
@@ -214,8 +215,7 @@
 /*
  * must be called after an execute
  */
-static int statement_fetch_impl(lua_State *L, int named_columns) {
-    statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_POSTGRESQL_STATEMENT);
+static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_columns) {
     int tuple = statement->tuple++;
     int i;
     int num_columns;
@@ -237,8 +237,8 @@
 
     num_columns = PQnfields(statement->result);
     lua_newtable(L);
+    int d = 1;
     for (i = 0; i < num_columns; i++) {
-	int d = 1;
 	const char *name = PQfname(statement->result, i);
 
 	if (PQgetisnull(statement->result, tuple, i)) {
@@ -305,18 +305,39 @@
     return 1;    
 }
 
-/*
- * array = statement:fetch()
- */
-static int statement_fetch(lua_State *L) {
-    return statement_fetch_impl(L, 0);
+
+static int next_iterator(lua_State *L) {
+    statement_t *statement = (statement_t *)luaL_checkudata(L, lua_upvalueindex(1), DBD_POSTGRESQL_STATEMENT);
+    int named_columns = lua_toboolean(L, lua_upvalueindex(2));
+
+    return statement_fetch_impl(L, statement, named_columns);
 }
 
 /*
- * hashmap = statement:fetchtable()
+ * iterfunc = statement:fetch(named_indexes)
  */
-static int statement_fetchtable(lua_State *L) {
-    return statement_fetch_impl(L, 1);
+
+static int statement_fetch(lua_State *L) {
+    if (lua_gettop(L) == 1) {
+        lua_pushvalue(L, 1);
+        lua_pushboolean(L, 0);
+    } else {
+        lua_pushvalue(L, 1);
+        lua_pushboolean(L, lua_toboolean(L, 2));
+    }
+
+    lua_pushcclosure(L, next_iterator, 2);
+    return 1;
+}
+
+/*
+ * table = statement:row(named_indexes)
+ */
+static int statement_row(lua_State *L) {
+    statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_POSTGRESQL_STATEMENT);
+    int named_columns = lua_toboolean(L, 2);
+
+    return statement_fetch_impl(L, statement, named_columns);
 }
 
 /*
@@ -386,7 +407,7 @@
 	{"close", statement_close},
 	{"execute", statement_execute},
 	{"fetch", statement_fetch},
-	{"fetchtable", statement_fetchtable},
+	{"row", statement_row},
 	{NULL, NULL}
     };
 
diff -r 3aa8a37a3dd8 -r b3e05e361f46 dbd/sqlite3/statement.c
--- a/dbd/sqlite3/statement.c	Mon Dec 01 07:22:44 2008 +0000
+++ b/dbd/sqlite3/statement.c	Tue Dec 02 08:10:54 2008 +0000
@@ -157,8 +157,7 @@
 /*
  * must be called after an execute
  */
-static int statement_fetch_impl(lua_State *L, int named_columns) {
-    statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_SQLITE_STATEMENT);
+static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_columns) {
     int num_columns;
 
     if (!statement->stmt) {
@@ -248,18 +247,38 @@
     return 1;    
 }
 
-/*
- * array = statement:fetch() 
- */
-static int statement_fetch(lua_State *L) {
-    return statement_fetch_impl(L, 0);
+static int next_iterator(lua_State *L) {
+    statement_t *statement = (statement_t *)luaL_checkudata(L, lua_upvalueindex(1), DBD_SQLITE_STATEMENT);
+    int named_columns = lua_toboolean(L, lua_upvalueindex(2));
+
+    return statement_fetch_impl(L, statement, named_columns);
 }
 
 /*
- * hashmap = statement:fetchtable() 
+ * iterfunc = statement:fetch(named_indexes)
  */
-static int statement_fetchtable(lua_State *L) {
-    return statement_fetch_impl(L, 1);
+
+static int statement_fetch(lua_State *L) {
+    if (lua_gettop(L) == 1) {
+        lua_pushvalue(L, 1);
+        lua_pushboolean(L, 0);
+    } else {
+        lua_pushvalue(L, 1);
+        lua_pushboolean(L, lua_toboolean(L, 2));
+    }
+
+    lua_pushcclosure(L, next_iterator, 2);
+    return 1;
+}
+
+/*
+ * table = statement:row(named_indexes)
+ */
+static int statement_row(lua_State *L) {
+    statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_SQLITE_STATEMENT);
+    int named_columns = lua_toboolean(L, 2);
+
+    return statement_fetch_impl(L, statement, named_columns);
 }
 
 /*
@@ -296,7 +315,7 @@
 	{"close", statement_close},
 	{"execute", statement_execute},
 	{"fetch", statement_fetch},
-	{"fetchtable", statement_fetchtable},
+	{"row", statement_row},
 	{NULL, NULL}
     };