Ticket #15822: remove-references-to-postgresql-v1.patch

File remove-references-to-postgresql-v1.patch, 4.5 KB (added by aaugustin, 4 years ago)
  • docs/howto/initial-data.txt

     
    136136----------------------------------
    137137
    138138There's also a hook for backend-specific SQL data. For example, you
    139 can have separate initial-data files for PostgreSQL and MySQL. For
     139can have separate initial-data files for PostgreSQL and SQLite. For
    140140each app, Django looks for a file called
    141141``<appname>/sql/<modelname>.<backend>.sql``, where ``<appname>`` is
    142142your app directory, ``<modelname>`` is the model's name in lowercase
    143143and ``<backend>`` is the last part of the module name provided for the
    144144:setting:`ENGINE` in your settings file (e.g., if you have defined a
    145145database with an :setting:`ENGINE` value of
    146 ``django.db.backends.postgresql``, Django will look for
    147 ``<appname>/sql/<modelname>.postgresql.sql``).
     146``django.db.backends.sqlite3``, Django will look for
     147``<appname>/sql/<modelname>.sqlite3.sql``).
    148148
    149149Backend-specific SQL data is executed before non-backend-specific SQL
    150150data. For example, if your app contains the files ``sql/person.sql``
    151 and ``sql/person.postgresql.sql`` and you're installing the app on
    152 PostgreSQL, Django will execute the contents of
    153 ``sql/person.postgresql.sql`` first, then ``sql/person.sql``.
     151and ``sql/person.sqlite3.sql`` and you're installing the app on
     152SQLite, Django will execute the contents of
     153``sql/person.sqlite3.sql`` first, then ``sql/person.sql``.
  • docs/topics/install.txt

     
    9292In addition to a database backend, you'll need to make sure your Python
    9393database bindings are installed.
    9494
    95 * If you're using PostgreSQL, you'll need the psycopg_ package. Django supports
    96   both version 1 and 2. (When you configure Django's database layer, specify
    97   either ``postgresql`` [for version 1] or ``postgresql_psycopg2`` [for version 2].)
     95* If you're using PostgreSQL, you'll need the ``postgresql_psycopg2`` package.
    9896  You might want to refer to our :ref:`PostgreSQL notes <postgresql-notes>` for
    9997  further technical details specific to this database.
    10098
  • docs/ref/settings.txt

     
    394394The database backend to use. The built-in database backends are:
    395395
    396396    * ``'django.db.backends.postgresql_psycopg2'``
    397     * ``'django.db.backends.postgresql'``
    398397    * ``'django.db.backends.mysql'``
    399398    * ``'django.db.backends.sqlite3'``
    400399    * ``'django.db.backends.oracle'``
     
    498497string is passed directly through to the database, so its format is
    499498backend-specific.
    500499
    501 Supported for the PostgreSQL_ (``postgresql``, ``postgresql_psycopg2``) and
    502 MySQL_ (``mysql``) backends.
     500Supported for the PostgreSQL_ (``postgresql_psycopg2``) and MySQL_ (``mysql``)
     501backends.
    503502
    504503.. _PostgreSQL: http://www.postgresql.org/docs/8.2/static/multibyte.html
    505504.. _MySQL: http://dev.mysql.com/doc/refman/5.0/en/charset-database.html
  • django/conf/project_template/settings.py

     
    1111
    1212DATABASES = {
    1313    'default': {
    14         'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
     14        'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
    1515        'NAME': '',                      # Or path to database file if using sqlite3.
    1616        'USER': '',                      # Not used with sqlite3.
    1717        'PASSWORD': '',                  # Not used with sqlite3.
  • django/conf/global_settings.py

     
    143143
    144144# Database connection info.
    145145# Legacy format
    146 DATABASE_ENGINE = ''           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
     146DATABASE_ENGINE = ''           # 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
    147147DATABASE_NAME = ''             # Or path to database file if using sqlite3.
    148148DATABASE_USER = ''             # Not used with sqlite3.
    149149DATABASE_PASSWORD = ''         # Not used with sqlite3.
Back to Top