From 4c0e2147301e11eb570cdb870eb43bbc099ce82e Mon Sep 17 00:00:00 2001 From: Pat Allan Date: Tue, 17 Nov 2009 15:43:35 +1100 Subject: [PATCH] Cleaning up old cucumber support files - haven't been used for a little while. --- features/support/db/active_record.rb | 40 -------------------------- features/support/db/mysql.rb | 3 -- features/support/db/postgresql.rb | 3 -- features/support/post_database.rb | 43 ---------------------------- 4 files changed, 89 deletions(-) delete mode 100644 features/support/db/active_record.rb delete mode 100644 features/support/db/mysql.rb delete mode 100644 features/support/db/postgresql.rb delete mode 100644 features/support/post_database.rb diff --git a/features/support/db/active_record.rb b/features/support/db/active_record.rb deleted file mode 100644 index fcb622f13..000000000 --- a/features/support/db/active_record.rb +++ /dev/null @@ -1,40 +0,0 @@ -require 'yaml' -require 'active_record' - -# Database Defaults -host = "localhost" -username = "thinking_sphinx" -password = nil - -# Read in YAML file -if File.exist?("features/support/db/database.yml") - config = YAML.load open("features/support/db/database.yml") - host = config["host"] || host - username = config["username"] || username - password = config["password"] || password -end - -# Set up Connection -ActiveRecord::Base.establish_connection( - :adapter => Database, - :database => 'thinking_sphinx', - :username => username, - :password => password, - :host => host -) - -# Copied from ActiveRecord's test suite -ActiveRecord::Base.connection.class.class_eval do - IGNORED_SQL = [ - /^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, - /^SELECT @@ROWCOUNT/, /^SHOW FIELDS/ - ] - - def execute_with_query_record(sql, name = nil, &block) - $queries_executed ||= [] - $queries_executed << sql unless IGNORED_SQL.any? { |r| sql =~ r } - execute_without_query_record(sql, name, &block) - end - - alias_method_chain :execute, :query_record -end diff --git a/features/support/db/mysql.rb b/features/support/db/mysql.rb deleted file mode 100644 index 84232a710..000000000 --- a/features/support/db/mysql.rb +++ /dev/null @@ -1,3 +0,0 @@ -require 'active_record' -Database = defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql' -require "active_record/connection_adapters/#{Database}_adapter" diff --git a/features/support/db/postgresql.rb b/features/support/db/postgresql.rb deleted file mode 100644 index 20392e1db..000000000 --- a/features/support/db/postgresql.rb +++ /dev/null @@ -1,3 +0,0 @@ -require 'active_record' -Database = defined?(JRUBY_VERSION) ? 'jdbcpostgresql' : 'postgresql' -require "active_record/connection_adapters/#{Database}_adapter" diff --git a/features/support/post_database.rb b/features/support/post_database.rb deleted file mode 100644 index 3432463dd..000000000 --- a/features/support/post_database.rb +++ /dev/null @@ -1,43 +0,0 @@ -$:.unshift File.dirname(__FILE__) + '/../../lib' - -require 'lib/thinking_sphinx' - -%w( tmp/config tmp/log tmp/db/sphinx/development ).each do |path| - FileUtils.mkdir_p "#{Dir.pwd}/#{path}" -end - -Kernel.const_set :RAILS_ROOT, "#{Dir.pwd}/tmp" unless defined?(RAILS_ROOT) - -at_exit do - ThinkingSphinx::Configuration.instance.controller.stop - sleep(1) # Ensure Sphinx has shut down completely - ActiveRecord::Base.logger.close - FileUtils.rm_r "#{Dir.pwd}/tmp" -end - -# Add log file -ActiveRecord::Base.logger = Logger.new open("tmp/active_record.log", "a") - -# Set up database tables -Dir["features/support/db/migrations/*.rb"].each do |file| - require file.gsub(/\.rb$/, '') -end - -# Load Models -Dir["features/support/models/*.rb"].sort.each do |file| - require file.gsub(/\.rb$/, '') -end - -ThinkingSphinx.deltas_enabled = false - -# Load Fixtures -Dir["features/support/db/fixtures/*.rb"].each do |file| - require file.gsub(/\.rb$/, '') -end - -ThinkingSphinx.deltas_enabled = true -ThinkingSphinx.suppress_delta_output = true - -ThinkingSphinx::Configuration.instance.build -ThinkingSphinx::Configuration.instance.controller.index -ThinkingSphinx::Configuration.instance.controller.start