sqla - prevent AjaxSelectField autoflush while populating model

examples/sqla/app.py

@@ -20,8 +20,7 @@ app.config['SECRET_KEY'] = '123456790'
 app.config['DATABASE_FILE'] = 'sample_db.sqlite'
 app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + app.config['DATABASE_FILE']
 app.config['SQLALCHEMY_ECHO'] = True
-session_options = dict(autoflush=False)
-db = SQLAlchemy(app, session_options=session_options)
+db = SQLAlchemy(app)
 
 
 # Create models

flask_admin/contrib/sqla/ajax.py

@@ -55,7 +55,9 @@ class QueryAjaxModelLoader(AjaxModelLoader):
         return (getattr(model, self.pk), as_unicode(model))
 
     def get_one(self, pk):
-        return self.session.query(self.model).get(pk)
+        # prevent autoflush from occuring during populate_obj
+        with self.session.no_autoflush:
+            return self.session.query(self.model).get(pk)
 
     def get_list(self, term, offset=0, limit=DEFAULT_PAGE_SIZE):
         query = self.session.query(self.model)