activerecord-oracle_enhanced-adapter 1.4.3 → 1.5.0.beta1

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -6,7 +6,8 @@ describe "OracleEnhancedAdapter schema dump" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
-    @oracle11g = !! @conn.select_value("SELECT * FROM v$version WHERE banner LIKE 'Oracle%11g%'")
+    @oracle11g_or_higher = !! @conn.select_value(
+      "select * from product_component_version where product like 'Oracle%' and to_number(substr(version,1,2)) >= 11")
   end
 
   def standard_dump(options = {})
@@ -17,7 +18,7 @@ describe "OracleEnhancedAdapter schema dump" do
   end
 
   def create_test_posts_table(options = {})
-    options.merge! :force => true
+    options.merge! force: true
     schema_define do
       create_table :test_posts, options do |t|
         t.string :title
@@ -42,12 +43,12 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should not include ignored table names in schema dump" do
       create_test_posts_table
-      standard_dump(:ignore_tables => %w(test_posts)).should_not =~ /create_table "test_posts"/
+      standard_dump(ignore_tables: %w(test_posts)).should_not =~ /create_table "test_posts"/
     end
 
     it "should not include ignored table regexes in schema dump" do
       create_test_posts_table
-      standard_dump(:ignore_tables => [ /test_posts/i ]).should_not =~ /create_table "test_posts"/
+      standard_dump(ignore_tables: [ /test_posts/i ]).should_not =~ /create_table "test_posts"/
     end
 
   end
@@ -55,9 +56,9 @@ describe "OracleEnhancedAdapter schema dump" do
   describe "dumping default values" do
     before :each do
       schema_define do
-        create_table "test_defaults", :force => true do |t|
-          t.string "regular", :default => "c"
-          t.string "special_c", :default => "\n"
+        create_table "test_defaults", force: true do |t|
+          t.string "regular", default: "c"
+          t.string "special_c", default: "\n"
         end
       end
     end
@@ -69,7 +70,7 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should be able to dump default values using special characters" do
-      standard_dump.should =~ /t.string \"special_c\", :default => "\\n"/
+      standard_dump.should =~ /t.string \"special_c\", default: "\\n"/
     end
   end
   describe "table prefixes and suffixes" do
@@ -124,8 +125,8 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should include non-default primary key in schema dump" do
-      create_test_posts_table(:primary_key => 'post_id')
-      standard_dump.should =~ /create_table "test_posts", :primary_key => "post_id"/
+      create_test_posts_table(primary_key: 'post_id')
+      standard_dump.should =~ /create_table "test_posts", primary_key: "post_id"/
     end
 
   end
@@ -138,13 +139,13 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should include primary key trigger in schema dump" do
-      create_test_posts_table(:primary_key_trigger => true)
+      create_test_posts_table(primary_key_trigger: true)
       standard_dump.should =~ /create_table "test_posts".*add_primary_key_trigger "test_posts"/m
     end
 
     it "should include primary key trigger with non-default primary key in schema dump" do
-      create_test_posts_table(:primary_key_trigger => true, :primary_key => 'post_id')
-      standard_dump.should =~ /create_table "test_posts", :primary_key => "post_id".*add_primary_key_trigger "test_posts", :primary_key => "post_id"/m
+      create_test_posts_table(primary_key_trigger: true, primary_key: 'post_id')
+      standard_dump.should =~ /create_table "test_posts", primary_key: "post_id".*add_primary_key_trigger "test_posts", primary_key: "post_id"/m
     end
 
   end
@@ -152,11 +153,11 @@ describe "OracleEnhancedAdapter schema dump" do
   describe "foreign key constraints" do
     before(:all) do
       schema_define do
-        create_table :test_posts, :force => true do |t|
+        create_table :test_posts, force: true do |t|
           t.string :title
         end
-        create_table :test_comments, :force => true do |t|
-          t.string :body, :limit => 4000
+        create_table :test_comments, force: true do |t|
+          t.string :body, limit: 4000
           t.references :test_post
         end
       end
@@ -165,7 +166,7 @@ describe "OracleEnhancedAdapter schema dump" do
     after(:each) do
       schema_define do
         remove_foreign_key :test_comments, :test_posts rescue nil
