dpriskorn/owl-map
1
0
Fork 0
forked from edward/owl-map
Code Pull requests Activity

Adjust Base class to make mypy happy.

Browse source
This commit is contained in:
Edward Betts 2023-05-15 19:37:53 +00:00
parent 26b47a5dd3
commit dd9078f258
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
matcher/model.py
View file

@ -9,10 +9,11 @@ from geoalchemy2 import Geometry
from sqlalchemy import func from sqlalchemy import func
from sqlalchemy.dialects import postgresql from sqlalchemy.dialects import postgresql
from sqlalchemy.ext.associationproxy import association_proxy from sqlalchemy.ext.associationproxy import association_proxy
from sqlalchemy.ext.declarative import declarative_base, declared_attr from sqlalchemy.ext.declarative import declared_attr
from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.ext.hybrid import hybrid_property
from sqlalchemy.orm import backref, column_property, deferred, relationship from sqlalchemy.orm import backref, column_property, deferred, registry, relationship
from sqlalchemy.orm.collections import attribute_mapped_collection from sqlalchemy.orm.collections import attribute_mapped_collection
from sqlalchemy.orm.decl_api import DeclarativeMeta
from sqlalchemy.schema import Column, ForeignKey from sqlalchemy.schema import Column, ForeignKey
from sqlalchemy.sql.expression import cast from sqlalchemy.sql.expression import cast
from sqlalchemy.types import BigInteger, Boolean, DateTime, Float, Integer, String, Text from sqlalchemy.types import BigInteger, Boolean, DateTime, Float, Integer, String, Text
@ -20,8 +21,18 @@ from sqlalchemy.types import BigInteger, Boolean, DateTime, Float, Integer, Stri
from . import mail, utils, wikidata from . import mail, utils, wikidata
from .database import now_utc, session from .database import now_utc, session
Base = declarative_base() mapper_registry = registry()
Base.query = session.query_property()
class Base(metaclass=DeclarativeMeta):
__abstract__ = True
registry = mapper_registry
metadata = mapper_registry.metadata
query = session.query_property()
__init__ = mapper_registry.constructor
re_point = re.compile(r"^POINT\((.+) (.+)\)$") re_point = re.compile(r"^POINT\((.+) (.+)\)$")