Author: Alex
Date: 2009-12-21 13:30:49 -0600 (Mon, 21 Dec 2009)
New Revision: 11930
Modified:
django/branches/soc2009/multidb/django/db/models/manager.py
django/branches/soc2009/multidb/django/db/models/query.py
django/branches/soc2009/multidb/django/db/models/sql/query.py
django/branches/soc2009/multidb/docs/topics/db/sql.txt
django/branches/soc2009/multidb/tests/modeltests/raw_query/tests.py
django/branches/soc2009/multidb/tests/regressiontests/multiple_database/tests.py
Log:
[soc2009/multidb] A couple of cleanups of multi-db support for raw queries,
including a using() call on raw query sets. Patch from Russell Keith-Magee.
Modified: django/branches/soc2009/multidb/django/db/models/manager.py
===================================================================
--- django/branches/soc2009/multidb/django/db/models/manager.py 2009-12-21
04:50:45 UTC (rev 11929)
+++ django/branches/soc2009/multidb/django/db/models/manager.py 2009-12-21
19:30:49 UTC (rev 11930)
@@ -91,7 +91,7 @@
obj = copy.copy(self)
obj._db = alias
return obj
-
+
@property
def db(self):
return self._db or DEFAULT_DB_ALIAS
@@ -189,7 +189,7 @@
def using(self, *args, **kwargs):
return self.get_query_set().using(*args, **kwargs)
-
+
def exists(self, *args, **kwargs):
return self.get_query_set().exists(*args, **kwargs)
@@ -199,9 +199,8 @@
def _update(self, values, **kwargs):
return self.get_query_set()._update(values, **kwargs)
- def raw(self, query, params=None, *args, **kwargs):
- kwargs["using"] = self.db
- return RawQuerySet(model=self.model, query=query, params=params,
*args, **kwargs)
+ def raw(self, raw_query, params=None, *args, **kwargs):
+ return RawQuerySet(raw_query=raw_query, model=self.model,
params=params, using=self.db, *args, **kwargs)
class ManagerDescriptor(object):
# This class ensures managers aren't accessible via model instances.
Modified: django/branches/soc2009/multidb/django/db/models/query.py
===================================================================
--- django/branches/soc2009/multidb/django/db/models/query.py 2009-12-21
04:50:45 UTC (rev 11929)
+++ django/branches/soc2009/multidb/django/db/models/query.py 2009-12-21
19:30:49 UTC (rev 11930)
@@ -711,10 +711,10 @@
return False
ordered = property(ordered)
+ @property
def db(self):
"Return the database that will be used if this query is executed now"
return self._db or DEFAULT_DB_ALIAS
- db = property(db)
###################
# PRIVATE METHODS #
@@ -1154,11 +1154,12 @@
Provides an iterator which converts the results of raw SQL queries into
annotated model instances.
"""
- def __init__(self, query, model=None, query_obj=None, params=None,
+ def __init__(self, raw_query, model=None, query=None, params=None,
translations=None, using=None):
+ self.raw_query = raw_query
self.model = model
- self.using = using
- self.query = query_obj or sql.RawQuery(sql=query,
connection=connections[using], params=params)
+ self._db = using
+ self.query = query or sql.RawQuery(sql=raw_query, using=self.db,
params=params)
self.params = params or ()
self.translations = translations or {}
@@ -1167,9 +1168,23 @@
yield self.transform_results(row)
def __repr__(self):
- return "<RawQuerySet: %r>" % (self.query.sql % self.params)
+ return "<RawQuerySet: %r>" % (self.raw_query % self.params)
@property
+ def db(self):
+ "Return the database that will be used if this query is executed now"
+ return self._db or DEFAULT_DB_ALIAS
+
+ def using(self, alias):
+ """
+ Selects which database this Raw QuerySet should excecute it's query
against.
+ """
+ return RawQuerySet(self.raw_query, model=self.model,
+ query=self.query.clone(using=alias),
+ params=self.params, translations=self.translations,
+ using=alias)
+
+ @property
def columns(self):
"""
A list of model field names in the order they'll appear in the
@@ -1232,9 +1247,9 @@
for field, value in annotations:
setattr(instance, field, value)
-
- instance._state.db = self.using
+ instance._state.db = self.query.using
+
return instance
def insert_query(model, values, return_id=False, raw_values=False, using=None):
Modified: django/branches/soc2009/multidb/django/db/models/sql/query.py
===================================================================
--- django/branches/soc2009/multidb/django/db/models/sql/query.py
2009-12-21 04:50:45 UTC (rev 11929)
+++ django/branches/soc2009/multidb/django/db/models/sql/query.py
2009-12-21 19:30:49 UTC (rev 11930)
@@ -29,13 +29,16 @@
A single raw SQL query
"""
- def __init__(self, sql, connection, params=None):
+ def __init__(self, sql, using, params=None):
self.validate_sql(sql)
self.params = params or ()
self.sql = sql
- self.connection = connection
+ self.using = using
self.cursor = None
+ def clone(self, using):
+ return RawQuery(self.sql, using, params=self.params)
+
def get_columns(self):
if self.cursor is None:
self._execute_query()
@@ -56,7 +59,7 @@
return "<RawQuery: %r>" % (self.sql % self.params)
def _execute_query(self):
- self.cursor = self.connection.cursor()
+ self.cursor = connections[self.using].cursor()
self.cursor.execute(self.sql, self.params)
Modified: django/branches/soc2009/multidb/docs/topics/db/sql.txt
===================================================================
--- django/branches/soc2009/multidb/docs/topics/db/sql.txt 2009-12-21
04:50:45 UTC (rev 11929)
+++ django/branches/soc2009/multidb/docs/topics/db/sql.txt 2009-12-21
19:30:49 UTC (rev 11930)
@@ -23,7 +23,7 @@
The ``raw()`` manager method can be used to perform raw SQL queries that
return model instances:
-.. method:: Manager.raw(query, params=None, translations=None)
+.. method:: Manager.raw(raw_query, params=None, translations=None)
This method method takes a raw SQL query, executes it, and returns model
instances.
Modified: django/branches/soc2009/multidb/tests/modeltests/raw_query/tests.py
===================================================================
--- django/branches/soc2009/multidb/tests/modeltests/raw_query/tests.py
2009-12-21 04:50:45 UTC (rev 11929)
+++ django/branches/soc2009/multidb/tests/modeltests/raw_query/tests.py
2009-12-21 19:30:49 UTC (rev 11930)
@@ -10,7 +10,7 @@
"""
Execute the passed query against the passed model and check the output
"""
- results = list(model.objects.raw(query=query, params=params,
translations=translations))
+ results = list(model.objects.raw(query, params=params,
translations=translations))
self.assertProcessed(results, expected_results, expected_annotations)
self.assertAnnotations(results, expected_annotations)
@@ -111,7 +111,7 @@
query = "SELECT * FROM raw_query_author WHERE first_name = %s"
author = Author.objects.all()[2]
params = [author.first_name]
- results = list(Author.objects.raw(query=query, params=params))
+ results = list(Author.objects.raw(query, params=params))
self.assertProcessed(results, [author])
self.assertNoAnnotations(results)
self.assertEqual(len(results), 1)
Modified:
django/branches/soc2009/multidb/tests/regressiontests/multiple_database/tests.py
===================================================================
---
django/branches/soc2009/multidb/tests/regressiontests/multiple_database/tests.py
2009-12-21 04:50:45 UTC (rev 11929)
+++
django/branches/soc2009/multidb/tests/regressiontests/multiple_database/tests.py
2009-12-21 19:30:49 UTC (rev 11930)
@@ -619,7 +619,7 @@
self.assertEquals(learn.get_next_by_published().title, "Dive into
Python")
self.assertEquals(dive.get_previous_by_published().title, "Learning
Python")
-
+
def test_raw(self):
"test the raw() method across databases"
dive = Book.objects.using('other').create(title="Dive into Python",
@@ -627,7 +627,10 @@
val = Book.objects.db_manager("other").raw('SELECT id FROM
"multiple_database_book"')
self.assertEqual(map(lambda o: o.pk, val), [dive.pk])
+ val = Book.objects.raw('SELECT id FROM
"multiple_database_book"').using('other')
+ self.assertEqual(map(lambda o: o.pk, val), [dive.pk])
+
class UserProfileTestCase(TestCase):
def setUp(self):
self.old_auth_profile_module = getattr(settings,
'AUTH_PROFILE_MODULE', None)
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
