Author: Alex
Date: 2009-11-23 10:46:07 -0600 (Mon, 23 Nov 2009)
New Revision: 11777
Removed:
django/branches/soc2009/multidb/TODO.txt
Modified:
django/branches/soc2009/multidb/django/contrib/gis/tests/relatedapp/tests.py
django/branches/soc2009/multidb/docs/ref/databases.txt
django/branches/soc2009/multidb/docs/ref/django-admin.txt
django/branches/soc2009/multidb/docs/ref/templates/builtins.txt
django/branches/soc2009/multidb/docs/releases/1.2.txt
django/branches/soc2009/multidb/tests/regressiontests/backends/tests.py
Log:
[soc2009/multidb] Resolved a number of strange merge conflicts that had arisen
throughout various merges.
Deleted: django/branches/soc2009/multidb/TODO.txt
===================================================================
--- django/branches/soc2009/multidb/TODO.txt 2009-11-23 16:45:51 UTC (rev
11776)
+++ django/branches/soc2009/multidb/TODO.txt 2009-11-23 16:46:07 UTC (rev
11777)
@@ -1,25 +0,0 @@
-TODO
-====
-
-The follow is a list, more or less in the order I intend to do them of things
-that need to be done. I'm trying to be as granular as possible.
-
-
-1) Replace old instances of :setting:`DATABASE_` with a new tag or something.
-
-2) Update all management commands in the following way:
-
- * ``dumpdata``: By default dump the ``default`` database. Later add a
- ``--database`` flag.
-
- flush, reset, and syncdb need to not prompt the user multiple times.
-
-3) Handle backends with custom Query classes.
-
-4) Wait on the merge of the m2m stuff.
-
-5) Fix django.contrib.gis, it's broken in all sorts of ways.
-
-6) Generate SQL, instead of an error for nesting on different DBs.
-
-7) Time permitting add support for a ``DatabaseManager``.
Modified:
django/branches/soc2009/multidb/django/contrib/gis/tests/relatedapp/tests.py
===================================================================
---
django/branches/soc2009/multidb/django/contrib/gis/tests/relatedapp/tests.py
2009-11-23 16:45:51 UTC (rev 11776)
+++
django/branches/soc2009/multidb/django/contrib/gis/tests/relatedapp/tests.py
2009-11-23 16:46:07 UTC (rev 11777)
@@ -279,11 +279,11 @@
def test14_collect(self):
"Testing the `collect` GeoQuerySet method and `Collect` aggregate."
# Reference query:
- # SELECT AsText(ST_Collect("relatedapp_location"."point")) FROM
"relatedapp_city" LEFT OUTER JOIN
- # "relatedapp_location" ON ("relatedapp_city"."location_id" =
"relatedapp_location"."id")
+ # SELECT AsText(ST_Collect("relatedapp_location"."point")) FROM
"relatedapp_city" LEFT OUTER JOIN
+ # "relatedapp_location" ON ("relatedapp_city"."location_id" =
"relatedapp_location"."id")
# WHERE "relatedapp_city"."state" = 'TX';
ref_geom = fromstr('MULTIPOINT(-97.516111 33.058333,-96.801611
32.782057,-95.363151 29.763374,-96.801611 32.782057)')
-
+
c1 =
City.objects.filter(state='TX').collect(field_name='location__point')
c2 =
City.objects.filter(state='TX').aggregate(Collect('location__point'))['location__point__collect']
@@ -293,6 +293,7 @@
self.assertEqual(4, len(coll))
self.assertEqual(ref_geom, coll)
+
# TODO: Related tests for KML, GML, and distance lookups.
def suite():
Modified: django/branches/soc2009/multidb/docs/ref/databases.txt
===================================================================
--- django/branches/soc2009/multidb/docs/ref/databases.txt 2009-11-23
16:45:51 UTC (rev 11776)
+++ django/branches/soc2009/multidb/docs/ref/databases.txt 2009-11-23
16:46:07 UTC (rev 11777)
@@ -257,6 +257,7 @@
}
}
+
# my.cnf
[client]
database = NAME
Modified: django/branches/soc2009/multidb/docs/ref/django-admin.txt
===================================================================
--- django/branches/soc2009/multidb/docs/ref/django-admin.txt 2009-11-23
16:45:51 UTC (rev 11776)
+++ django/branches/soc2009/multidb/docs/ref/django-admin.txt 2009-11-23
16:46:07 UTC (rev 11777)
@@ -498,11 +498,6 @@
The :djadminopt:`--database` option can be used to specify the alias
of the database to reset.
-Executes the equivalent of ``sqlreset`` for the given app name(s).
-
-The :djadminopt:`--noinput` option may be provided to suppress all user
-prompts.
-
runfcgi [options]
-----------------
Modified: django/branches/soc2009/multidb/docs/ref/templates/builtins.txt
===================================================================
--- django/branches/soc2009/multidb/docs/ref/templates/builtins.txt
2009-11-23 16:45:51 UTC (rev 11776)
+++ django/branches/soc2009/multidb/docs/ref/templates/builtins.txt
2009-11-23 16:46:07 UTC (rev 11777)
@@ -65,16 +65,6 @@
.. templatetag:: cycle
-csrf_token
-~~~~~~~~~~
-
-.. versionadded:: 1.1.2
-
-In the Django 1.1.X series, this is a no-op tag that returns an empty string
for
-future compatibility purposes. In Django 1.2 and later, it is used for CSRF
-protection, as described in the documentation for :ref:`Cross Site Request
-Forgeries <ref-contrib-csrf>`.
-
cycle
~~~~~
Modified: django/branches/soc2009/multidb/docs/releases/1.2.txt
===================================================================
--- django/branches/soc2009/multidb/docs/releases/1.2.txt 2009-11-23
16:45:51 UTC (rev 11776)
+++ django/branches/soc2009/multidb/docs/releases/1.2.txt 2009-11-23
16:46:07 UTC (rev 11777)
@@ -189,4 +189,3 @@
issued at a specific database with the `using()` method on
querysets; individual objects can be saved to a specific database
by providing a ``using`` argument when you save the instance.
-
Modified:
django/branches/soc2009/multidb/tests/regressiontests/backends/tests.py
===================================================================
--- django/branches/soc2009/multidb/tests/regressiontests/backends/tests.py
2009-11-23 16:45:51 UTC (rev 11776)
+++ django/branches/soc2009/multidb/tests/regressiontests/backends/tests.py
2009-11-23 16:46:07 UTC (rev 11777)
@@ -18,22 +18,7 @@
return True
else:
return True
-
-class LongString(unittest.TestCase):
- def test_long_string(self):
- # If the backend is Oracle, test that we can save a text longer
- # than 4000 chars and read it properly
- if settings.DATABASE_ENGINE == 'oracle':
- c = connection.cursor()
- c.execute('CREATE TABLE ltext ("TEXT" NCLOB)')
- long_str = ''.join([unicode(x) for x in xrange(4000)])
- c.execute('INSERT INTO ltext VALUES (%s)',[long_str])
- c.execute('SELECT text FROM ltext')
- row = c.fetchone()
- c.execute('DROP TABLE ltext')
- self.assertEquals(long_str, row[0].read())
-
class LongString(unittest.TestCase):
def test_long_string(self):
--
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=.
