generators/ultrasphinx_migration/templates/migration.rb generators/ultrasphinx_migration/ultrasphinx_migration_generator.rb install.rb @@ -1,4 +1,6 @@ +v1.9.3. Move Postgres stored procedures into a migration generator (Lang Riley). + v1.9.2. Add geodistance support (Jeremy Seitz, Mark Lane). v1.9.1. Add ultrasphinx:index:merge task for index merging, and a note in DEPLOYMENT_NOTES about how to use it. CHANGELOG @@ -125,7 +125,7 @@ See DEPLOYMENT_NOTES[link:files/DEPLOYMENT_NOTES.html]. Note that since Ultrasphinx preloads indexed models, you need to make sure those models have their own dependencies in place early in the boot process. This may require adjusting the general plugin load order or moving monkey-patches from <tt>lib/</tt> to <tt>vendor/plugins/</tt>. -PostgreSQL 8.2 and higher are well supported. However, make sure you have executed <tt>CREATE LANGUAGE plpgsql;</tt> at least once. This step does not need to be repeated, so depending on your DB permissions, you might be able to put it in a migration. +PostgreSQL 8.2 and higher are well supported. However, make sure the stored procedure migration gets generated correctly. If you did not install the plugin via <tt>script/install</tt>, run <tt>script/generate ultrasphinx_migration</tt> by hand. == Reporting problems README @@ -231,8 +231,14 @@ module Ultrasphinx def build_regular_fields(klass, fields, entries, column_strings, join_strings, group_bys, remaining_columns) - entries.to_a.each do |entry| - source_string = "#{entry['table_alias']}.#{entry['field']}" + entries.to_a.each do |entry| + + source_string = if entry['sortable'] + entry['field'] # Use the alias + else + "#{entry['table_alias']}.#{entry['field']}" # Use the column + end + group_bys << source_string column_strings, remaining_columns = install_field(fields, source_string, entry['as'], entry['function_sql'], entry['facet'], column_strings, remaining_columns) end lib/ultrasphinx/configure.rb @@ -99,10 +99,7 @@ This is a special singleton configuration class that stores the index field conf begin # Fields are from the model - # We destructively canonicize them back onto the configuration hash options['fields'] = options['fields'].to_a.map do |entry| - entry = {'field' => entry} unless entry.is_a? Hash - extract_table_alias!(entry, klass) extract_field_alias!(entry, klass) lib/ultrasphinx/fields.rb @@ -198,7 +198,8 @@ If the associations weren't just <tt>has_many</tt> and <tt>belongs_to</tt>, you entry.assert_valid_keys ['field', 'as', 'facet', 'function_sql', 'sortable'] entry else - entry.to_s + # Single strings + {'field' => entry.to_s} end end @@ -219,6 +220,18 @@ If the associations weren't just <tt>has_many</tt> and <tt>belongs_to</tt>, you entry._stringify_all!('sortable', 'facet') entry.assert_valid_keys ['class_name', 'association_name', 'field', 'as', 'association_sql', 'facet', 'function_sql', 'sortable'] end + + # Add special alias columns for text sortables so that the original column doesn't get + # removed, since Sphinx will either store stems or ordinals but not both. We use the + # original alias as source so that the query doesn't get repeated in case it is + # resource-intensive. + opts.slice('fields', 'concatenate', 'include').values._flatten_once.each do |entry| + if entry['sortable'] + entry.delete('sortable') + name = "#{entry['as'] || entry['field']}" + opts['fields'] << {'field' => name, 'as' => "#{name}_sortable", 'sortable' => true} + end + end Ultrasphinx::MODEL_CONFIGURATION[self.name] = opts end lib/ultrasphinx/is_indexed.rb @@ -1,11 +1,11 @@ /* http://osdir.com/ml/db.postgresql.admIN/2003-08/msg00057.html */ -CREATE OR REPLACE FUNCTION MAKE_CONCAT_WS() RETURNS text AS ' +CREATE FUNCTION MAKE_CONCAT_WS() RETURNS text AS ' declare v_args int := 32; - v_first text := ''CREATE OR REPLACE FUNCTION CONCAT_WS(text,text,text) RETURNS text AS ''''SELECT CASE WHEN $1 IS NULL THEN NULL WHEN $3 IS NULL THEN $2 ELSE $2 || $1 || $3 END'''' LANGUAGE sql IMMUTABLE''; - v_part1 text := ''CREATE OR REPLACE FUNCTION CONCAT_WS(text,text''; + v_first text := ''CREATE FUNCTION CONCAT_WS(text,text,text) RETURNS text AS ''''SELECT CASE WHEN $1 IS NULL THEN NULL WHEN $3 IS NULL THEN $2 ELSE $2 || $1 || $3 END'''' LANGUAGE sql IMMUTABLE''; + v_part1 text := ''CREATE FUNCTION CONCAT_WS(text,text''; v_part2 text := '') RETURNS text AS ''''SELECT CONCAT_WS($1,CONCAT_WS($1,$2''; v_part3 text := '')'''' LANGUAGE sql IMMUTABLE''; v_sql text; lib/ultrasphinx/postgresql/concat_ws.sql @@ -1,7 +1,7 @@ /* Fake CRC32 */ -CREATE OR REPLACE FUNCTION crc32(text) +CREATE FUNCTION crc32(text) RETURNS bigint AS $$ DECLARE tmp bigint; lib/ultrasphinx/postgresql/crc32.sql @@ -6,7 +6,7 @@ Note: For DISTINCT and ORDER BY a subquery is required */ -CREATE OR REPLACE FUNCTION _group_concat(text, text) +CREATE FUNCTION _group_concat(text, text) RETURNS text AS $$ SELECT CASE WHEN $2 IS NULL THEN $1 @@ -15,8 +15,6 @@ RETURNS text AS $$ END $$ IMMUTABLE LANGUAGE SQL; -DROP AGGREGATE IF EXISTS group_concat(text); - CREATE AGGREGATE group_concat ( BASETYPE = text, SFUNC = _group_concat, lib/ultrasphinx/postgresql/group_concat.sql @@ -1,5 +1,5 @@ -CREATE OR REPLACE FUNCTION hex_to_int(varchar) RETURNS int4 AS ' +CREATE FUNCTION hex_to_int(varchar) RETURNS int4 AS ' DECLARE h alias for $1; exec varchar; lib/ultrasphinx/postgresql/hex_to_int.sql @@ -6,7 +6,7 @@ UNIX_TIMESTAMP(date) */ -CREATE OR REPLACE FUNCTION unix_timestamp(timestamp without time zone) +CREATE FUNCTION unix_timestamp(timestamp without time zone) RETURNS bigint AS $$ SELECT EXTRACT(EPOCH FROM $1)::bigint $$ VOLATILE LANGUAGE SQL; lib/ultrasphinx/postgresql/unix_timestamp.sql @@ -83,7 +83,7 @@ Note that Sphinx expects lat/long to be indexed as radians. If you have degrees Then, set <tt>Ultrasphinx::Search.client_options[:location][:units] = 'degrees'</tt>. -The <tt>:double</tt> column type is recommended for storing location data. +The MySQL <tt>:double</tt> column type is recommended for storing location data. For Postgres, use <tt>:float</tt. == Interlock integration lib/ultrasphinx/search.rb @@ -48,6 +48,9 @@ module Ultrasphinx end end + # Use the additional sortable column if it is a text type + sort_by += "_sortable" if Fields.instance.types[sort_by] == "text" + unless sort_by.blank? if opts['sort_mode'].to_s == 'relevance' # If you're sorting by a field you don't want 'relevance' order @@ -124,7 +127,7 @@ module Ultrasphinx raise NoMethodError end rescue NoMethodError => e - raise UsageError, "filter value #{value.inspect} for field #{field.inspect} is invalid" + raise UsageError, "Filter value #{value.inspect} for field #{field.inspect} is invalid" end end @@ -258,7 +261,10 @@ module Ultrasphinx # Inverse-modulus map the Sphinx ids to the table-specific ids def convert_sphinx_ids(sphinx_ids) - number_of_models = IDS_TO_MODELS.size + + number_of_models = IDS_TO_MODELS.size + raise ConfigurationError, "No model mappings were found. Your #{RAILS_ENV}.conf file is corrupted, or your application container needs to be restarted." if number_of_models == 0 + sphinx_ids.sort_by do |item| item[:index] end.map do |item| lib/ultrasphinx/search/internals.rb @@ -67,43 +67,30 @@ module Ultrasphinx 'group_concat' => "CAST(GROUP_CONCAT(DISTINCT ? ? SEPARATOR ' ') AS CHAR)", 'delta' => "DATE_SUB(NOW(), INTERVAL ? SECOND)", 'hash' => "CAST(CRC32(?) AS unsigned)", - 'range_cast' => "?", - 'stored_procedures' => {} + 'range_cast' => "?" }, 'postgresql' => { 'group_concat' => "GROUP_CONCAT(?)", 'delta' => "(NOW() - '? SECOND'::interval)", 'range_cast' => "cast(coalesce(?,1) AS integer)", - 'hash' => "CRC32(?)", - 'stored_procedures' => Hash[*( - ['hex_to_int', 'group_concat', 'concat_ws', 'unix_timestamp', 'crc32'].map do |name| - [name, load_stored_procedure(name)] - end.flatten - ) - ] + 'hash' => "CRC32(?)" } } DEFAULTS = { 'mysql' => %( -type = mysql -sql_query_pre = SET SESSION group_concat_max_len = 65535 -sql_query_pre = SET NAMES utf8 - ), + type = mysql + sql_query_pre = SET SESSION group_concat_max_len = 65535 + sql_query_pre = SET NAMES utf8 + ), 'postgresql' => %( -type = pgsql -sql_query_pre = ) + SQL_FUNCTIONS['postgresql']['stored_procedures'].values.join(' ') + %( - ) -} + type = pgsql + sql_query_pre = + ) + } ADAPTER = ActiveRecord::Base.connection.instance_variable_get("@config")[:adapter] rescue 'mysql' - - # Install the stored procedures. - # XXX This shouldn't be done at every index, say the Postgres people. - SQL_FUNCTIONS[ADAPTER]['stored_procedures'].each do |key, value| - ActiveRecord::Base.connection.execute(value) - end - + # Warn-mode logger. Also called from rake tasks. def self.say msg # XXX Method name is stupid. lib/ultrasphinx/ultrasphinx.rb @@ -3,7 +3,7 @@ class Seller < ActiveRecord::Base delegate :address, :to => :user is_indexed :fields => [ - {:field => :company_name, :facet => true}, + {:field => :company_name, :facet => true, :sortable => true}, {:field => 'mission_statement', :sortable => true}, 'created_at', :capitalization, test/integration/app/app/models/seller.rb @@ -1,7 +1,7 @@ -# Auto-generated at Fri Mar 28 00:16:11 -0400 2008. +# Auto-generated at Mon Mar 31 00:50:43 -0400 2008. # Hand modifications will be overwritten. -# /Users/eweaver/Desktop/projects/fauna/ultrasphinx/trunk/test/integration/app/config/ultrasphinx/default.base +# /Users/eweaver/Desktop/projects/ub/vendor/plugins/ultrasphinx/test/integration/app/config/ultrasphinx/default.base indexer { mem_limit = 256M } @@ -26,27 +26,28 @@ source geo__states_main sql_query_post = sql_ranged_throttle = 0 -type = mysql -sql_query_pre = SET SESSION group_concat_max_len = 65535 -sql_query_pre = SET NAMES utf8 - + type = mysql + sql_query_pre = SET SESSION group_concat_max_len = 65535 + sql_query_pre = SET NAMES utf8 + sql_db = ultrasphinx_development sql_host = localhost sql_pass = sql_user = root sql_query_range = SELECT MIN(id) , MAX(id) FROM states -sql_query = SELECT (states.id * 5 + 0) AS id, CAST(GROUP_CONCAT(DISTINCT addresses.name SEPARATOR ' ') AS CHAR) AS address_name, 0 AS capitalization, 'Geo::State' AS class, 0 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_two, 0 AS company_two_facet, '' AS content, 18000 AS created_at, 0 AS deleted, '' AS email, 0 AS lat, 0 AS lng, '' AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM states LEFT OUTER JOIN addresses AS addresses ON states.id = addresses.state_id WHERE states.id >= $start AND states.id <= $end GROUP BY states.id +sql_query = SELECT (states.id * 5 + 0) AS id, CAST(GROUP_CONCAT(DISTINCT addresses.name SEPARATOR ' ') AS CHAR) AS address_name, 0 AS capitalization, 'Geo::State' AS class, 0 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_name_sortable, '' AS company_two, 0 AS company_two_facet, '' AS content, 18000 AS created_at, 0 AS deleted, '' AS email, 0 AS lat, 0 AS lng, '' AS login, '' AS mission_statement, '' AS mission_statement_sortable, '' AS name, '' AS state, 0 AS user_id FROM states LEFT OUTER JOIN addresses AS addresses ON states.id = addresses.state_id WHERE states.id >= $start AND states.id <= $end GROUP BY states.id sql_attr_float = capitalization sql_attr_uint = class_id sql_attr_uint = company_facet sql_attr_uint = company_name_facet +sql_attr_str2ordinal = company_name_sortable sql_attr_uint = company_two_facet sql_attr_timestamp = created_at sql_attr_bool = deleted sql_attr_float = lat sql_attr_float = lng -sql_attr_str2ordinal = mission_statement +sql_attr_str2ordinal = mission_statement_sortable sql_attr_uint = user_id sql_query_info = SELECT * FROM states WHERE states.id = (($id - 0) / 5) } @@ -60,27 +61,28 @@ source sellers_main sql_query_post = sql_ranged_throttle = 0 -type = mysql -sql_query_pre = SET SESSION group_concat_max_len = 65535 -sql_query_pre = SET NAMES utf8 - + type = mysql + sql_query_pre = SET SESSION group_concat_max_len = 65535 + sql_query_pre = SET NAMES utf8 + sql_db = ultrasphinx_development sql_host = localhost sql_pass = sql_user = root sql_query_range = SELECT MIN(id) , MAX(id) FROM sellers -sql_query = SELECT (sellers.id * 5 + 1) AS id, '' AS address_name, sellers.capitalization AS capitalization, 'Seller' AS class, 1 AS class_id, '' AS company, 0 AS company_facet, sellers.company_name AS company_name, CAST(CRC32(sellers.company_name) AS unsigned) AS company_name_facet, '' AS company_two, 0 AS company_two_facet, '' AS content, UNIX_TIMESTAMP(sellers.created_at) AS created_at, 0 AS deleted, '' AS email, 0 AS lat, 0 AS lng, '' AS login, sellers.mission_statement AS mission_statement, '' AS name, '' AS state, sellers.user_id AS user_id FROM sellers WHERE sellers.id >= $start AND sellers.id <= $end GROUP BY sellers.id +sql_query = SELECT (sellers.id * 5 + 1) AS id, '' AS address_name, sellers.capitalization AS capitalization, 'Seller' AS class, 1 AS class_id, '' AS company, 0 AS company_facet, sellers.company_name AS company_name, CAST(CRC32(sellers.company_name) AS unsigned) AS company_name_facet, company_name AS company_name_sortable, '' AS company_two, 0 AS company_two_facet, '' AS content, UNIX_TIMESTAMP(sellers.created_at) AS created_at, 0 AS deleted, '' AS email, 0 AS lat, 0 AS lng, '' AS login, sellers.mission_statement AS mission_statement, mission_statement AS mission_statement_sortable, '' AS name, '' AS state, sellers.user_id AS user_id FROM sellers WHERE sellers.id >= $start AND sellers.id <= $end GROUP BY sellers.id sql_attr_float = capitalization sql_attr_uint = class_id sql_attr_uint = company_facet sql_attr_uint = company_name_facet +sql_attr_str2ordinal = company_name_sortable sql_attr_uint = company_two_facet sql_attr_timestamp = created_at sql_attr_bool = deleted sql_attr_float = lat sql_attr_float = lng -sql_attr_str2ordinal = mission_statement +sql_attr_str2ordinal = mission_statement_sortable sql_attr_uint = user_id sql_query_info = SELECT * FROM sellers WHERE sellers.id = (($id - 1) / 5) } @@ -94,27 +96,28 @@ source geo__addresses_main sql_query_post = sql_ranged_throttle = 0 -type = mysql -sql_query_pre = SET SESSION group_concat_max_len = 65535 -sql_query_pre = SET NAMES utf8 - + type = mysql + sql_query_pre = SET SESSION group_concat_max_len = 65535 + sql_query_pre = SET NAMES utf8 + sql_db = ultrasphinx_development sql_host = localhost sql_pass = sql_user = root sql_query_range = SELECT MIN(id) , MAX(id) FROM addresses -sql_query = SELECT (addresses.id * 5 + 2) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Address' AS class, 2 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_two, 0 AS company_two_facet, CONCAT_WS(' ', addresses.line_1, addresses.line_2, addresses.city, addresses.province_region, addresses.zip_postal_code) AS content, 18000 AS created_at, 0 AS deleted, '' AS email, RADIANS(addresses.lat) AS lat, RADIANS(addresses.lng) AS lng, '' AS login, '' AS mission_statement, addresses.name AS name, state.name AS state, 0 AS user_id FROM addresses LEFT OUTER JOIN states AS state ON state.id = addresses.state_id WHERE addresses.id >= $start AND addresses.id <= $end GROUP BY addresses.id +sql_query = SELECT (addresses.id * 5 + 2) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Address' AS class, 2 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_name_sortable, '' AS company_two, 0 AS company_two_facet, CONCAT_WS(' ', addresses.line_1, addresses.line_2, addresses.city, addresses.province_region, addresses.zip_postal_code) AS content, 18000 AS created_at, 0 AS deleted, '' AS email, RADIANS(addresses.lat) AS lat, RADIANS(addresses.lng) AS lng, '' AS login, '' AS mission_statement, '' AS mission_statement_sortable, addresses.name AS name, state.name AS state, 0 AS user_id FROM addresses LEFT OUTER JOIN states AS state ON state.id = addresses.state_id WHERE addresses.id >= $start AND addresses.id <= $end GROUP BY addresses.id sql_attr_float = capitalization sql_attr_uint = class_id sql_attr_uint = company_facet sql_attr_uint = company_name_facet +sql_attr_str2ordinal = company_name_sortable sql_attr_uint = company_two_facet sql_attr_timestamp = created_at sql_attr_bool = deleted sql_attr_float = lat sql_attr_float = lng -sql_attr_str2ordinal = mission_statement +sql_attr_str2ordinal = mission_statement_sortable sql_attr_uint = user_id sql_query_info = SELECT * FROM addresses WHERE addresses.id = (($id - 2) / 5) } @@ -128,27 +131,28 @@ source users_main sql_query_post = sql_ranged_throttle = 0 -type = mysql -sql_query_pre = SET SESSION group_concat_max_len = 65535 -sql_query_pre = SET NAMES utf8 - + type = mysql + sql_query_pre = SET SESSION group_concat_max_len = 65535 + sql_query_pre = SET NAMES utf8 + sql_db = ultrasphinx_development sql_host = localhost sql_pass = sql_user = root sql_query_range = SELECT MIN(id) , MAX(id) FROM users -sql_query = SELECT (users.id * 5 + 3) AS id, '' AS address_name, 0 AS capitalization, 'User' AS class, 3 AS class_id, specific_seller.company_name AS company, CAST(CRC32(specific_seller.company_name) AS unsigned) AS company_facet, '' AS company_name, 0 AS company_name_facet, REPLACE(sellers_two.company_name, '6', ' replacement ') AS company_two, CAST(CRC32(REPLACE(sellers_two.company_name, '6', ' replacement ')) AS unsigned) AS company_two_facet, '' AS content, 18000 AS created_at, users.deleted AS deleted, users.email AS email, 0 AS lat, 0 AS lng, users.login AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM users LEFT OUTER JOIN sellers AS specific_seller ON users.id = specific_seller.user_id LEFT OUTER JOIN sellers AS sellers_two ON users.id = sellers_two.user_id WHERE users.id >= $start AND users.id <= $end AND (deleted = '0') GROUP BY users.id +sql_query = SELECT (users.id * 5 + 3) AS id, '' AS address_name, 0 AS capitalization, 'User' AS class, 3 AS class_id, specific_seller.company_name AS company, CAST(CRC32(specific_seller.company_name) AS unsigned) AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_name_sortable, REPLACE(sellers_two.company_name, '6', ' replacement ') AS company_two, CAST(CRC32(REPLACE(sellers_two.company_name, '6', ' replacement ')) AS unsigned) AS company_two_facet, '' AS content, 18000 AS created_at, users.deleted AS deleted, users.email AS email, 0 AS lat, 0 AS lng, users.login AS login, '' AS mission_statement, '' AS mission_statement_sortable, '' AS name, '' AS state, 0 AS user_id FROM users LEFT OUTER JOIN sellers AS specific_seller ON users.id = specific_seller.user_id LEFT OUTER JOIN sellers AS sellers_two ON users.id = sellers_two.user_id WHERE users.id >= $start AND users.id <= $end AND (deleted = '0') GROUP BY users.id sql_attr_float = capitalization sql_attr_uint = class_id sql_attr_uint = company_facet sql_attr_uint = company_name_facet +sql_attr_str2ordinal = company_name_sortable sql_attr_uint = company_two_facet sql_attr_timestamp = created_at sql_attr_bool = deleted sql_attr_float = lat sql_attr_float = lng -sql_attr_str2ordinal = mission_statement +sql_attr_str2ordinal = mission_statement_sortable sql_attr_uint = user_id sql_query_info = SELECT * FROM users WHERE users.id = (($id - 3) / 5) } @@ -162,27 +166,28 @@ source geo__countries_main sql_query_post = sql_ranged_throttle = 0 -type = mysql -sql_query_pre = SET SESSION group_concat_max_len = 65535 -sql_query_pre = SET NAMES utf8 - + type = mysql + sql_query_pre = SET SESSION group_concat_max_len = 65535 + sql_query_pre = SET NAMES utf8 + sql_db = ultrasphinx_development sql_host = localhost sql_pass = sql_user = root sql_query_range = SELECT MIN(id) , MAX(id) FROM countries -sql_query = SELECT (countries.id * 5 + 4) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Country' AS class, 4 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_two, 0 AS company_two_facet, '' AS content, 18000 AS created_at, 0 AS deleted, '' AS email, 0 AS lat, 0 AS lng, '' AS login, '' AS mission_statement, countries.name AS name, '' AS state, 0 AS user_id FROM countries WHERE countries.id >= $start AND countries.id <= $end GROUP BY countries.id +sql_query = SELECT (countries.id * 5 + 4) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Country' AS class, 4 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_name_sortable, '' AS company_two, 0 AS company_two_facet, '' AS content, 18000 AS created_at, 0 AS deleted, '' AS email, 0 AS lat, 0 AS lng, '' AS login, '' AS mission_statement, '' AS mission_statement_sortable, countries.name AS name, '' AS state, 0 AS user_id FROM countries WHERE countries.id >= $start AND countries.id <= $end GROUP BY countries.id sql_attr_float = capitalization sql_attr_uint = class_id sql_attr_uint = company_facet sql_attr_uint = company_name_facet +sql_attr_str2ordinal = company_name_sortable sql_attr_uint = company_two_facet sql_attr_timestamp = created_at sql_attr_bool = deleted sql_attr_float = lat sql_attr_float = lng -sql_attr_str2ordinal = mission_statement +sql_attr_str2ordinal = mission_statement_sortable sql_attr_uint = user_id sql_query_info = SELECT * FROM countries WHERE countries.id = (($id - 4) / 5) } @@ -219,27 +224,28 @@ source sellers_delta sql_query_post = sql_ranged_throttle = 0 -type = mysql -sql_query_pre = SET SESSION group_concat_max_len = 65535 -sql_query_pre = SET NAMES utf8 - + type = mysql + sql_query_pre = SET SESSION group_concat_max_len = 65535 + sql_query_pre = SET NAMES utf8 + sql_db = ultrasphinx_development sql_host = localhost sql_pass = sql_user = root sql_query_range = SELECT MIN(id) , MAX(id) FROM sellers WHERE sellers.updated_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND) -sql_query = SELECT (sellers.id * 5 + 1) AS id, '' AS address_name, sellers.capitalization AS capitalization, 'Seller' AS class, 1 AS class_id, '' AS company, 0 AS company_facet, sellers.company_name AS company_name, CAST(CRC32(sellers.company_name) AS unsigned) AS company_name_facet, '' AS company_two, 0 AS company_two_facet, '' AS content, UNIX_TIMESTAMP(sellers.created_at) AS created_at, 0 AS deleted, '' AS email, 0 AS lat, 0 AS lng, '' AS login, sellers.mission_statement AS mission_statement, '' AS name, '' AS state, sellers.user_id AS user_id FROM sellers WHERE sellers.id >= $start AND sellers.id <= $end AND sellers.updated_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND) GROUP BY sellers.id +sql_query = SELECT (sellers.id * 5 + 1) AS id, '' AS address_name, sellers.capitalization AS capitalization, 'Seller' AS class, 1 AS class_id, '' AS company, 0 AS company_facet, sellers.company_name AS company_name, CAST(CRC32(sellers.company_name) AS unsigned) AS company_name_facet, company_name AS company_name_sortable, '' AS company_two, 0 AS company_two_facet, '' AS content, UNIX_TIMESTAMP(sellers.created_at) AS created_at, 0 AS deleted, '' AS email, 0 AS lat, 0 AS lng, '' AS login, sellers.mission_statement AS mission_statement, mission_statement AS mission_statement_sortable, '' AS name, '' AS state, sellers.user_id AS user_id FROM sellers WHERE sellers.id >= $start AND sellers.id <= $end AND sellers.updated_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND) GROUP BY sellers.id sql_attr_float = capitalization sql_attr_uint = class_id sql_attr_uint = company_facet sql_attr_uint = company_name_facet +sql_attr_str2ordinal = company_name_sortable sql_attr_uint = company_two_facet sql_attr_timestamp = created_at sql_attr_bool = deleted sql_attr_float = lat sql_attr_float = lng -sql_attr_str2ordinal = mission_statement +sql_attr_str2ordinal = mission_statement_sortable sql_attr_uint = user_id sql_query_info = SELECT * FROM sellers WHERE sellers.id = (($id - 1) / 5) } @@ -253,27 +259,28 @@ source geo__addresses_delta sql_query_post = sql_ranged_throttle = 0 -type = mysql -sql_query_pre = SET SESSION group_concat_max_len = 65535 -sql_query_pre = SET NAMES utf8 - + type = mysql + sql_query_pre = SET SESSION group_concat_max_len = 65535 + sql_query_pre = SET NAMES utf8 + sql_db = ultrasphinx_development sql_host = localhost sql_pass = sql_user = root sql_query_range = SELECT MIN(id) , MAX(id) FROM addresses -sql_query = SELECT (addresses.id * 5 + 2) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Address' AS class, 2 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_two, 0 AS company_two_facet, CONCAT_WS(' ', addresses.line_1, addresses.line_2, addresses.city, addresses.province_region, addresses.zip_postal_code) AS content, 18000 AS created_at, 0 AS deleted, '' AS email, RADIANS(addresses.lat) AS lat, RADIANS(addresses.lng) AS lng, '' AS login, '' AS mission_statement, addresses.name AS name, state.name AS state, 0 AS user_id FROM addresses LEFT OUTER JOIN states AS state ON state.id = addresses.state_id WHERE addresses.id >= $start AND addresses.id <= $end GROUP BY addresses.id +sql_query = SELECT (addresses.id * 5 + 2) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Address' AS class, 2 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_name_sortable, '' AS company_two, 0 AS company_two_facet, CONCAT_WS(' ', addresses.line_1, addresses.line_2, addresses.city, addresses.province_region, addresses.zip_postal_code) AS content, 18000 AS created_at, 0 AS deleted, '' AS email, RADIANS(addresses.lat) AS lat, RADIANS(addresses.lng) AS lng, '' AS login, '' AS mission_statement, '' AS mission_statement_sortable, addresses.name AS name, state.name AS state, 0 AS user_id FROM addresses LEFT OUTER JOIN states AS state ON state.id = addresses.state_id WHERE addresses.id >= $start AND addresses.id <= $end GROUP BY addresses.id sql_attr_float = capitalization sql_attr_uint = class_id sql_attr_uint = company_facet sql_attr_uint = company_name_facet +sql_attr_str2ordinal = company_name_sortable sql_attr_uint = company_two_facet sql_attr_timestamp = created_at sql_attr_bool = deleted sql_attr_float = lat sql_attr_float = lng -sql_attr_str2ordinal = mission_statement +sql_attr_str2ordinal = mission_statement_sortable sql_attr_uint = user_id sql_query_info = SELECT * FROM addresses WHERE addresses.id = (($id - 2) / 5) } @@ -287,27 +294,28 @@ source users_delta sql_query_post = sql_ranged_throttle = 0 -type = mysql -sql_query_pre = SET SESSION group_concat_max_len = 65535 -sql_query_pre = SET NAMES utf8 - + type = mysql + sql_query_pre = SET SESSION group_concat_max_len = 65535 + sql_query_pre = SET NAMES utf8 + sql_db = ultrasphinx_development sql_host = localhost sql_pass = sql_user = root sql_query_range = SELECT MIN(id) , MAX(id) FROM users WHERE users.created_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND) -sql_query = SELECT (users.id * 5 + 3) AS id, '' AS address_name, 0 AS capitalization, 'User' AS class, 3 AS class_id, specific_seller.company_name AS company, CAST(CRC32(specific_seller.company_name) AS unsigned) AS company_facet, '' AS company_name, 0 AS company_name_facet, REPLACE(sellers_two.company_name, '6', ' replacement ') AS company_two, CAST(CRC32(REPLACE(sellers_two.company_name, '6', ' replacement ')) AS unsigned) AS company_two_facet, '' AS content, 18000 AS created_at, users.deleted AS deleted, users.email AS email, 0 AS lat, 0 AS lng, users.login AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM users LEFT OUTER JOIN sellers AS specific_seller ON users.id = specific_seller.user_id LEFT OUTER JOIN sellers AS sellers_two ON users.id = sellers_two.user_id WHERE users.id >= $start AND users.id <= $end AND (deleted = '0') AND users.created_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND) GROUP BY users.id +sql_query = SELECT (users.id * 5 + 3) AS id, '' AS address_name, 0 AS capitalization, 'User' AS class, 3 AS class_id, specific_seller.company_name AS company, CAST(CRC32(specific_seller.company_name) AS unsigned) AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_name_sortable, REPLACE(sellers_two.company_name, '6', ' replacement ') AS company_two, CAST(CRC32(REPLACE(sellers_two.company_name, '6', ' replacement ')) AS unsigned) AS company_two_facet, '' AS content, 18000 AS created_at, users.deleted AS deleted, users.email AS email, 0 AS lat, 0 AS lng, users.login AS login, '' AS mission_statement, '' AS mission_statement_sortable, '' AS name, '' AS state, 0 AS user_id FROM users LEFT OUTER JOIN sellers AS specific_seller ON users.id = specific_seller.user_id LEFT OUTER JOIN sellers AS sellers_two ON users.id = sellers_two.user_id WHERE users.id >= $start AND users.id <= $end AND (deleted = '0') AND users.created_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND) GROUP BY users.id sql_attr_float = capitalization sql_attr_uint = class_id sql_attr_uint = company_facet sql_attr_uint = company_name_facet +sql_attr_str2ordinal = company_name_sortable sql_attr_uint = company_two_facet sql_attr_timestamp = created_at sql_attr_bool = deleted sql_attr_float = lat sql_attr_float = lng -sql_attr_str2ordinal = mission_statement +sql_attr_str2ordinal = mission_statement_sortable sql_attr_uint = user_id sql_query_info = SELECT * FROM users WHERE users.id = (($id - 3) / 5) } test/integration/app/config/ultrasphinx/development.conf.canonical @@ -1,7 +1,7 @@ class AddLatAndLongToAddress < ActiveRecord::Migration def self.up - add_column :addresses, :lat, :double - add_column :addresses, :lng, :double + add_column :addresses, :lat, :float # Postgres doesn't have :double + add_column :addresses, :lng, :float end def self.down test/integration/app/db/migrate/007_add_lat_and_long_to_address.rb @@ -227,7 +227,7 @@ class SearchTest < Test::Unit::TestCase def test_unconfigured_sortable_name assert_raises(Ultrasphinx::UsageError) do - S.new(:class_names => 'Seller', :sort_by => 'company_name', :sort_mode => 'ascending', :per_page => 5).run + S.new(:class_names => 'User', :sort_by => 'company', :sort_mode => 'ascending', :per_page => 5).run end end test/integration/search_test.rb @@ -17,11 +17,18 @@ Dir.chdir "#{File.dirname(__FILE__)}/integration/app/" do system("ln -s ../../../../../ ultrasphinx") end - system("rake db:drop") - system("rake db:create") - system("rake db:migrate db:fixtures:load") + if ENV['DB'] == 'postgresql' + # http://dev.rubyonrails.org/ticket/10559 + system("echo 'DROP DATABASE ultrasphinx_development;' | psql template1") + else + system("rake db:drop --trace") + end + + system("rake db:create --trace") + system("script/generate ultrasphinx_migration --svn") if ENV['DB'] == 'postgresql' + system("rake db:migrate db:fixtures:load --trace") - system("rake us:boot") + system("rake us:boot --trace") system("rm /tmp/ultrasphinx-stopwords.txt") - system("rake ultrasphinx:spelling:build") + system("rake ultrasphinx:spelling:build --trace") end test/setup.rb @@ -5,4 +5,9 @@ Dir.chdir "#{File.dirname(__FILE__)}/integration/app/" do # Remove the symlink created by the setup method, for people with tools # that can't handle recursive directories (Textmate). system("rm vendor/plugins/ultrasphinx") unless ENV['USER'] == 'eweaver' + + # Remove the generated Postgres migration, if it exists + Dir["db/migrate/*_install_ultrasphinx_stored_procedures.rb"].each do |file| + system("svn del --force #{file}") + end end \ No newline at end of file test/teardown.rb 881780cfc1296302ad8f3b10e0e2263090536849 Evan Weaver evan@cloudbur.st http://github.com/fauna/ultrasphinx/commit/69d9f5cab84753d0778a2460be3d17cf866419a9 69d9f5cab84753d0778a2460be3d17cf866419a9 2008-03-30T22:25:52-07:00 2008-03-30T22:25:52-07:00 Use a migration generator for installing Postgres stored procedures (Lang Riley). f2d5b0e7cd97739ef840553e95c861fd15890ea8 Evan Weaver evan@cloudbur.st