Make sure column names with spaces in them end up in cursor.description.

Author: gh

pysqlite2/test/regression.py

@@ -61,6 +61,14 @@ def CheckStatementReset(self):
 
  con.rollback()
 
+ def CheckColumnNameWithSpaces(self):
+ cur = self.con.cursor()
+ cur.execute('select 1 as "foo bar [datetime]"')
+ self.failUnlessEqual(cur.description[0][0], "foo bar")
+
+ cur.execute('select 1 as "foo baz"')
+ self.failUnlessEqual(cur.description[0][0], "foo baz")
+
 def suite():
  regression_suite = unittest.makeSuite(RegressionTests, "Check")
  return unittest.TestSuite((regression_suite,))

src/cursor.c

@@ -224,7 +224,10 @@ PyObject* _build_column_name(const char* colname)
  }
 
  for (pos = colname;; pos++) {
- if (*pos == 0 || *pos == ' ') {
+ if (*pos == 0 || *pos == '[') {
+ if ((*pos == '[') && (pos > colname) && (*(pos-1) == ' ')) {
+ pos--;
+ }
  return PyString_FromStringAndSize(colname, pos - colname);
  }
  }