summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2006-06-15 20:30:04 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2006-06-15 20:30:04 +0000
commitb63c5cc8b150e02c29e470cccd95b261d312654f (patch)
tree4a115c2e2bdd55db2c9766651819b6d1d0266bf5
parenta51e9032708702122955c939b325a50eb45f723f (diff)
downloadsqlalchemy-b63c5cc8b150e02c29e470cccd95b261d312654f.tar.gz
fixed 'port' attribute of URL to be an integer if present [ticket:209]
-rw-r--r--CHANGES1
-rw-r--r--lib/sqlalchemy/engine/url.py7
-rw-r--r--test/testbase.py2
3 files changed, 7 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 8c17e72dd..020c5bf50 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,7 @@ auto-foreignkey detection [ticket:151]
the MetaData object properly
- fixed bug where Column with redefined "key" property wasnt getting
type conversion happening in the ResultProxy [ticket:207]
+- fixed 'port' attribute of URL to be an integer if present
0.2.2
- big improvements to polymorphic inheritance behavior, enabling it
diff --git a/lib/sqlalchemy/engine/url.py b/lib/sqlalchemy/engine/url.py
index fbaf6c964..65c9f1662 100644
--- a/lib/sqlalchemy/engine/url.py
+++ b/lib/sqlalchemy/engine/url.py
@@ -8,7 +8,10 @@ class URL(object):
self.username = username
self.password = password
self.host = host
- self.port = port
+ if port is not None:
+ self.port = int(port)
+ else:
+ self.port = None
self.database= database
self.query = query or {}
def __str__(self):
@@ -21,7 +24,7 @@ class URL(object):
if self.host is not None:
s += self.host
if self.port is not None:
- s += ':' + self.port
+ s += ':' + str(self.port)
if self.database is not None:
s += '/' + self.database
if len(self.query):
diff --git a/test/testbase.py b/test/testbase.py
index bec34487f..0ec494bae 100644
--- a/test/testbase.py
+++ b/test/testbase.py
@@ -62,7 +62,7 @@ def parse_argv():
elif DBTYPE == 'postgres':
db_uri = 'postgres://scott:tiger@127.0.0.1:5432/test'
elif DBTYPE == 'mysql':
- db_uri = 'mysql://scott:tiger@127.0.0.1/test'
+ db_uri = 'mysql://scott:tiger@127.0.0.1:3306/test'
elif DBTYPE == 'oracle':
db_uri = 'oracle://scott:tiger@127.0.0.1:1521'
elif DBTYPE == 'oracle8':