Skip to content

Commit

Permalink
Work in a non-Rails environment
Browse files Browse the repository at this point in the history
  • Loading branch information
andygeers committed Mar 14, 2014
1 parent 466b902 commit 1baac3d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
8 changes: 6 additions & 2 deletions lib/active_record/connection_adapters/unit_record_adapter.rb
Expand Up @@ -59,7 +59,7 @@ def execute(sql, name = nil)

def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
raise_or_noop
end if Rails::VERSION::MAJOR == 1
end if defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR == 1

def select_rows(sql, name = nil)
raise_or_noop []
Expand All @@ -80,7 +80,11 @@ def change_column_default(table_name, column_name, default)
def rename_column(table_name, column_name, new_column_name)
raise_or_noop
end


def add_foreign_key(table_name, column_names, target_table, key_name, options = {})
raise_or_noop
end

def tables
@cached_columns.keys
end
Expand Down
10 changes: 7 additions & 3 deletions lib/unit_record.rb
@@ -1,10 +1,14 @@
module UnitRecord
def self.rails_version
Rails::VERSION::STRING
if defined?(Rails::VERSION::STRING)
Rails::VERSION::STRING
else
nil
end
end

def self.base_rails_test_class
if rails_version >= "2.3.1"
if rails_version && rails_version >= "2.3.1"
ActiveSupport::TestCase
else
Test::Unit::TestCase
Expand Down
4 changes: 2 additions & 2 deletions lib/unit_record/disconnected_test_case.rb
@@ -1,8 +1,8 @@
module UnitRecord
module DisconnectedTestCase
def disconnect!
self.use_transactional_fixtures = false
self.use_transactional_fixtures = false if defined?(self.use_transactional_fixtures)

class_eval do
def self.fixtures(*args)
raise "Fixtures cannot be used with UnitRecord. ActiveRecord is disconnected; database access is unavailable in unit tests."
Expand Down

0 comments on commit 1baac3d

Please sign in to comment.