mirror of https://github.com/django/django.git
[1.6.x] Updated MySQL links to version 5.6.
Backport of fb4f3e04b1 from master
This commit is contained in:
Tim Graham
parent
1cfb1052ee
commit
0dfc37669d
|
|
@ -29,7 +29,8 @@ MySQL Spatial Limitations
|
|||
|
||||
MySQL's spatial extensions only support bounding box operations
|
||||
(what MySQL calls minimum bounding rectangles, or MBR). Specifically,
|
||||
`MySQL does not conform to the OGC standard <http://dev.mysql.com/doc/refman/5.1/en/functions-for-testing-spatial-relations-between-geometric-objects.html>`_:
|
||||
`MySQL does not conform to the OGC standard
|
||||
<http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions.html>`_:
|
||||
|
||||
Currently, MySQL does not implement these functions
|
||||
[``Contains``, ``Crosses``, ``Disjoint``, ``Intersects``, ``Overlaps``,
|
||||
|
|
@ -52,6 +53,7 @@ on a different spatial backend.
|
|||
|
||||
Creating and Saving Geographic Models
|
||||
=====================================
|
||||
|
||||
Here is an example of how to create a geometry object (assuming the ``Zipcode``
|
||||
model)::
|
||||
|
||||
|
|
@ -313,8 +315,8 @@ Method PostGIS Oracle SpatiaLite
|
|||
.. [#fngeojson] *See* Howard Butler, Martin Daly, Allan Doyle, Tim Schaub, & Christopher Schmidt, `The GeoJSON Format Specification <http://geojson.org/geojson-spec.html>`_, Revision 1.0 (June 16, 2008).
|
||||
.. [#fndistsphere14] *See* `PostGIS 1.4 documentation <http://postgis.refractions.net/documentation/manual-1.4/ST_Distance_Sphere.html>`_ on ``ST_distance_sphere``.
|
||||
.. [#fndistsphere15] *See* `PostGIS 1.5 documentation <http://postgis.refractions.net/documentation/manual-1.5/ST_Distance_Sphere.html>`_ on ``ST_distance_sphere``.
|
||||
.. [#fnmysqlidx] *See* `Creating Spatial Indexes <http://dev.mysql.com/doc/refman/5.1/en/creating-spatial-indexes.html>`_
|
||||
in the MySQL 5.1 Reference Manual:
|
||||
.. [#fnmysqlidx] *See* `Creating Spatial Indexes <http://dev.mysql.com/doc/refman/5.6/en/creating-spatial-indexes.html>`_
|
||||
in the MySQL Reference Manual:
|
||||
|
||||
For MyISAM tables, ``SPATIAL INDEX`` creates an R-tree index. For storage
|
||||
engines that support nonspatial indexing of spatial columns, the engine
|
||||
|
|
|
|||
|
|
@ -196,8 +196,8 @@ Version support
|
|||
|
||||
Django supports MySQL 5.0.3 and higher.
|
||||
|
||||
`MySQL 5.0`_ adds the ``information_schema`` database, which contains detailed
|
||||
data on all database schema. Django's ``inspectdb`` feature uses it.
|
||||
Django's ``inspectdb`` feature uses the ``information_schema`` database, which
|
||||
contains detailed data on all database schemas.
|
||||
|
||||
.. versionchanged:: 1.5
|
||||
|
||||
|
|
@ -208,9 +208,6 @@ it the task of enforcing transactions and referential integrity. It is important
|
|||
to be aware of the fact that the two latter ones aren't actually enforced by
|
||||
MySQL when using the MyISAM storage engine, see the next section.
|
||||
|
||||
.. _MySQL: http://www.mysql.com/
|
||||
.. _MySQL 5.0: http://dev.mysql.com/doc/refman/5.0/en/index.html
|
||||
|
||||
.. _mysql-storage-engines:
|
||||
|
||||
Storage engines
|
||||
|
|
@ -241,9 +238,9 @@ running ``syncdb``::
|
|||
1005, "Can't create table '\\db_name\\.#sql-4a8_ab' (errno: 150)"
|
||||
)
|
||||
|
||||
.. _storage engines: http://dev.mysql.com/doc/refman/5.5/en/storage-engines.html
|
||||
.. _MyISAM: http://dev.mysql.com/doc/refman/5.5/en/myisam-storage-engine.html
|
||||
.. _InnoDB: http://dev.mysql.com/doc/refman/5.5/en/innodb-storage-engine.html
|
||||
.. _storage engines: http://dev.mysql.com/doc/refman/5.6/en/storage-engines.html
|
||||
.. _MyISAM: http://dev.mysql.com/doc/refman/5.6/en/myisam-storage-engine.html
|
||||
.. _InnoDB: http://dev.mysql.com/doc/refman/5.6/en/innodb-storage-engine.html
|
||||
|
||||
.. [#] Unless this was changed by the packager of your MySQL package. We've
|
||||
had reports that the Windows Community Server installer sets up InnoDB as
|
||||
|
|
@ -294,7 +291,7 @@ If you plan on using Django's :doc:`timezone support </topics/i18n/timezones>`,
|
|||
use `mysql_tzinfo_to_sql`_ to load time zone tables into the MySQL database.
|
||||
This needs to be done just once for your MySQL server, not per database.
|
||||
|
||||
.. _mysql_tzinfo_to_sql: http://dev.mysql.com/doc/refman/5.5/en/mysql-tzinfo-to-sql.html
|
||||
.. _mysql_tzinfo_to_sql: http://dev.mysql.com/doc/refman/5.6/en/mysql-tzinfo-to-sql.html
|
||||
|
||||
Creating your database
|
||||
----------------------
|
||||
|
|
@ -305,7 +302,7 @@ You can `create your database`_ using the command-line tools and this SQL::
|
|||
|
||||
This ensures all tables and columns will use UTF-8 by default.
|
||||
|
||||
.. _create your database: http://dev.mysql.com/doc/refman/5.0/en/create-database.html
|
||||
.. _create your database: http://dev.mysql.com/doc/refman/5.6/en/create-database.html
|
||||
|
||||
.. _mysql-collation:
|
||||
|
||||
|
|
@ -319,7 +316,7 @@ the MySQL documentation. In all cases, you set the collation by directly
|
|||
manipulating the database tables; Django doesn't provide a way to set this on
|
||||
the model definition.
|
||||
|
||||
.. _documented thoroughly: http://dev.mysql.com/doc/refman/5.0/en/charset.html
|
||||
.. _documented thoroughly: http://dev.mysql.com/doc/refman/5.6/en/charset.html
|
||||
|
||||
By default, with a UTF-8 database, MySQL will use the
|
||||
``utf8_general_ci`` collation. This results in all string equality
|
||||
|
|
@ -417,7 +414,7 @@ Several other MySQLdb connection options may be useful, such as ``ssl``,
|
|||
``init_command``, and ``sql_mode``. Consult the `MySQLdb documentation`_ for
|
||||
more details.
|
||||
|
||||
.. _MySQL option file: http://dev.mysql.com/doc/refman/5.0/en/option-files.html
|
||||
.. _MySQL option file: http://dev.mysql.com/doc/refman/5.6/en/option-files.html
|
||||
.. _MySQLdb documentation: http://mysql-python.sourceforge.net/
|
||||
|
||||
Creating your tables
|
||||
|
|
|
|||
|
|
@ -658,7 +658,7 @@ object. If it's ``None``, Django uses the :ref:`current time zone
|
|||
.. _pytz: http://pytz.sourceforge.net/
|
||||
.. _Time Zones: http://www.postgresql.org/docs/current/static/datatype-datetime.html#DATATYPE-TIMEZONES
|
||||
.. _Choosing a Time Zone File: http://docs.oracle.com/cd/B19306_01/server.102/b14225/ch4datetime.htm#i1006667
|
||||
.. _mysql_tzinfo_to_sql: http://dev.mysql.com/doc/refman/5.5/en/mysql-tzinfo-to-sql.html
|
||||
.. _mysql_tzinfo_to_sql: http://dev.mysql.com/doc/refman/5.6/en/mysql-tzinfo-to-sql.html
|
||||
|
||||
none
|
||||
~~~~
|
||||
|
|
@ -2430,8 +2430,7 @@ Note this is only available in MySQL and requires direct manipulation of the
|
|||
database to add the full-text index. By default Django uses BOOLEAN MODE for
|
||||
full text searches. See the `MySQL documentation`_ for additional details.
|
||||
|
||||
.. _MySQL documentation: http://dev.mysql.com/doc/refman/5.1/en/fulltext-boolean.html
|
||||
|
||||
.. _MySQL documentation: http://dev.mysql.com/doc/refman/5.6/en/fulltext-boolean.html
|
||||
|
||||
.. fieldlookup:: regex
|
||||
|
||||
|
|
|
|||
|
|
@ -594,7 +594,7 @@ Supported for the PostgreSQL_ (``postgresql_psycopg2``) and MySQL_ (``mysql``)
|
|||
backends.
|
||||
|
||||
.. _PostgreSQL: http://www.postgresql.org/docs/current/static/multibyte.html
|
||||
.. _MySQL: http://dev.mysql.com/doc/refman/5.0/en/charset-database.html
|
||||
.. _MySQL: http://dev.mysql.com/doc/refman/5.6/en/charset-database.html
|
||||
|
||||
.. setting:: TEST_COLLATION
|
||||
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ data. Normally, this means giving it an encoding of UTF-8 or UTF-16. If you use
|
|||
a more restrictive encoding -- for example, latin1 (iso8859-1) -- you won't be
|
||||
able to store certain characters in the database, and information will be lost.
|
||||
|
||||
* MySQL users, refer to the `MySQL manual`_ (section 10.1.3.2 for MySQL 5.1)
|
||||
for details on how to set or alter the database character set encoding.
|
||||
* MySQL users, refer to the `MySQL manual`_ for details on how to set or alter
|
||||
the database character set encoding.
|
||||
|
||||
* PostgreSQL users, refer to the `PostgreSQL manual`_ (section 22.3.2 in
|
||||
PostgreSQL 9) for details on creating databases with the correct encoding.
|
||||
|
|
@ -26,7 +26,7 @@ able to store certain characters in the database, and information will be lost.
|
|||
* SQLite users, there is nothing you need to do. SQLite always uses UTF-8
|
||||
for internal encoding.
|
||||
|
||||
.. _MySQL manual: http://dev.mysql.com/doc/refman/5.1/en/charset-database.html
|
||||
.. _MySQL manual: http://dev.mysql.com/doc/refman/5.6/en/charset-database.html
|
||||
.. _PostgreSQL manual: http://www.postgresql.org/docs/current/static/multibyte.html
|
||||
|
||||
All of Django's database backends automatically convert Unicode strings into
|
||||
|
|
|
|||
|
|
@ -493,7 +493,7 @@ pytz_. If you're using MySQL, you must install pytz_ and load the time zone
|
|||
tables with `mysql_tzinfo_to_sql`_.
|
||||
|
||||
.. _pytz: http://pytz.sourceforge.net/
|
||||
.. _mysql_tzinfo_to_sql: http://dev.mysql.com/doc/refman/5.5/en/mysql-tzinfo-to-sql.html
|
||||
.. _mysql_tzinfo_to_sql: http://dev.mysql.com/doc/refman/5.6/en/mysql-tzinfo-to-sql.html
|
||||
|
||||
Addition of ``QuerySet.datetimes()``
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
|
|
|||
|
|
@ -474,7 +474,7 @@ function in autocommit mode: statements will be executed and committed as soon
|
|||
as they're called. If your MySQL setup *does* support transactions, Django
|
||||
will handle transactions as explained in this document.
|
||||
|
||||
.. _information on MySQL transactions: http://dev.mysql.com/doc/refman/5.0/en/sql-syntax-transactions.html
|
||||
.. _information on MySQL transactions: http://dev.mysql.com/doc/refman/5.6/en/sql-syntax-transactions.html
|
||||
|
||||
Handling exceptions within PostgreSQL transactions
|
||||
--------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in New Issue