mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity

gis: Fixed #5435 with patch from rcoup.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2007-09-14 22:40:13 +00:00
parent e0a665e121
commit 57135b1cb7
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
django/contrib/gis/db/backend/postgis/creation.py
View File

@ -28,8 +28,10 @@ def _create_with_cursor(db_name, verbosity=1, autoclobber=False):
# Constructing the necessary SQL to create the database (the DATABASE_USER # Constructing the necessary SQL to create the database (the DATABASE_USER
# must possess the privileges to create a database) # must possess the privileges to create a database)
create_sql = 'CREATE DATABASE %s OWNER %s' % (connection.ops.quote_name(db_name), create_sql = 'CREATE DATABASE %s' % connection.ops.quote_name(db_name)
settings.DATABASE_USER) if settings.DATABASE_USER:
create_sql += ' OWNER %s' % settings.DATABASE_USER
cursor = connection.cursor() cursor = connection.cursor()
_set_autocommit(connection) _set_autocommit(connection)
@ -133,10 +135,11 @@ def drop_db(db_name=False, test=False):
def get_cmd_options(db_name): def get_cmd_options(db_name):
"Obtains the command-line PostgreSQL connection options for shell commands." "Obtains the command-line PostgreSQL connection options for shell commands."
# The db_name parameter is optional # The db_name parameter is optional
options = ''
if db_name: if db_name:
options = '-d %s -U %s ' % (db_name, settings.DATABASE_USER) options += '-d %s ' % db_name
else: if settings.DATABASE_USER:
options = '-U %s ' % settings.DATABASE_USER options += '-U %s ' % settings.DATABASE_USER
if settings.DATABASE_HOST: if settings.DATABASE_HOST:
options += '-h %s ' % settings.DATABASE_HOST options += '-h %s ' % settings.DATABASE_HOST
if settings.DATABASE_PORT: if settings.DATABASE_PORT: