model/base: Move code into "database" and "search" modules

skylines/database.py

@@ -1,3 +1,26 @@
 from flask.ext.sqlalchemy import SQLAlchemy
 
+
+def query(cls, **kw):
+    q = db.session.query(cls)
+
+    if kw:
+        q = q.filter_by(**kw)
+
+    return q
+
+
+def get(cls, id):
+    return cls.query().get(id)
+
+
+def exists(cls, **kw):
+    return cls.query(**kw).first() is not None
+
+
 db = SQLAlchemy(session_options=dict(expire_on_commit=False))
+
+db.Model.flask_query = db.Model.query
+db.Model.query = classmethod(query)
+db.Model.get = classmethod(get)
+db.Model.exists = classmethod(exists)

skylines/model/__init__.py

@@ -2,9 +2,6 @@
 
 # flake8: noqa
 
-import skylines.model.base
-
-# Import your model modules here.
 from .aircraft_model import AircraftModel
 from .airport import Airport
 from .airspace import Airspace

skylines/model/search.py

@@ -69,6 +69,8 @@ def search_query(cls, tokens,
 
     return query
 
+db.Model.search_query = classmethod(search_query)
+
 
 def combined_search_query(models, tokens, include_misses=False, ordered=True):
     models, tokens = process_type_option(models, tokens)