Skip to content

Commit

Permalink
ActiverecordTestConnector shouldn't be a class
Browse files Browse the repository at this point in the history
  • Loading branch information
mislav committed Aug 9, 2010
1 parent dfc3044 commit 3615938
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions spec/finders/activerecord_test_connector.rb
Expand Up @@ -5,17 +5,19 @@

$query_count = $query_sql = nil

class ActiverecordTestConnector
cattr_accessor :able_to_connect
cattr_accessor :connected
module ActiverecordTestConnector
extend self

attr_accessor :able_to_connect
attr_accessor :connected

FIXTURES_PATH = File.expand_path('../../fixtures', __FILE__)

# Set our defaults
self.connected = false
self.able_to_connect = true

def self.setup
def setup
unless self.connected || !self.able_to_connect
setup_connection
load_schema
Expand All @@ -29,12 +31,12 @@ def self.setup

private

def self.add_load_path(path)
def add_load_path(path)
dep = defined?(ActiveSupport::Dependencies) ? ActiveSupport::Dependencies : ::Dependencies
dep.autoload_paths.unshift path
end

def self.setup_connection
def setup_connection
db = ENV['DB'].blank?? 'sqlite3' : ENV['DB']

configurations = YAML.load_file(File.expand_path('../../database.yml', __FILE__))
Expand All @@ -49,14 +51,14 @@ def self.setup_connection
prepare ActiveRecord::Base.connection
end

def self.load_schema
def load_schema
ActiveRecord::Base.silence do
ActiveRecord::Migration.verbose = false
load File.join(FIXTURES_PATH, 'schema.rb')
end
end

def self.prepare(conn)
def prepare(conn)
class << conn
IGNORED_SQL = /^(?:PRAGMA|SELECT (?:currval|CAST|@@IDENTITY|@@ROWCOUNT)|SHOW FIELDS)\b/

Expand Down

0 comments on commit 3615938

Please sign in to comment.