diff options
author | Adrien Di Mascio <Adrien.DiMascio@logilab.fr> | 2006-08-11 15:49:45 +0200 |
---|---|---|
committer | Adrien Di Mascio <Adrien.DiMascio@logilab.fr> | 2006-08-11 15:49:45 +0200 |
commit | dd75213160031c43c2ff68f9b6e08a5ec3c7aea2 (patch) | |
tree | 5abb0e52ceafec3d32c4bf7050caf66f9067daa7 | |
parent | a67628ec1a006385bbbccaf4873d03ae5ee005d3 (diff) | |
download | logilab-common-dd75213160031c43c2ff68f9b6e08a5ec3c7aea2.tar.gz |
fixed port handling and tests
-rw-r--r-- | db.py | 12 | ||||
-rw-r--r-- | test/unittest_db.py | 5 |
2 files changed, 10 insertions, 7 deletions
@@ -215,7 +215,8 @@ class _PgsqlAdapter(DBAPIAdapter): """ def connect(self, host='', database='', user='', password='', port=''): """Handles psycopg connexion format""" - kwargs = {'host' : host, 'port': port, 'database' : database, + kwargs = {'host' : host, 'port': port or None, + 'database' : database, 'user' : user, 'password' : password or None} cnx = self._native_module.connect(**kwargs) return self._wrap_if_needed(cnx) @@ -338,15 +339,18 @@ class _SqliteAdapter(DBAPIAdapter): class _MySqlDBAdapter(DBAPIAdapter): """Simple mysql Adapter to DBAPI """ - def connect(self, host='', database='', user='', password='', port='', + def connect(self, host='', database='', user='', password='', port=None, unicode=False): """Handles mysqldb connexion format the unicode named argument asks to use Unicode objects for strings in result sets and query parameters """ - kwargs = {'host' : host, 'port' : port, 'db' : database, - 'user' : user, 'passwd' : password or None, + kwargs = {'host' : host, 'db' : database, + 'user' : user, 'passwd' : password, 'use_unicode' : unicode} + if port: + # MySqlDb requires port to be an integer + kwargs['port'] = port return self._native_module.connect(**kwargs) diff --git a/test/unittest_db.py b/test/unittest_db.py index 8049220..c361e43 100644 --- a/test/unittest_db.py +++ b/test/unittest_db.py @@ -49,7 +49,7 @@ class PreferedDriverTC(TestCase): class getCnxTC(TestCase): def setUp(self): self.host = 'crater.logilab.fr' - self.db = 'gincotest2' + self.db = 'template1' self.user = 'adim' self.passwd = 'adim' @@ -83,8 +83,7 @@ class getCnxTC(TestCase): def testMysql(self): set_prefered_driver('mysql', 'MySQLdb') try: - cnx = get_connection('mysql', - self.host, self.db, self.user, self.passwd, + cnx = get_connection('mysql', self.host, database='', user='root', quiet=1) except ImportError: self.skip('python-mysqldb is not installed') |