testcase to test unicode in db result

webpy · Nov 27, 2008 · 18b6b3f · 18b6b3f
1 parent 3bd830e
commit 18b6b3f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/test/db.py b/test/db.py
@@ -87,6 +87,12 @@ def test_multiple_insert(self):
         assert db.select("person", where="name='a'")
         assert db.select("person", where="name='b'")
 
+    def testUnicode(self):
+        db = webtest.setup_database(self.dbname)
+        self.db.insert('person', False, name='user')
+        name = db.select('person')[0].name
+        self.assertEquals(type(name), unicode)
+
 class SqliteTest(DBTest):
     dbname = "sqlite"
 

diff --git a/web/db.py b/web/db.py
@@ -419,7 +419,7 @@ def __init__(self, db_module, keywords):
             self.has_pooling = False
 
         # Pooling can be disabled by passing pooling=False in the keywords.
-        self.has_pooling = self.has_pooling and self.keywords.pop('pooling', True)        
+        self.has_pooling = self.keywords.pop('pooling', True) and self.has_pooling
 
     def _getctx(self): 
         if not self._ctx.get('db'):