add fetch_next_row method that simply returns a tuple and change canc…

…el to a cpdef method

_mssql.pxd

@@ -1,5 +1,8 @@
 from sqlfront cimport DBPROCESS, BYTE
 
+
+cdef void log(char *, ...)
+
 cdef struct _mssql_parameter_node:
     _mssql_parameter_node *next
     BYTE                  *value
@@ -23,9 +26,11 @@ cdef class MSSQLConnection:
     cdef tuple column_names
     cdef tuple column_types
 
+    cpdef cancel(self)
     cdef void clear_metadata(self)
     cdef convert_db_value(self, BYTE *, int, int)
     cdef BYTE *convert_python_value(self, value, int*, int*)
+    cdef fetch_next_row(self, int)
     cdef fetch_next_row_dict(self, int)
     cdef format_and_run_query(self, query_string, params=?)
     cdef format_sql_command(self, format, params=?)

_mssql.pyx

@@ -131,7 +131,7 @@ min_error_severity = 6
 # Buffer size for large numbers
 DEF NUMERIC_BUF_SZ = 45
 
-cdef void log(char * message):
+cdef void log(char * message, ...):
     if PYMSSQL_DEBUG != 1:
         return
     fprintf(stderr, "+++ %s\n", message)
@@ -414,7 +414,7 @@ cdef class MSSQLConnection:
         clr_err(self)
         return MSSQLRowIterator(self)
 
-    def cancel(self):
+    cpdef cancel(self):
         """
         cancel() -- cancel all pending results.
         
@@ -736,11 +736,10 @@ cdef class MSSQLConnection:
             return None
 
         return self.get_row(rtc)[0]
-    
-    cdef fetch_next_row_dict(self, int throw):
+
+    cdef fetch_next_row(self, int throw):
         cdef RETCODE rtc
-        cdef int col
-        log("_mssql.MSSQLConnection.fetch_next_row_dict()")
+        log("_mssql.MSSQLConnection.fetch_next_row()")
 
         self.get_result()
 
@@ -762,9 +761,15 @@ cdef class MSSQLConnection:
             if throw:
                 raise StopIteration
             return None
-
+
+        return self.get_row(rtc)
+
+    cdef fetch_next_row_dict(self, int throw):
+        cdef int col
+        log("_mssql.MSSQLConnection.fetch_next_row_dict()")
+
         row_dict = {}
-        row = self.get_row(rtc)
+        row = self.fetch_next_row(throw)
 
         for col in xrange(1, self.num_columns + 1):
             name = self.column_names[col - 1]