diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/ext/declarative.py | 23 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/__init__.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/properties.py | 10 |
4 files changed, 25 insertions, 20 deletions
diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py index 77c6a7684..eeb7de87d 100644 --- a/lib/sqlalchemy/ext/declarative.py +++ b/lib/sqlalchemy/ext/declarative.py @@ -84,7 +84,7 @@ using them:: Synonyms are one area where ``declarative`` needs to slightly change the usual SQLAlchemy configurational syntax. To define a getter/setter which -proxies to an underlying attribute, use ``synonym`` with the ``instruments`` +proxies to an underlying attribute, use ``synonym`` with the ``descriptor`` argument:: class MyClass(Base): @@ -96,7 +96,7 @@ argument:: return self._some_attr def _set_attr(self, attr) self._some_attr = attr - attr = synonym('_attr', instruments=property(_get_attr, _set_attr)) + attr = synonym('_attr', descriptor=property(_get_attr, _set_attr)) The above synonym is then usable as an instance attribute as well as a class-level expression construct:: @@ -160,7 +160,7 @@ Mapped instances then make usage of ``Session`` in the usual way. from sqlalchemy.schema import Table, SchemaItem, Column, MetaData from sqlalchemy.orm import synonym as _orm_synonym, mapper, comparable_property from sqlalchemy.orm.interfaces import MapperProperty -from sqlalchemy.orm.properties import PropertyLoader +from sqlalchemy.orm.properties import PropertyLoader, ColumnProperty from sqlalchemy import util __all__ = ['declarative_base', 'synonym_for', 'comparable_using', @@ -198,7 +198,12 @@ class DeclarativeMeta(type): table_kw = {} cols = [] for key, c in our_stuff.iteritems(): - if isinstance(c, Column): + if isinstance(c, ColumnProperty): + for col in c.columns: + if isinstance(col, Column) and col.table is None: + _undefer_column_name(key, col) + cols.append(col) + elif isinstance(c, Column): _undefer_column_name(key, c) cols.append(c) cls.__table__ = table = Table(tablename, cls.metadata, @@ -236,16 +241,16 @@ def _deferred_relation(cls, prop): return prop def declared_synonym(prop, name): - """deprecated. use synonym(name, instrument=prop).""" + """deprecated. use synonym(name, descriptor=prop).""" - return _orm_synonym(name, instrument=prop) + return _orm_synonym(name, descriptor=prop) declared_synonym = util.deprecated(declared_synonym) def synonym_for(name, map_column=False): """Decorator, make a Python @property a query synonym for a column. A decorator version of [sqlalchemy.orm#synonym()]. The function being - decoratred is the 'instrument', otherwise passes its arguments through + decoratred is the 'descriptor', otherwise passes its arguments through to synonym():: @synonym_for('col') @@ -256,11 +261,11 @@ def synonym_for(name, map_column=False): The regular ``synonym()`` is also usable directly in a declarative setting and may be convenient for read/write properties:: - prop = synonym('col', instrument=property(_read_prop, _write_prop)) + prop = synonym('col', descriptor=property(_read_prop, _write_prop)) """ def decorate(fn): - return _orm_synonym(name, map_column=map_column, instrument=fn) + return _orm_synonym(name, map_column=map_column, descriptor=fn) return decorate diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py index c30e96b01..011b6e360 100644 --- a/lib/sqlalchemy/orm/__init__.py +++ b/lib/sqlalchemy/orm/__init__.py @@ -547,7 +547,7 @@ def mapper(class_, local_table=None, *args, **params): return Mapper(class_, local_table, *args, **params) -def synonym(name, map_column=False, instrument=None, proxy=False): +def synonym(name, map_column=False, descriptor=None, proxy=False): """Set up `name` as a synonym to another mapped property. Used with the ``properties`` dictionary sent to [sqlalchemy.orm#mapper()]. @@ -589,7 +589,7 @@ def synonym(name, map_column=False, instrument=None, proxy=False): is not already available. """ - return SynonymProperty(name, map_column=map_column, instrument=instrument) + return SynonymProperty(name, map_column=map_column, descriptor=descriptor) def comparable_property(comparator_factory, descriptor=None): """Provide query semantics for an unmanaged attribute. diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 55dcabd32..3a6ea21cf 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -662,10 +662,10 @@ class Mapper(object): elif isinstance(prop, SynonymProperty) and setparent: - if prop.instrument is None: - prop.instrument = getattr(self.class_, key, None) - if isinstance(prop.instrument, Mapper._CompileOnAttr): - prop.instrument = object.__getattribute__(prop.instrument, 'existing_prop') + if prop.descriptor is None: + prop.descriptor = getattr(self.class_, key, None) + if isinstance(prop.descriptor, Mapper._CompileOnAttr): + prop.descriptor = object.__getattribute__(prop.descriptor, 'existing_prop') if prop.map_column: if not key in self.mapped_table.c: raise exceptions.ArgumentError("Can't compile synonym '%s': no column on table '%s' named '%s'" % (prop.name, self.mapped_table.description, key)) diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py index 0fd8ac2ef..834a7b339 100644 --- a/lib/sqlalchemy/orm/properties.py +++ b/lib/sqlalchemy/orm/properties.py @@ -150,10 +150,10 @@ class CompositeProperty(ColumnProperty): other.__composite_values__())]) class SynonymProperty(MapperProperty): - def __init__(self, name, map_column=None, instrument=None): + def __init__(self, name, map_column=None, descriptor=None): self.name = name self.map_column=map_column - self.instrument = instrument + self.descriptor = descriptor def setup(self, querycontext, **kwargs): pass @@ -166,7 +166,7 @@ class SynonymProperty(MapperProperty): def comparator(): return self.parent._get_property(self.key, resolve_synonyms=True).comparator self.logger.info("register managed attribute %s on class %s" % (self.key, class_.__name__)) - if self.instrument is None: + if self.descriptor is None: class SynonymProp(object): def __set__(s, obj, value): setattr(obj, self.name, value) @@ -176,8 +176,8 @@ class SynonymProperty(MapperProperty): if obj is None: return s return getattr(obj, self.name) - self.instrument = SynonymProp() - sessionlib.register_attribute(class_, self.key, uselist=False, proxy_property=self.instrument, useobject=False, comparator=comparator) + self.descriptor = SynonymProp() + sessionlib.register_attribute(class_, self.key, uselist=False, proxy_property=self.descriptor, useobject=False, comparator=comparator) def merge(self, session, source, dest, _recursive): pass |