update sqlalchemy

This commit is contained in:
Jan Gerber 2016-02-22 13:17:39 +01:00
commit a4267212e4
192 changed files with 17429 additions and 9601 deletions

View file

@ -1,5 +1,5 @@
# sql/annotation.py
# Copyright (C) 2005-2014 the SQLAlchemy authors and contributors
# Copyright (C) 2005-2016 the SQLAlchemy authors and contributors
# <see AUTHORS file>
#
# This module is part of SQLAlchemy and is released under
@ -46,6 +46,7 @@ class Annotated(object):
self.__dict__ = element.__dict__.copy()
self.__element = element
self._annotations = values
self._hash = hash(element)
def _annotate(self, values):
_values = self._annotations.copy()
@ -87,7 +88,7 @@ class Annotated(object):
return self.__class__(clone, self._annotations)
def __hash__(self):
return hash(self.__element)
return self._hash
def __eq__(self, other):
if isinstance(self.__element, operators.ColumnOperators):