diff options
| author | Marius Mathiesen <marius@gitorious.org> | 2011-06-14 13:53:01 (GMT) |
|---|---|---|
| committer | Marius Mathiesen <marius@gitorious.org> | 2011-06-14 13:53:01 (GMT) |
| commit | 876e35f5a7b03dd0f3a7a62a87d2a3e55c5c89b7 (patch) | |
| tree | 617d84f2ec3e15bce637588ba71e32c1259eac27 /vendor | |
| parent | f8e2d331db8b769c48bf0c3a3a179fa265298cc2 (diff) | |
Prevent Ultrasphinx from freaking out on an unknown adapter (jdbcmysql)
This is basically a backport of
github.com/fauna/ultrasphinx/commit/4ecdbbf4ed89d9edd8aaa9607b97adc569798150
and aliases SQL_FUNCTIONS and DEFAULTS for jdbcmysql to mysql
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/plugins/ultrasphinx/lib/ultrasphinx/ultrasphinx.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vendor/plugins/ultrasphinx/lib/ultrasphinx/ultrasphinx.rb b/vendor/plugins/ultrasphinx/lib/ultrasphinx/ultrasphinx.rb index 92c85eb..4fd0ed9 100644 --- a/vendor/plugins/ultrasphinx/lib/ultrasphinx/ultrasphinx.rb +++ b/vendor/plugins/ultrasphinx/lib/ultrasphinx/ultrasphinx.rb @@ -83,6 +83,7 @@ module Ultrasphinx ] } } + SQL_FUNCTIONS['jdbcmysql'] = SQL_FUNCTIONS['mysql'] DEFAULTS = { 'mysql' => %( @@ -94,7 +95,8 @@ sql_query_pre = SET NAMES utf8 type = pgsql sql_query_pre = ) + SQL_FUNCTIONS['postgresql']['stored_procedures'].values.join(' ') + %( ) -} + } + DEFAULTS['jdbcmysql'] = DEFAULTS['mysql'] ADAPTER = ActiveRecord::Base.connection.instance_variable_get("@config")[:adapter] rescue 'mysql' |