Changeset Navigation

Changeset 165

Timestamp:

11/09/08 17:17:29

Author:

thejimmyg

Message:

Adding SQLAlchemy 0.5 support to the users driver

Files:

r162	r165
53	53	0.4.3
54	54
	55	* Adding SQLAlchemy 0.5 support, uses session.add() instead of session.save()
	56	* The multi handler now handles WSGI applications implemented as iterators,
	57	it already supported generators. The multi2.py example demonstrates this.
	58	* Set the pylons.status_code_redirect environment variable on all redirected
	59	AuthKit responses
55	60	* Set the pylons.error_call environment variable on all redirected AuthKit
56	61	responses

r158	r165
43	43	authkit/users/sqlalchemy_driver/sqlalchemy_04.py
44	44	authkit/users/sqlalchemy_driver/sqlalchemy_044.py
	45	authkit/users/sqlalchemy_driver/sqlalchemy_05.py
45	46	docs/community.txt
46	47	docs/download.txt
…	…
86	87	examples/docs/forward.py
87	88	examples/docs/multi.py
	89	examples/docs/multi2.py
88	90	examples/docs/open_id.py
89	91	examples/docs/open_id_sreg.py

r163	r165
4	4	0.4.3
5	5
	6	* Adding SQLAlchemy 0.5 support, uses session.add() instead of session.save()
6	7	* The multi handler now handles WSGI applications implemented as iterators,
7	8	it already supported generators. The multi2.py example demonstrates this.

r152	r165
15	15	import sqlalchemy
16	16
17		if sqlalchemy.__version__ >= '0.4.0':
	17	if sqlalchemy.__version__ >= '0.5':
	18	from sqlalchemy_05 import *
	19	elif sqlalchemy.__version__ >= '0.4.0':
18	20	# FIXME: specifically which version greater than 0.4.0 requires this?
19	21	from sqlalchemy_044 import *

r164	r165
1		# SQLAlchemy 0.4.4 Driver for AuthKit
2		# Based on update by Daniel Pronych
3		# Description: Custom SQLAlchemy 0.4.4 driver to work with AuthKit 0.4.0.
4
5		# This file assumes the following in the model used in Pylons 0.9.7 and the examples/user/database-model example
6		# * Removed all use of assign_ctx.mapper due to deprecation in 0.4.
7		# * Added insert for sqlalchemy.orm due to changes for SQLAlchemy 0.4.
8		# * Replaced usage of mapper with ctx.mapper for SQLAlchemy 0.4.4 ( > 0.4.0)
	1	# SQLAlchemy 0.5 Driver for AuthKit
	2	# Based on the SQLAlchemy 0.4.4 driver but using session.add() instead of
	3	# session.save()
	4
	5	# This file assumes the following in the model used in Pylons 0.9.7
9	6
10	7	from sqlalchemy import *
…	…
148	145	filter_by(name=group.lower()).first().uid
149	146	)
150		self.meta.Session.~~save~~(new_user)
	147	self.meta.Session.add(new_user)
151	148	self.meta.Session.flush()
152	149
…	…
160	157	raise AuthKitError("Role %r already exists"%role)
161	158	new_role = self.model.Role(role.lower())
162		self.meta.Session.~~save~~(new_role)
	159	self.meta.Session.add(new_role)
163	160	self.meta.Session.flush()
164	161
…	…
172	169	raise AuthKitError("Group %r already exists"%group)
173	170	new_group = self.model.Group(group.lower())
174		self.meta.Session.~~save~~(new_group)
	171	self.meta.Session.add(new_group)
175	172	self.meta.Session.flush()
176	173