Flush sqlalchemy session to get the object ids. Refs #390

examples/pyramid_example/example/auth.py

@@ -5,8 +5,8 @@
 from example.models import DBSession, User
 
 
-def login_user(strategy, user, user_social_auth):
-    strategy.strategy.session_set('user_id', user.id)
+def login_user(backend, user, user_social_auth):
+    backend.strategy.session_set('user_id', user.id)
 
 
 def login_required(request):

social/apps/pyramid_app/models.py

@@ -24,8 +24,6 @@ def init_social(config, Base, session):
     app_session = session
 
     class _AppSession(object):
-        COMMIT_SESSION = False
-
         @classmethod
         def _session(cls):
             return app_session

social/storage/sqlalchemy_orm.py

@@ -3,6 +3,8 @@
 import six
 import json
 
+import transaction
+
 from sqlalchemy import Column, Integer, String
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.types import PickleType, Text
@@ -22,8 +24,6 @@ def __init__(self, *args, **kwargs):
 
 
 class SQLAlchemyMixin(object):
-    COMMIT_SESSION = True
-
     @classmethod
     def _session(cls):
         raise NotImplementedError('Implement in subclass')
@@ -39,11 +39,18 @@ def _new_instance(cls, model, *args, **kwargs):
     @classmethod
     def _save_instance(cls, instance):
         cls._session().add(instance)
-        if cls.COMMIT_SESSION:
-            cls._session().commit()
-            cls._session().flush()
+        cls._flush()
         return instance
 
+    @classmethod
+    def _flush(cls):
+        try:
+            cls._session().flush()
+        except AssertionError:
+            with transaction.manager as manager:
+                print "COMMIT 5"
+                manager.commit()
+
     def save(self):
         self._save_instance(self)
 
@@ -84,11 +91,7 @@ def allowed_to_disconnect(cls, user, backend_name, association_id=None):
     @classmethod
     def disconnect(cls, entry):
         cls._session().delete(entry)
-        try:
-            cls._session().commit()
-        except AssertionError:
-            import transaction
-            transaction.commit()
+        cls._flush()
 
     @classmethod
     def user_query(cls):