-        remove_foreign_key :test_comments, :name => 'comments_posts_baz_fooz_fk' rescue nil
+        remove_foreign_key :test_comments, name: 'comments_posts_baz_fooz_fk' rescue nil
       end
     end
     after(:all) do
@@ -179,49 +180,49 @@ describe "OracleEnhancedAdapter schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts
       end
-      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", :name => "test_comments_test_post_id_fk"/
+      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", name: "test_comments_test_post_id_fk"/
     end
 
     it "should include foreign key with delete dependency in schema dump" do
       schema_define do
-        add_foreign_key :test_comments, :test_posts, :dependent => :delete
+        add_foreign_key :test_comments, :test_posts, dependent: :delete
       end
-      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", :name => "test_comments_test_post_id_fk", :dependent => :delete/
+      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", name: "test_comments_test_post_id_fk", dependent: :delete/
     end
 
     it "should include foreign key with nullify dependency in schema dump" do
       schema_define do
-        add_foreign_key :test_comments, :test_posts, :dependent => :nullify
+        add_foreign_key :test_comments, :test_posts, dependent: :nullify
       end
-      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", :name => "test_comments_test_post_id_fk", :dependent => :nullify/
+      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", name: "test_comments_test_post_id_fk", dependent: :nullify/
     end
 
     it "should not include foreign keys on ignored table names in schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts
       end
-      standard_dump(:ignore_tables => %w(test_comments)).should_not =~ /add_foreign_key "test_comments"/
+      standard_dump(ignore_tables: %w(test_comments)).should_not =~ /add_foreign_key "test_comments"/
     end
 
     it "should not include foreign keys on ignored table regexes in schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts
       end
-      standard_dump(:ignore_tables => [ /test_comments/i ]).should_not =~ /add_foreign_key "test_comments"/
+      standard_dump(ignore_tables: [ /test_comments/i ]).should_not =~ /add_foreign_key "test_comments"/
     end
 
     it "should include foreign keys referencing ignored table names in schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts
       end
-      standard_dump(:ignore_tables => %w(test_posts)).should =~ /add_foreign_key "test_comments"/
+      standard_dump(ignore_tables: %w(test_posts)).should =~ /add_foreign_key "test_comments"/
     end
 
     it "should include foreign keys referencing ignored table regexes in schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts
       end
-      standard_dump(:ignore_tables => [ /test_posts/i ]).should =~ /add_foreign_key "test_comments"/
+      standard_dump(ignore_tables: [ /test_posts/i ]).should =~ /add_foreign_key "test_comments"/
     end
 
     it "should include composite foreign keys" do
@@ -237,9 +238,9 @@ describe "OracleEnhancedAdapter schema dump" do
         add_column :test_comments, :baz_id, :integer
         add_column :test_comments, :fooz_id, :integer
 
-        add_foreign_key :test_comments, :test_posts, :columns => ["baz_id", "fooz_id"], :name => 'comments_posts_baz_fooz_fk'
+        add_foreign_key :test_comments, :test_posts, columns: ["baz_id", "fooz_id"], name: 'comments_posts_baz_fooz_fk'
       end
-      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", :columns => \["baz_id", "fooz_id"\], :name => "comments_posts_baz_fooz_fk"/
+      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", columns: \["baz_id", "fooz_id"\], name: "comments_posts_baz_fooz_fk"/
     end
     it "should include foreign keys following all tables" do
       # if foreign keys preceed declaration of all tables
@@ -261,37 +262,37 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should include synonym to other schema table in schema dump" do
       schema_define do
-        add_synonym :test_synonym, "schema_name.table_name", :force => true
+        add_synonym :test_synonym, "schema_name.table_name", force: true
       end
-      standard_dump.should =~ /add_synonym "test_synonym", "schema_name.table_name", :force => true/
+      standard_dump.should =~ /add_synonym "test_synonym", "schema_name.table_name", force: true/
     end
 
     it "should include synonym to other database table in schema dump" do
       schema_define do
-        add_synonym :test_synonym, "table_name@link_name", :force => true
+        add_synonym :test_synonym, "table_name@link_name", force: true
       end
