Author: ramiro Date: 2012-02-11 10:01:53 -0800 (Sat, 11 Feb 2012) New Revision: 17507
Modified: django/trunk/django/contrib/gis/db/backends/spatialite/creation.py django/trunk/docs/ref/contrib/gis/install.txt django/trunk/docs/ref/contrib/gis/testing.txt Log: Updated SpatiaLite GeoDjango test setup instructions for version 3.0. Also, fixed documentation typos introduced in r17496. Modified: django/trunk/django/contrib/gis/db/backends/spatialite/creation.py =================================================================== --- django/trunk/django/contrib/gis/db/backends/spatialite/creation.py 2012-02-11 13:50:27 UTC (rev 17506) +++ django/trunk/django/contrib/gis/db/backends/spatialite/creation.py 2012-02-11 18:01:53 UTC (rev 17507) @@ -103,7 +103,7 @@ This routine loads up the SpatiaLite SQL file. """ if self.connection.ops.spatial_version[:2] >= (3, 0): - # Spatialite >= 3.0.x -- No ned to load any SQL file, calling + # Spatialite >= 3.0.x -- No need to load any SQL file, calling # InitSpatialMetaData() transparently creates the spatial metadata # tables cur = self.connection._cursor() Modified: django/trunk/docs/ref/contrib/gis/install.txt =================================================================== --- django/trunk/docs/ref/contrib/gis/install.txt 2012-02-11 13:50:27 UTC (rev 17506) +++ django/trunk/docs/ref/contrib/gis/install.txt 2012-02-11 18:01:53 UTC (rev 17507) @@ -582,7 +582,7 @@ before any spatial query is performed against it. If you are using SpatiaLite 3.0 or newer then use the ``spatialite`` utility to -call the ``InitSpatiaMetaData()`` function whch will take care of that (you can +call the ``InitSpatiaMetaData()`` function which will take care of that (you can safely ignore the error messages shown) then you can skip the rest of this section:: Modified: django/trunk/docs/ref/contrib/gis/testing.txt =================================================================== --- django/trunk/docs/ref/contrib/gis/testing.txt 2012-02-11 13:50:27 UTC (rev 17506) +++ django/trunk/docs/ref/contrib/gis/testing.txt 2012-02-11 18:01:53 UTC (rev 17507) @@ -114,14 +114,9 @@ SpatiaLite ========== -You will need to download the `initialization SQL`__ script for SpatiaLite:: +You need to make sure needed spatial tables are created in your test spatial +database as described in :ref:`create_spatialite_db`. Then all you have to do is:: - $ wget http://www.gaia-gis.it/spatialite/init_spatialite-2.3.zip - $ unzip init_spatialite-2.3.zip - -If ``init_spatialite-2.3.sql`` is in the same path as your project's ``manage.py``, -then all you have to do is:: - $ python manage.py test Settings @@ -132,6 +127,8 @@ ``SPATIALITE_SQL`` ^^^^^^^^^^^^^^^^^^ +(only relevant when using a SpatiaLite version older than 3.0). + By default, the GeoDjango test runner looks for the SpatiaLite SQL in the same directory where it was invoked (by default the same directory where ``manage.py`` is located). If you want to use a different location, then @@ -139,9 +136,6 @@ SPATIALITE_SQL='/path/to/init_spatialite-2.3.sql' -__ http://www.gaia-gis.it/spatialite/init_spatialite-2.3.zip - - .. _geodjango-tests: GeoDjango Tests -- You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to django-updates@googlegroups.com. To unsubscribe from this group, send email to django-updates+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/django-updates?hl=en.