Navigation

Changeset 2579

Timestamp:

03/28/06 11:39:53 (2 years ago)

Author:

adrian

Message:

Fixed #1442 -- Fixed multithreading problem with various database backends. Thanks, Eugene Lazutkin

Files:

r2346	r2579
45	45	Database.convertVariantToPython = variantToPython
46	46
47		class DatabaseWrapper:
	47	try:
	48	# Only exists in python 2.4+
	49	from threading import local
	50	except ImportError:
	51	# Import copy of _thread_local.py from python 2.4
	52	from django.utils._threading_local import local
	53
	54	class DatabaseWrapper(local):
48	55	def __init__(self):
49	56	self.connection = None

r2450	r2579
48	48	return getattr(self.cursor, attr)
49	49
50		class DatabaseWrapper:
	50	try:
	51	# Only exists in python 2.4+
	52	from threading import local
	53	except ImportError:
	54	# Import copy of _thread_local.py from python 2.4
	55	from django.utils._threading_local import local
	56
	57	class DatabaseWrapper(local):
51	58	def __init__(self):
52	59	self.connection = None
53	60	self.queries = []
54	61
	62	def _valid_connection(self):
	63	if self.connection is not None:
	64	try:
	65	self.connection.ping()
	66	return True
	67	except DatabaseError:
	68	self.connection.close()
	69	self.connection = None
	70	return False
	71
55	72	def cursor(self):
56	73	from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PORT, DATABASE_PASSWORD, DEBUG
57		if ~~self.connection is None~~:
	74	if not self._valid_connection():
58	75	kwargs = {
59	76	'user': DATABASE_USER,

r2349	r2579
10	10	DatabaseError = Database.DatabaseError
11	11
12		class DatabaseWrapper:
	12	try:
	13	# Only exists in python 2.4+
	14	from threading import local
	15	except ImportError:
	16	# Import copy of _thread_local.py from python 2.4
	17	from django.utils._threading_local import local
	18
	19	class DatabaseWrapper(local):
13	20	def __init__(self):
14	21	self.connection = None

r2346	r2579
25	25	return [utf8(r) for r in row]
26	26
27		class DatabaseWrapper:
	27	try:
	28	# Only exists in python 2.4+
	29	from threading import local
	30	except ImportError:
	31	# Import copy of _thread_local.py from python 2.4
	32	from django.utils._threading_local import local
	33
	34	class DatabaseWrapper(local):
28	35	def __init__(self):
29	36	self.connection = None