-      standard_dump.should =~ /add_synonym "test_synonym", "table_name@link_name(\.[-A-Za-z0-9_]+)*", :force => true/
+      standard_dump.should =~ /add_synonym "test_synonym", "table_name@link_name(\.[-A-Za-z0-9_]+)*", force: true/
     end
 
     it "should not include ignored table names in schema dump" do
       schema_define do
-        add_synonym :test_synonym, "schema_name.table_name", :force => true
+        add_synonym :test_synonym, "schema_name.table_name", force: true
       end
-      standard_dump(:ignore_tables => %w(test_synonym)).should_not =~ /add_synonym "test_synonym"/
+      standard_dump(ignore_tables: %w(test_synonym)).should_not =~ /add_synonym "test_synonym"/
     end
 
     it "should not include ignored table regexes in schema dump" do
       schema_define do
-        add_synonym :test_synonym, "schema_name.table_name", :force => true
+        add_synonym :test_synonym, "schema_name.table_name", force: true
       end
-      standard_dump(:ignore_tables => [ /test_synonym/i ]).should_not =~ /add_synonym "test_synonym"/
+      standard_dump(ignore_tables: [ /test_synonym/i ]).should_not =~ /add_synonym "test_synonym"/
     end
 
     it "should include synonyms to ignored table regexes in schema dump" do
       schema_define do
-        add_synonym :test_synonym, "schema_name.table_name", :force => true
+        add_synonym :test_synonym, "schema_name.table_name", force: true
       end
-      standard_dump(:ignore_tables => [ /table_name/i ]).should =~ /add_synonym "test_synonym"/
+      standard_dump(ignore_tables: [ /table_name/i ]).should =~ /add_synonym "test_synonym"/
     end
 
   end
@@ -302,8 +303,8 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should include temporary options" do
-      create_test_posts_table(:temporary => true)
-      standard_dump.should =~ /create_table "test_posts", :temporary => true/
+      create_test_posts_table(temporary: true)
+      standard_dump.should =~ /create_table "test_posts", temporary: true/
     end
   end
 
@@ -314,20 +315,20 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should not specify default tablespace in add index" do
       create_test_posts_table
-      standard_dump.should =~ /add_index "test_posts", \["title"\], :name => "index_test_posts_on_title"$/
+      standard_dump.should =~ /add_index "test_posts", \["title"\], name: "index_test_posts_on_title"$/
     end
 
     it "should specify non-default tablespace in add index" do
       tablespace_name = @conn.default_tablespace
       @conn.stub!(:default_tablespace).and_return('dummy')
       create_test_posts_table
-      standard_dump.should =~ /add_index "test_posts", \["title"\], :name => "index_test_posts_on_title", :tablespace => "#{tablespace_name}"$/
+      standard_dump.should =~ /add_index "test_posts", \["title"\], name: "index_test_posts_on_title", tablespace: "#{tablespace_name}"$/
     end
 
     it "should create and dump function-based indexes" do
       create_test_posts_table
-      @conn.add_index :test_posts, "NVL(created_at, updated_at)", :name => "index_test_posts_cr_upd_at"
-      standard_dump.should =~ /add_index "test_posts", \["NVL\(\\"CREATED_AT\\",\\"UPDATED_AT\\"\)"\], :name => "index_test_posts_cr_upd_at"$/
+      @conn.add_index :test_posts, "NVL(created_at, updated_at)", name: "index_test_posts_cr_upd_at"
+      standard_dump.should =~ /add_index "test_posts", \["NVL\(\\"CREATED_AT\\",\\"UPDATED_AT\\"\)"\], name: "index_test_posts_cr_upd_at"$/
     end
 
   end
@@ -347,7 +348,7 @@ describe "OracleEnhancedAdapter schema dump" do
 
   describe 'virtual columns' do
     before(:all) do
-      if @oracle11g
+      if @oracle11g_or_higher
         schema_define do
           create_table :test_names, :force => true do |t|
             t.string  :first_name
