Skip to content

Added support for Django 1.2-style database settings #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added support for Django 1.2-style database settings #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eca91d4
Handling django 1.2 style DB params
Nov 23, 2010
1c5ef8a
Now compatible with both django 1.2 and <1.2 -style database settings.
kerin Dec 1, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 37 additions & 15 deletions djangosphinx/utils/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import django
from django.conf import settings
from django.template import Template, Context

Expand All @@ -10,11 +11,19 @@

__all__ = ('generate_config_for_model', 'generate_config_for_models')

DJANGO_MINOR_VERSION = float(".".join([str(django.VERSION[0]), str(django.VERSION[1])]))

def _get_database_engine():
if settings.DATABASE_ENGINE == 'mysql':
return settings.DATABASE_ENGINE
elif settings.DATABASE_ENGINE.startswith('postgresql'):
return 'pgsql'
if DJANGO_MINOR_VERSION < 1.2:
if settings.DATABASE_ENGINE == 'mysql':
return settings.DATABASE_ENGINE
elif settings.DATABASE_ENGINE.startswith('postgresql'):
return 'pgsql'
else:
if 'mysql' in settings.DATABASES['default']['ENGINE']:
return 'mysql'
elif 'postgresql' in settings.DATABASES['default']['ENGINE']:
return 'pgsql'
raise ValueError, "Only MySQL and PostgreSQL engines are supported by Sphinx."

def _get_template(name):
Expand Down Expand Up @@ -47,16 +56,29 @@ def _is_sourcable_field(field):
return False

# No trailing slashes on paths
DEFAULT_SPHINX_PARAMS = {
'database_engine': _get_database_engine(),
'database_host': settings.DATABASE_HOST,
'database_port': settings.DATABASE_PORT,
'database_name': settings.DATABASE_NAME,
'database_user': settings.DATABASE_USER,
'database_password': settings.DATABASE_PASSWORD,
'log_file': '/var/log/sphinx/searchd.log',
'data_path': '/var/data',
}

if DJANGO_MINOR_VERSION < 1.2:
DEFAULT_SPHINX_PARAMS = {
'database_engine': _get_database_engine(),
'database_host': settings.DATABASE_HOST,
'database_port': settings.DATABASE_PORT,
'database_name': settings.DATABASE_NAME,
'database_user': settings.DATABASE_USER,
'database_password': settings.DATABASE_PASSWORD,
'log_file': '/var/log/sphinx/searchd.log',
'data_path': '/var/data',
}
else:
DEFAULT_SPHINX_PARAMS = {
'database_engine': _get_database_engine(),
'database_host': settings.DATABASES['default']['HOST'],
'database_port': settings.DATABASES['default']['PORT'],
'database_name': settings.DATABASES['default']['NAME'],
'database_user': settings.DATABASES['default']['USER'],
'database_password': settings.DATABASES['default']['PASSWORD'],
'log_file': '/var/log/sphinx/searchd.log',
'data_path': '/var/data',
}

def get_index_context(index):
params = DEFAULT_SPHINX_PARAMS
Expand Down Expand Up @@ -188,4 +210,4 @@ def _the_tuple(f):

c = Context(params)

return t.render(c)
return t.render(c)