From 4b81d790a83e8710032ea58a8edbc8b8dab8fbcf Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Sat, 11 Feb 2012 18:01:53 +0000 Subject: [PATCH] Updated SpatiaLite GeoDjango test setup instructions for version 3.0. Also, fixed documentation typos introduced in r17496. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17507 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../contrib/gis/db/backends/spatialite/creation.py | 2 +- docs/ref/contrib/gis/install.txt | 2 +- docs/ref/contrib/gis/testing.txt | 14 ++++---------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/django/contrib/gis/db/backends/spatialite/creation.py b/django/contrib/gis/db/backends/spatialite/creation.py index ce46d5b7a3..33b6f95864 100644 --- a/django/contrib/gis/db/backends/spatialite/creation.py +++ b/django/contrib/gis/db/backends/spatialite/creation.py @@ -103,7 +103,7 @@ class SpatiaLiteCreation(DatabaseCreation): 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() diff --git a/docs/ref/contrib/gis/install.txt b/docs/ref/contrib/gis/install.txt index d54479b282..9d67242b2d 100644 --- a/docs/ref/contrib/gis/install.txt +++ b/docs/ref/contrib/gis/install.txt @@ -582,7 +582,7 @@ For this, a number of spatial metadata tables must be created in the database 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:: diff --git a/docs/ref/contrib/gis/testing.txt b/docs/ref/contrib/gis/testing.txt index ffa9c94190..9270c9f7d6 100644 --- a/docs/ref/contrib/gis/testing.txt +++ b/docs/ref/contrib/gis/testing.txt @@ -114,13 +114,8 @@ spatial database entitled ``template_postgis``. SpatiaLite ========== -You will need to download the `initialization SQL`__ script for SpatiaLite:: - - $ 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:: +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:: $ python manage.py test @@ -132,6 +127,8 @@ Settings ``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 @@ you may add the following to your settings:: SPATIALITE_SQL='/path/to/init_spatialite-2.3.sql' -__ http://www.gaia-gis.it/spatialite/init_spatialite-2.3.zip - - .. _geodjango-tests: GeoDjango Tests