@@ -366,7 +367,7 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     before(:each) do
-      if @oracle11g
+      if @oracle11g_or_higher
         class ::TestName < ActiveRecord::Base
           if self.respond_to?(:table_name=)
             self.table_name = "test_names"
@@ -378,7 +379,7 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     after(:all) do
-      if @oracle11g
+      if @oracle11g_or_higher
         schema_define do
           drop_table :test_names
         end
@@ -386,12 +387,12 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it 'should dump correctly' do
-      standard_dump.should =~ /t\.virtual "full_name",(\s*):limit => 512,(\s*):as => "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\"",(\s*):type => :string/
-      standard_dump.should =~ /t\.virtual "short_name",(\s*):limit => 300,(\s*):as =>(.*),(\s*):type => :string/
-      standard_dump.should =~ /t\.virtual "full_name_length",(\s*):precision => 38,(\s*):scale => 0,(\s*):as =>(.*),(\s*):type => :integer/
-      standard_dump.should =~ /t\.virtual "name_ratio",(\s*):as =>(.*)\"$/ # no :type
-      standard_dump.should =~ /t\.virtual "abbrev_name",(\s*):limit => 100,(\s*):as =>(.*),(\s*):type => :string/
-      standard_dump.should =~ /t\.virtual "field_with_leading_space",(\s*):limit => 300,(\s*):as => "' '\|\|\\"FIRST_NAME\\"\|\|' '",(\s*):type => :string/
+      standard_dump.should =~ /t\.virtual "full_name",(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\"",(\s*)type: :string/
+      standard_dump.should =~ /t\.virtual "short_name",(\s*)limit: 300,(\s*)as:(.*),(\s*)type: :string/
+      standard_dump.should =~ /t\.virtual "full_name_length",(\s*)precision: 38,(\s*)scale: 0,(\s*)as:(.*),(\s*)type: :integer/
+      standard_dump.should =~ /t\.virtual "name_ratio",(\s*)as:(.*)\"$/ # no :type
+      standard_dump.should =~ /t\.virtual "abbrev_name",(\s*)limit: 100,(\s*)as:(.*),(\s*)type: :string/
+      standard_dump.should =~ /t\.virtual "field_with_leading_space",(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '",(\s*)type: :string/
     end
 
     context 'with column cache' do
@@ -417,14 +418,14 @@ describe "OracleEnhancedAdapter schema dump" do
 
     context "with index on virtual column" do
       before(:all) do
-        if @oracle11g
+        if @oracle11g_or_higher
           schema_define do 
             add_index 'test_names', 'field_with_leading_space', :name => "index_on_virtual_col"
           end
         end
       end
       after(:all) do
-        if @oracle11g
+        if @oracle11g_or_higher
           schema_define do
             remove_index 'test_names', :name => 'index_on_virtual_col'
           end

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -6,7 +6,8 @@ describe "OracleEnhancedAdapter schema definition" do
 
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-    @oracle11g = !! ActiveRecord::Base.connection.select_value("SELECT * FROM v$version WHERE banner LIKE 'Oracle%11g%'")
+    @oracle11g_or_higher = !! !! ActiveRecord::Base.connection.select_value(
+      "select * from product_component_version where product like 'Oracle%' and to_number(substr(version,1,2)) >= 11")
   end
 
   describe "table and sequence creation with non-default primary key" do
@@ -52,6 +53,15 @@ describe "OracleEnhancedAdapter schema definition" do
     end
   end
 
+  describe "default sequence name" do
+
+    it "should return sequence name without truncating too much" do
+      seq_name_length = ActiveRecord::Base.connection.sequence_name_length
+      tname = "#{DATABASE_USER}" + "." +"a"*(seq_name_length - DATABASE_USER.length) + "z"*(DATABASE_USER).length
+      ActiveRecord::Base.connection.default_sequence_name(tname).should match (/z_seq$/)
+    end
+  end
+
   describe "sequence creation parameters" do
 
     def create_test_employees_table(sequence_start_value = nil)
@@ -817,7 +827,6 @@ end
     end
 
     it "should add foreign key in change_table" do
-      return pending("Not in this ActiveRecord version") unless ENV['RAILS_GEM_VERSION'] >= '2.1'
       schema_define do
         create_table :test_comments, :force => true do |t|
           t.string :body, :limit => 4000
@@ -833,7 +842,6 @@ end
     end
 
     it "should add foreign key in change_table references" do
-      return pending("Not in this ActiveRecord version") unless ENV['RAILS_GEM_VERSION'] >= '2.1'
       schema_define do
         create_table :test_comments, :force => true do |t|
           t.string :body, :limit => 4000
@@ -848,7 +856,6 @@ end
     end
 
     it "should remove foreign key by table name" do
-      return pending("Not in this ActiveRecord version") unless ENV['RAILS_GEM_VERSION'] >= '2.1'
       schema_define do
         create_table :test_comments, :force => true do |t|
           t.string :body, :limit => 4000
@@ -1080,7 +1087,7 @@ end
 
   describe 'virtual columns in create_table' do
     before(:each) do
-      pending "Not supported in this database version" unless @oracle11g
+      pending "Not supported in this database version" unless @oracle11g_or_higher
     end
 
     it 'should create virtual column with old syntax' do
@@ -1130,7 +1137,7 @@ end
 
   describe 'virtual columns' do
     before(:each) do
-      pending "Not supported in this database version" unless @oracle11g
+      pending "Not supported in this database version" unless @oracle11g_or_higher
       expr = "( numerator/NULLIF(denominator,0) )*100"
       schema_define do
         create_table :test_fractions, :force => true do |t|
@@ -1150,7 +1157,7 @@ end
     end
 
     after(:each) do
-      if @oracle11g
+      if @oracle11g_or_higher
         schema_define do
           drop_table :test_fractions
         end
@@ -1295,7 +1302,7 @@ end
       it "should use correct tablespace" do
         ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:table] = DATABASE_NON_DEFAULT_TABLESPACE
         @conn.create_table :tablespace_tests do |t|
-          t.integer :id
+          t.string :foo
         end
         @would_execute_sql.should =~ /CREATE +TABLE .* \(.*\) TABLESPACE #{DATABASE_NON_DEFAULT_TABLESPACE}/
       end

data/spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb

@@ -6,7 +6,8 @@ describe "OracleEnhancedAdapter structure dump" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
-    @oracle11g = !! @conn.select_value("SELECT * FROM v$version WHERE banner LIKE 'Oracle%11g%'")
+    @oracle11g_or_higher = !! @conn.select_value(
+      "select * from product_component_version where product like 'Oracle%' and to_number(substr(version,1,2)) >= 11")
   end
   describe "structure dump" do
     before(:each) do
@@ -143,7 +144,7 @@ describe "OracleEnhancedAdapter structure dump" do
     end
   
     it "should dump virtual columns" do
-      pending "Not supported in this database version" unless @oracle11g
+      pending "Not supported in this database version" unless @oracle11g_or_higher
       @conn.execute <<-SQL
         CREATE TABLE bars (
           id          NUMBER(38,0) NOT NULL,
@@ -250,7 +251,7 @@ describe "OracleEnhancedAdapter structure dump" do
   describe "full drop" do
     before(:each) do 
       @conn.create_table :full_drop_test do |t|
-        t.integer :id
+        t.string :foo
       end
       @conn.create_table :full_drop_test_temp, :temporary => true do |t|
         t.string :foo

data/spec/spec_helper.rb

@@ -13,35 +13,21 @@ elsif RUBY_ENGINE == 'jruby'
   puts "==> Running specs with JRuby version #{JRUBY_VERSION}"
 end
 
-ENV['RAILS_GEM_VERSION'] ||= '3.2-master'
-NO_COMPOSITE_PRIMARY_KEYS = true if ENV['RAILS_GEM_VERSION'] >= '2.3.5' || ENV['RAILS_GEM_VERSION'] =~ /^2\.3\.1\d$/
+ENV['RAILS_GEM_VERSION'] ||= '4.0-master'
+NO_COMPOSITE_PRIMARY_KEYS = true
 
 puts "==> Running specs with Rails version #{ENV['RAILS_GEM_VERSION']}"
 
 require 'active_record'
 
-if ENV['RAILS_GEM_VERSION'] >= '3.0'
-  require 'action_dispatch'
-  require 'active_support/core_ext/module/attribute_accessors'
-  require 'active_support/core_ext/class/attribute_accessors'
-
-  if ENV['RAILS_GEM_VERSION'] =~ /^3.0.0.beta/
-    require "rails/log_subscriber"
-    require 'active_record/railties/log_subscriber'
-  else
-    require "active_support/log_subscriber"
-    require 'active_record/log_subscriber'
-  end
+require 'action_dispatch'
+require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/class/attribute_accessors'
 
-  require 'logger'
-elsif ENV['RAILS_GEM_VERSION'] =~ /^2.3/
-  require 'action_pack'
-  require 'action_controller/session/abstract_store'
-  require 'active_record/session_store'
-elsif ENV['RAILS_GEM_VERSION'] <= '2.3'
-  require 'action_pack'
-  require 'action_controller/session/active_record_store'
-end
+require "active_support/log_subscriber"
+require 'active_record/log_subscriber'
+
+require 'logger'
 
 require 'active_record/connection_adapters/oracle_enhanced_adapter'
 require 'ruby-plsql'
@@ -51,30 +37,16 @@ module LoggerSpecHelper
     @logger = MockLogger.new
     @old_logger = ActiveRecord::Base.logger
 
-    if ENV['RAILS_GEM_VERSION'] >= '3.0'
-      @notifier = ActiveSupport::Notifications::Fanout.new
-
-      ActiveSupport::LogSubscriber.colorize_logging = false
+    @notifier = ActiveSupport::Notifications::Fanout.new
 
-      ActiveRecord::Base.logger = @logger
-      @old_notifier = ActiveSupport::Notifications.notifier
-      ActiveSupport::Notifications.notifier = @notifier
+    ActiveSupport::LogSubscriber.colorize_logging = false
 
-      ActiveRecord::LogSubscriber.attach_to(:active_record)
-      if ENV['RAILS_GEM_VERSION'] >= '3.2'
-        ActiveSupport::Notifications.subscribe("sql.active_record", ActiveRecord::ExplainSubscriber.new)
-      end
-    else # ActiveRecord 2.x
-      if ActiveRecord::Base.respond_to?(:connection_pool)
-        ActiveRecord::Base.connection_pool.clear_reloadable_connections!
-      else
-        ActiveRecord::Base.clear_active_connections!
-      end
-      ActiveRecord::Base.logger = @logger
-      ActiveRecord::Base.colorize_logging = false
-      # ActiveRecord::Base.logger.level = Logger::DEBUG
-    end
+    ActiveRecord::Base.logger = @logger
+    @old_notifier = ActiveSupport::Notifications.notifier
+    ActiveSupport::Notifications.notifier = @notifier
 
+    ActiveRecord::LogSubscriber.attach_to(:active_record)
+    ActiveSupport::Notifications.subscribe("sql.active_record", ActiveRecord::ExplainSubscriber.new)
   end
 
   class MockLogger
@@ -115,11 +87,8 @@ module LoggerSpecHelper
     ActiveRecord::Base.logger = @old_logger
     @logger = nil
 
-    if ENV['RAILS_GEM_VERSION'] >= '3.0'
-      ActiveSupport::Notifications.notifier = @old_notifier
-      @notifier = nil
-    end
-
+    ActiveSupport::Notifications.notifier = @old_notifier
+    @notifier = nil
   end
 
   # Wait notifications to be published (for Rails 3.0)
@@ -177,11 +146,13 @@ SYSTEM_CONNECTION_PARAMS = {
 
 DATABASE_NON_DEFAULT_TABLESPACE = ENV['DATABASE_NON_DEFAULT_TABLESPACE'] || "SYSTEM"
 
-# Set default $KCODE to UTF8
-if RUBY_VERSION < "1.9"
-  $KCODE = "UTF8"
-end
-
 # set default time zone in TZ environment variable
 # which will be used to set session time zone
 ENV['TZ'] ||= 'Europe/Riga'
+
+# ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+# Set default_timezone :local explicitly 
+# because this default value has been changed to :utc atrails master branch 
+ActiveRecord::Base.default_timezone = :local
+