model: Move db variable into new "database" module

migrations/versions/46434b0a4c10_split_user_name_into.py

@@ -4,7 +4,8 @@
 
 from alembic import op
 import sqlalchemy as sa
-from skylines.model import db
+
+from skylines.database import db
 
 
 users = sa.sql.table(

skylines/app.py

@@ -22,7 +22,7 @@ def __init__(self, name='skylines', config_file=None, *args, **kw):
 
     def add_sqlalchemy(self):
         """ Create and configure SQLAlchemy extension """
-        from skylines.model import db
+        from skylines.database import db
         db.init_app(self)
 
         from flask.ext.migrate import Migrate

skylines/commands/aircraft.py

@@ -1,5 +1,6 @@
 from flask.ext.script import Manager
-from skylines.model import db, AircraftModel
+from skylines.database import db
+from skylines.model import AircraftModel
 
 manager = Manager(help="Perform operations related to the aircraft tables")
 

skylines/commands/database.py

@@ -1,7 +1,7 @@
 from flask.ext.script import Manager, prompt_bool
 from flask.ext.migrate import stamp
 
-from skylines.model import db
+from skylines.database import db
 from tests.data.bootstrap import bootstrap as _bootstrap
 
 manager = Manager(help="Perform database operations")

skylines/commands/flights/analysis.py

@@ -2,7 +2,8 @@
 
 from flask import current_app
 from sqlalchemy.orm import joinedload
-from skylines.model import db, Flight
+from skylines.database import db
+from skylines.model import Flight
 from skylines.lib.xcsoar_ import analyse_flight
 from skylines.worker import tasks
 

skylines/commands/flights/copy_flights.py

@@ -3,7 +3,8 @@
 import os
 import shutil
 from flask import current_app
-from skylines.model import db, Flight, IGCFile
+from skylines.database import db
+from skylines.model import Flight, IGCFile
 
 from selector import selector_options, select
 

skylines/commands/flights/delete_flights.py

@@ -1,6 +1,7 @@
 from flask.ext.script import Command, Option
 
-from skylines.model import db, Flight, IGCFile
+from skylines.database import db
+from skylines.model import Flight, IGCFile
 from skylines.lib import files
 
 from selector import selector_options, select

skylines/commands/flights/find_meetings.py

@@ -1,6 +1,7 @@
 from flask.ext.script import Command, Option
 from flask import current_app
-from skylines.model import db, Flight
+from skylines.database import db
+from skylines.model import Flight
 from skylines.worker import tasks
 
 from selector import selector_options, select

skylines/commands/flights/update_flight_paths.py

@@ -1,7 +1,8 @@
 from flask.ext.script import Command, Option
 
 from sqlalchemy.orm import joinedload
-from skylines.model import db, Flight
+from skylines.database import db
+from skylines.model import Flight
 
 from selector import selector_options, select
 

skylines/commands/import_/airspace.py

@@ -12,7 +12,8 @@
 from shapely.geos import ReadingError
 from sqlalchemy.sql.expression import case
 from sqlalchemy import func
-from skylines.model import db, Airspace
+from skylines.database import db
+from skylines.model import Airspace
 from skylines.lib.geo import FEET_PER_METER
 
 airspace_re = re.compile(r'^([^#]{1}.*?)\s+(openair|sua)\s+(https?://.*|file://.*)')

skylines/commands/import_/dmst_index.py

@@ -1,7 +1,8 @@
 from flask.ext.script import Command, Option
 
 import re
-from skylines.model import db, AircraftModel
+from skylines.database import db
+from skylines.model import AircraftModel
 
 r = re.compile(r'^(.*?)\s*\.+[\.\s]*(\d+)\s*$')
 

skylines/commands/import_/mwp.py

@@ -1,7 +1,8 @@
 from flask.ext.script import Command, Option
 
 import math
-from skylines.model import db, MountainWaveProject
+from skylines.database import db
+from skylines.model import MountainWaveProject
 from skylines.lib.string import isnumeric
 from geoalchemy2.elements import WKTElement
 from geoalchemy2.shape import from_shape

skylines/commands/import_/srtm.py

@@ -7,7 +7,8 @@
 import tempfile
 from glob import glob
 from flask import current_app
-from skylines.model import db
+
+from skylines.database import db
 
 
 class SRTM(Command):

skylines/commands/import_/welt2000.py

@@ -1,6 +1,7 @@
 from flask.ext.script import Command, Option
 
-from skylines.model import db, Airport
+from skylines.database import db
+from skylines.model import Airport
 from skylines.lib.waypoints.welt2000 import get_database
 from datetime import datetime
 from sqlalchemy.sql.expression import or_, and_

skylines/commands/notifications/mark_all_unread.py

@@ -1,5 +1,6 @@
 from flask.ext.script import Command
-from skylines.model import db, Notification
+from skylines.database import db
+from skylines.model import Notification
 
 
 class MarkAllUnread(Command):

skylines/commands/shell.py

@@ -1,11 +1,11 @@
 from flask.ext.script import Shell as BaseShell
 
 from flask import current_app
-from skylines import model
+from skylines import model, database
 
 
 def make_context():
-    return dict(app=current_app, model=model, db=model.db)
+    return dict(app=current_app, model=model, db=database.db)
 
 
 class Shell(BaseShell):

skylines/commands/tracking/clear.py

@@ -1,5 +1,6 @@
 from flask.ext.script import Command, Option
-from skylines.model import db, TrackingFix
+from skylines.database import db
+from skylines.model import TrackingFix
 
 
 class Clear(Command):

skylines/commands/tracking/export.py

@@ -7,7 +7,8 @@
 from collections import Counter
 
 from skylines.lib import base36
-from skylines.model import db, TrackingFix, User
+from skylines.database import db
+from skylines.model import TrackingFix, User
 
 
 class Export(Command):

skylines/commands/tracking/fill_missing_keys.py

@@ -1,5 +1,6 @@
 from flask.ext.script import Command
-from skylines.model import db, User
+from skylines.database import db
+from skylines.model import User
 
 
 class FillMissingKeys(Command):

skylines/commands/tracking/generate.py

@@ -4,7 +4,9 @@
 from math import sin
 from random import randint
 from time import sleep
-from skylines.model import db, TrackingFix
+
+from skylines.database import db
+from skylines.model import TrackingFix
 
 
 class Generate(Command):

skylines/commands/tracking/stats.py

@@ -2,7 +2,9 @@
 
 from datetime import timedelta
 from itertools import chain
-from skylines.model import db, TrackingFix, User
+
+from skylines.database import db
+from skylines.model import TrackingFix, User
 
 
 class Stats(Command):

skylines/commands/users/merge.py

@@ -1,7 +1,9 @@
 from flask.ext.script import Command, Option
 
 import sys
-from skylines.model import db, User, Club, IGCFile, Flight, TrackingFix
+
+from skylines.database import db
+from skylines.model import User, Club, IGCFile, Flight, TrackingFix
 
 
 class Merge(Command):

skylines/database.py

@@ -0,0 +1,3 @@
+from flask.ext.sqlalchemy import SQLAlchemy
+
+db = SQLAlchemy(session_options=dict(expire_on_commit=False))

skylines/frontend/forms/validators.py

@@ -1,7 +1,8 @@
 from wtforms.validators import ValidationError
 from sqlalchemy.sql.expression import or_
 
-from skylines.model import db, Flight
+from skylines.database import db
+from skylines.model import Flight
 
 
 class CompareTo(object):

skylines/frontend/views/club.py

@@ -1,9 +1,10 @@
 from flask import Blueprint, render_template, g, redirect, url_for, abort
 from sqlalchemy import func
 
+from skylines.database import db
 from skylines.frontend.forms import EditClubForm
 from skylines.lib.dbutil import get_requested_record
-from skylines.model import db, User, Club
+from skylines.model import User, Club
 
 club_blueprint = Blueprint('club', 'skylines')
 

skylines/frontend/views/flight.py

@@ -9,6 +9,7 @@
 from geoalchemy2.shape import to_shape
 from datetime import timedelta
 
+from skylines.database import db
 from skylines.frontend.forms import ChangePilotsForm, ChangeAircraftForm
 from skylines.lib import files
 from skylines.lib.dbutil import get_requested_record_list
@@ -19,7 +20,7 @@
 from skylines.lib.geo import METERS_PER_DEGREE
 from skylines.lib.geoid import egm96_height
 from skylines.model import (
-    db, User, Flight, FlightPhase, Location, FlightComment,
+    User, Flight, FlightPhase, Location, FlightComment,
     Notification, Event, FlightMeetings
 )
 from skylines.model.event import create_flight_comment_notifications

skylines/frontend/views/flights.py

@@ -7,10 +7,11 @@
 from sqlalchemy.orm import joinedload, contains_eager
 from sqlalchemy.orm.util import aliased
 
+from skylines.database import db
 from skylines.lib.table_tools import Pager, Sorter
 from skylines.lib.dbutil import get_requested_record
 from skylines.model import (
-    db, User, Club, Flight, IGCFile, AircraftModel,
+    User, Club, Flight, IGCFile, AircraftModel,
     Airport, FlightComment,
     Notification, Event,
 )

skylines/frontend/views/livetrack24.py

@@ -3,7 +3,8 @@
 from flask import Blueprint, request
 from werkzeug.exceptions import BadRequest, NotFound, NotImplemented
 
-from skylines.model import db, User, TrackingFix, TrackingSession, Elevation
+from skylines.database import db
+from skylines.model import User, TrackingFix, TrackingSession, Elevation
 
 lt24_blueprint = Blueprint('lt24', 'skylines')
 

skylines/frontend/views/notifications.py

@@ -3,7 +3,7 @@
 from sqlalchemy.sql.expression import or_
 
 from skylines.lib.util import str_to_bool
-from skylines.model import db
+from skylines.database import db
 from skylines.model.event import Event, Notification, Flight, group_events
 from skylines.lib.decorators import login_required
 

skylines/frontend/views/ranking.py

@@ -5,7 +5,8 @@
 from sqlalchemy.sql.expression import desc, over
 from sqlalchemy.orm import eagerload
 
-from skylines.model import db, User, Club, Flight, Airport
+from skylines.database import db
+from skylines.model import User, Club, Flight, Airport
 from skylines.lib.table_tools import Pager, Sorter
 
 ranking_blueprint = Blueprint('ranking', 'skylines')

skylines/frontend/views/settings.py

@@ -3,12 +3,13 @@
 
 from sqlalchemy.sql.expression import and_, or_
 
+from skylines.database import db
 from skylines.frontend.forms import (
     ChangePasswordForm, EditPilotForm, LiveTrackingSettingsForm,
     ChangeClubForm, CreateClubForm
 )
 from skylines.lib.dbutil import get_requested_record
-from skylines.model import db, User, Club, Flight, IGCFile
+from skylines.model import User, Club, Flight, IGCFile
 from skylines.frontend.views.users import send_recover_mail
 from skylines.model.event import (
     create_club_join_event

skylines/frontend/views/statistics.py

@@ -1,8 +1,9 @@
 from flask import Blueprint, render_template, abort
 from sqlalchemy import func, distinct
 
+from skylines.database import db
 from skylines.lib.dbutil import get_requested_record
-from skylines.model import db, User, Club, Flight, Airport
+from skylines.model import User, Club, Flight, Airport
 
 statistics_blueprint = Blueprint('statistics', 'skylines')
 

skylines/frontend/views/upload.py

@@ -10,14 +10,15 @@
 from redis.exceptions import ConnectionError
 from werkzeug.exceptions import BadRequest
 
+from skylines.database import db
 from skylines.frontend.forms import UploadForm, UploadUpdateForm
 from skylines.lib import files
 from skylines.lib.util import pressure_alt_to_qnh_alt
 from skylines.lib.decorators import login_required
 from skylines.lib.md5 import file_md5
 from skylines.lib.sql import query_to_sql
 from skylines.lib.xcsoar_ import flight_path, analyse_flight
-from skylines.model import db, User, Flight, IGCFile, Airspace
+from skylines.model import User, Flight, IGCFile, Airspace
 from skylines.model.airspace import get_airspace_infringements
 from skylines.model.event import create_flight_notifications
 from skylines.worker import tasks

skylines/frontend/views/user.py

@@ -6,9 +6,10 @@
 from sqlalchemy import func, and_
 from sqlalchemy.orm import contains_eager, subqueryload
 
+from skylines.database import db
 from skylines.lib.dbutil import get_requested_record
 from skylines.model import (
-    db, User, Flight, Follower, Location, Notification, Event
+    User, Flight, Follower, Location, Notification, Event
 )
 from skylines.model.event import create_follower_notification
 

skylines/frontend/views/users.py

@@ -9,7 +9,8 @@
 from sqlalchemy import func
 from sqlalchemy.orm import joinedload
 
-from skylines.model import db, User
+from skylines.database import db
+from skylines.model import User
 from skylines.model.event import create_new_user_event
 from skylines.frontend.forms import CreatePilotForm, RecoverStep1Form, RecoverStep2Form
 

skylines/lib/xcsoar_/flightpath.py

@@ -3,8 +3,9 @@
 from shapely.geometry import MultiPoint
 from geoalchemy2.shape import from_shape
 
+from skylines.database import db
 from skylines.lib import files
-from skylines.model import db, Elevation, IGCFile, Location
+from skylines.model import Elevation, IGCFile, Location
 from xcsoar import Flight
 
 

skylines/model/__init__.py

@@ -2,10 +2,6 @@
 
 # flake8: noqa
 
-from flask.ext.sqlalchemy import SQLAlchemy
-
-db = SQLAlchemy(session_options=dict(expire_on_commit=False))
-
 import skylines.model.base
 
 # Import your model modules here.

skylines/model/aircraft_model.py

@@ -1,6 +1,6 @@
 from sqlalchemy.types import Integer, Unicode
 
-from skylines.model import db
+from skylines.database import db
 
 
 class AircraftModel(db.Model):