p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Ramiro Morales 2012-02-11 18:01:53 +00:00
parent d72d5ce827
commit 4b81d790a8
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/db/backends/spatialite/creation.py
View File

@ -103,7 +103,7 @@ class SpatiaLiteCreation(DatabaseCreation):
This routine loads up the SpatiaLite SQL file. This routine loads up the SpatiaLite SQL file.
""" """
if self.connection.ops.spatial_version[:2] >= (3, 0): 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 # InitSpatialMetaData() transparently creates the spatial metadata
# tables # tables
cur = self.connection._cursor() cur = self.connection._cursor()

2
docs/ref/contrib/gis/install.txt
View File

@ -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. before any spatial query is performed against it.
If you are using SpatiaLite 3.0 or newer then use the ``spatialite`` utility to 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 safely ignore the error messages shown) then you can skip the rest of this
section:: section::

14
docs/ref/contrib/gis/testing.txt
View File

@ -114,13 +114,8 @@ spatial database entitled ``template_postgis``.
SpatiaLite 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 $ python manage.py test
@ -132,6 +127,8 @@ Settings
``SPATIALITE_SQL`` ``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 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 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 ``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' SPATIALITE_SQL='/path/to/init_spatialite-2.3.sql'
__ http://www.gaia-gis.it/spatialite/init_spatialite-2.3.zip
.. _geodjango-tests: .. _geodjango-tests:
GeoDjango Tests GeoDjango Tests