fixed up session and query handling in basemodels.py

Author: jstacoder

flask_xxl/apps/auth/models.py

@@ -1,18 +1,16 @@
 from basemodels import BaseMixin
 from flask import url_for
-from ext import db
 from LoginUtils import encrypt_password, check_password
+from sqlalchemy import Column,String,Integer,Boolean,Date,DateTime,ForeignKey,UnicodeText,Table
+from sqlalchemy.orm import relationship,backref
 
-#import sqlalchemy to global namespace
-for attr in dir(db):
-    if not attr.startswith('_'):
-        globals()[attr] = getattr(db,attr)
 
+#import sqlalchemy to global namespace
 
 class UnknownUser(object):
     is_unknown = True
 
-class Role(BaseMixin,Model):
+class Role(BaseMixin):
     __tablename__ = 'roles'
 
     name = Column(String(255))
@@ -21,7 +19,7 @@ class Role(BaseMixin,Model):
     can_edit = Column(Boolean,default=False,nullable=False)
     can_delete = Column(Boolean,default=False,nullable=False)
 
-class User(BaseMixin,Model):
+class User(BaseMixin):
     __tablename__ = 'users'
 
     first_name = Column(String(255),default="")
@@ -32,8 +30,6 @@ class User(BaseMixin,Model):
                     'users',lazy='dynamic'))
     add_date = Column(DateTime,default=func.now())
     _pw_hash = Column(UnicodeText,nullable=False)
-    articles = relationship('Article',backref=backref(
-                    'author'),lazy='dynamic',passive_deletes='all')
     age = Column(Integer)
 
 
@@ -90,7 +86,3 @@ def _get_absolute_url(self):
     def _get_edit_url(self):
         return '#'
 
-    @property 
-    def article_count(self):
-        return self.articles.query.count()
-

flask_xxl/basemodels.py

@@ -8,30 +8,42 @@
 from flask import current_app
 from inflection import underscore, pluralize
 from sqlalchemy.ext.declarative import as_declarative, declarative_base, declared_attr
+from sqlalchemy.ext.declarative.api import DeclarativeMeta
 from sqlalchemy.orm import scoped_session, sessionmaker
-from flask.ext.sqlalchemy import SQLAlchemy, _BoundDeclarativeMeta, _QueryProperty
-import sqlalchemy as db
+from flask.ext.sqlalchemy import SQLAlchemy, _BoundDeclarativeMeta
+from sqlalchemy import UniqueConstraint,Column,Integer,Text,String,Date,DateTime,ForeignKey,func,create_engine
+
+get_engine = lambda: create_engine(current_app.config['SQLALCHEMY_DATABASE_URI'])
+Session = lambda: scoped_session(sessionmaker(bind=get_engine()))
 
 Model = declarative_base()
 
-def ensure_class(f):
-    @wraps(f)
-    def wrapper(*args,**kwargs):
-        if type(args[0]) != DeclarativeMeta:
-            args[0] = args[0].__class__
-        return f(*args,**kwargs)
-    return wrapper
 
 class SQLAlchemyMissingException(Exception):
     pass
 
 class ModelDeclarativeMeta(_BoundDeclarativeMeta):
     pass
 
-@as_declarative(name='Model',metaclass=ModelDeclarativeMeta)
+@as_declarative(name='BaseMixin',metaclass=ModelDeclarativeMeta)
 class BaseMixin(Model):
-    _engine = None
     __abstract__ = True
+    _session = None
+
+
+    @property
+    def _engine(self):
+        return get_engine()
+
+    @declared_attr
+    def id(self):
+        return Column(Integer,primary_key=True)
+
+    @classmethod
+    def get_session(cls):
+        if cls._session is None:
+            cls._session = Session()
+        return cls._session
 
     @staticmethod
     def make_table_name(name):
@@ -40,16 +52,7 @@ def make_table_name(name):
     @declared_attr
     def __tablename__(self):
         return BaseMixin.make_table_name(self.__name__)
-
-    @classmethod
-    @ensure_class
-    def query(cls,*args,**kwargs):
-        return 
-
-    @declared_attr
-    def id(self):
-        return db.Column(db.Integer,db.Sequence('user_id_seq'),primary_key=True)
-
+    
     @classmethod
     def get_by_id(cls, id):
         if any(
@@ -60,23 +63,8 @@ def get_by_id(cls, id):
         return None
 
     @classmethod
-    @ensure_class
     def get_all(cls):
-        return cls.query().all()
-
-    @classmethod
-    @ensure_class
-    def query(cls):
-        return cls.session.query(cls)
-
-    @property
-    def session(self):
-        factory = sessionmaker(bind=self.engine)
-        return scoped_session(factory)
-
-    @property
-    def engine(self):
-        return self._engine or db.engine
+        return cls.query.all()
 
     @classmethod
     def create(cls, **kwargs):
@@ -101,6 +89,10 @@ def delete(self, commit=True):
         self.session.delete(self)
         return commit and self.session.commit()
 
+    @classmethod
+    def query(cls):
+        return cls.get_session().query(cls)
+
     @property
     def absolute_url(self):
         return self._get_absolute_url()

flask_xxl/templates/blueprint/+blueprint.name+/__init__.py.bob

@@ -0,0 +1,8 @@
+from flask import Blueprint
+
+{{{ blueprint.name }}} = Blueprint('{{{ blueprint.name }}}',__name__,
+                            template_folder='templates/{{{ blueprint.name }}}',
+                            url_prefix='{{{ blueprint.name }}}')
+
+from .views import *
+from .models import *

flask_xxl/templates/project/+project.name+/+project.name+/__init__.py

@@ -1,4 +1,4 @@
-VERSION = '0,6,9'
+VERSION = '0,7,0'
 import os
 from setuptools import setup, find_packages,findall
 from glob import glob