summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/util.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2006-09-30 16:26:52 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2006-09-30 16:26:52 +0000
commit8a1706b494e5e164ea584dc4a573fa0873482dc7 (patch)
tree37fe5a3b5e2f1b1fbb50a131af6908d8d20e6536 /lib/sqlalchemy/util.py
parent7242a617cf749c5e43f192fd3a854237d3215623 (diff)
downloadsqlalchemy-8a1706b494e5e164ea584dc4a573fa0873482dc7.tar.gz
- fixed condition that occurred during reflection when a primary key
column was explciitly overridden, where the PrimaryKeyConstraint would get both the reflected and the programmatic column doubled up
Diffstat (limited to 'lib/sqlalchemy/util.py')
-rw-r--r--lib/sqlalchemy/util.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index 3664b8e6d..91e295435 100644
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -102,6 +102,11 @@ class OrderedProperties(object):
raise AttributeError(key)
def __contains__(self, key):
return key in self.__data
+ def get(self, key, default=None):
+ if self.has_key(key):
+ return self[key]
+ else:
+ return default
def keys(self):
return self.__data.keys()
def has_key(self, key):