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

Updated MySQL links to version 5.6.

This commit is contained in:
Tim Graham 2014-08-02 10:27:01 -04:00
parent de0a22be35
commit fb4f3e04b1
7 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/ref/contrib/gis/db-api.txt
View File

@ -29,7 +29,8 @@ MySQL Spatial Limitations
MySQL's spatial extensions only support bounding box operations MySQL's spatial extensions only support bounding box operations
(what MySQL calls minimum bounding rectangles, or MBR). Specifically, (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 Currently, MySQL does not implement these functions
[``Contains``, ``Crosses``, ``Disjoint``, ``Intersects``, ``Overlaps``, [``Contains``, ``Crosses``, ``Disjoint``, ``Intersects``, ``Overlaps``,
@ -52,6 +53,7 @@ on a different spatial backend.
Creating and Saving Geographic Models Creating and Saving Geographic Models
===================================== =====================================
Here is an example of how to create a geometry object (assuming the ``Zipcode`` Here is an example of how to create a geometry object (assuming the ``Zipcode``
model):: model)::
@ -303,8 +305,8 @@ Method PostGIS Oracle SpatiaLite
.. [#fnewkb] *See* `PostGIS EWKB, EWKT and Canonical Forms <http://postgis.refractions.net/documentation/manual-1.5/ch04.html#EWKB_EWKT>`_, PostGIS documentation at Ch. 4.1.2. .. [#fnewkb] *See* `PostGIS EWKB, EWKT and Canonical Forms <http://postgis.refractions.net/documentation/manual-1.5/ch04.html#EWKB_EWKT>`_, PostGIS documentation at Ch. 4.1.2.
.. [#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). .. [#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).
.. [#fndistsphere15] *See* `PostGIS 1.5 documentation <http://postgis.refractions.net/documentation/manual-1.5/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>`_ .. [#fnmysqlidx] *See* `Creating Spatial Indexes <http://dev.mysql.com/doc/refman/5.6/en/creating-spatial-indexes.html>`_
in the MySQL 5.1 Reference Manual: in the MySQL Reference Manual:
For MyISAM tables, ``SPATIAL INDEX`` creates an R-tree index. For storage For MyISAM tables, ``SPATIAL INDEX`` creates an R-tree index. For storage
engines that support nonspatial indexing of spatial columns, the engine engines that support nonspatial indexing of spatial columns, the engine

21
docs/ref/databases.txt
View File

@ -171,17 +171,14 @@ Version support
Django supports MySQL 5.0.3 and higher. Django supports MySQL 5.0.3 and higher.
`MySQL 5.0`_ adds the ``information_schema`` database, which contains detailed Django's ``inspectdb`` feature uses the ``information_schema`` database, which
data on all database schema. Django's ``inspectdb`` feature uses it. contains detailed data on all database schemas.
Django expects the database to support Unicode (UTF-8 encoding) and delegates to Django expects the database to support Unicode (UTF-8 encoding) and delegates to
it the task of enforcing transactions and referential integrity. It is important 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 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 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: .. _mysql-storage-engines:
Storage engines Storage engines
@ -212,9 +209,9 @@ running ``migrate``::
1005, "Can't create table '\\db_name\\.#sql-4a8_ab' (errno: 150)" 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 .. _storage engines: http://dev.mysql.com/doc/refman/5.6/en/storage-engines.html
.. _MyISAM: http://dev.mysql.com/doc/refman/5.5/en/myisam-storage-engine.html .. _MyISAM: http://dev.mysql.com/doc/refman/5.6/en/myisam-storage-engine.html
.. _InnoDB: http://dev.mysql.com/doc/refman/5.5/en/innodb-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 .. [#] 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 had reports that the Windows Community Server installer sets up InnoDB as
@ -297,7 +294,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. 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. 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 Creating your database
---------------------- ----------------------
@ -308,7 +305,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. 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: .. _mysql-collation:
@ -322,7 +319,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 manipulating the database tables; Django doesn't provide a way to set this on
the model definition. 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 By default, with a UTF-8 database, MySQL will use the
``utf8_general_ci`` collation. This results in all string equality ``utf8_general_ci`` collation. This results in all string equality
@ -420,7 +417,7 @@ Several other MySQLdb connection options may be useful, such as ``ssl``,
``init_command``, and ``sql_mode``. Consult the `MySQLdb documentation`_ for ``init_command``, and ``sql_mode``. Consult the `MySQLdb documentation`_ for
more details. 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/ .. _MySQLdb documentation: http://mysql-python.sourceforge.net/
Creating your tables Creating your tables

5
docs/ref/models/querysets.txt
View File

@ -688,7 +688,7 @@ object. If it's ``None``, Django uses the :ref:`current time zone
.. _pytz: http://pytz.sourceforge.net/ .. _pytz: http://pytz.sourceforge.net/
.. _Time Zones: http://www.postgresql.org/docs/current/static/datatype-datetime.html#DATATYPE-TIMEZONES .. _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 .. _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 none
~~~~ ~~~~
@ -2581,8 +2581,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 database to add the full-text index. By default Django uses BOOLEAN MODE for
full text searches. See the `MySQL documentation`_ for additional details. 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 .. fieldlookup:: regex

2
docs/ref/settings.txt
View File

@ -613,7 +613,7 @@ Supported for the PostgreSQL_ (``postgresql_psycopg2``) and MySQL_ (``mysql``)
backends. backends.
.. _PostgreSQL: http://www.postgresql.org/docs/current/static/multibyte.html .. _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 .. setting:: TEST_COLLATION

6
docs/ref/unicode.txt
View File

@ -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 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. 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) * MySQL users, refer to the `MySQL manual`_ for details on how to set or alter
for details on how to set or alter the database character set encoding. the database character set encoding.
* PostgreSQL users, refer to the `PostgreSQL manual`_ (section 22.3.2 in * PostgreSQL users, refer to the `PostgreSQL manual`_ (section 22.3.2 in
PostgreSQL 9) for details on creating databases with the correct encoding. 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 * SQLite users, there is nothing you need to do. SQLite always uses UTF-8
for internal encoding. 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 .. _PostgreSQL manual: http://www.postgresql.org/docs/current/static/multibyte.html
All of Django's database backends automatically convert Unicode strings into All of Django's database backends automatically convert Unicode strings into

2
docs/releases/1.6.txt
View File

@ -491,7 +491,7 @@ pytz_. If you're using MySQL, you must install pytz_ and load the time zone
tables with `mysql_tzinfo_to_sql`_. tables with `mysql_tzinfo_to_sql`_.
.. _pytz: http://pytz.sourceforge.net/ .. _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()`` Addition of ``QuerySet.datetimes()``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

2
docs/topics/db/transactions.txt
View File

@ -447,7 +447,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 as they're called. If your MySQL setup *does* support transactions, Django
will handle transactions as explained in this document. 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 Handling exceptions within PostgreSQL transactions
-------------------------------------------------- --------------------------------------------------