activerecord-oracle_enhanced-adapter 1.2.4 → 1.3.0

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -8,9 +8,9 @@ describe "OracleEnhancedAdapter schema dump" do
     @conn = ActiveRecord::Base.connection
   end
 
-  def standard_dump
+  def standard_dump(options = {})
     stream = StringIO.new
-    ActiveRecord::SchemaDumper.ignore_tables = []
+    ActiveRecord::SchemaDumper.ignore_tables = options[:ignore_tables]||[]
     ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
     stream.string
   end
@@ -20,6 +20,7 @@ describe "OracleEnhancedAdapter schema dump" do
     schema_define do
       create_table :test_posts, options do |t|
         t.string :title
+        t.timestamps
       end
       add_index :test_posts, :title
     end
@@ -32,7 +33,44 @@ describe "OracleEnhancedAdapter schema dump" do
   rescue
     nil
   end
+  
+  describe "tables" do
+    after(:each) do
+      drop_test_posts_table
+    end
+
+    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"/
+    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"/
+    end
 
+  end
+
+  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"
+        end
+      end
+    end
+
+    after(:each) do
+      schema_define do
+        drop_table "test_defaults"
+      end
+    end
+
+    it "should be able to dump default values using special characters" do
+      standard_dump.should =~ /t.string \"special_c\", :default => "\\n"/
+    end
+  end
   describe "table prefixes and suffixes" do
     after(:each) do
       drop_test_posts_table
@@ -144,6 +182,34 @@ describe "OracleEnhancedAdapter schema dump" do
       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"/
+    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"/
+    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"/
+    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"/
+    end
+
   end
 
   describe "synonyms" do
@@ -164,7 +230,28 @@ describe "OracleEnhancedAdapter schema dump" do
       schema_define do
         add_synonym :test_synonym, "table_name@link_name", :force => true
       end
-      standard_dump.should =~ /add_synonym "test_synonym", "table_name@link_name", :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
+      end
+      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
+      end
+      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
+      end
+      standard_dump(:ignore_tables => [ /table_name/i ]).should =~ /add_synonym "test_synonym"/
     end
 
   end
@@ -187,17 +274,36 @@ 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 not specify default tablespace in add index" do
+    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"$/
     end
 
   end
 
+  describe "materialized views" do
+    after(:each) do
+      @conn.execute "DROP MATERIALIZED VIEW test_posts_mv" rescue nil
+      drop_test_posts_table
+    end
+
+    it "should not include materialized views in schema dump" do
+      create_test_posts_table
+      @conn.execute "CREATE MATERIALIZED VIEW test_posts_mv AS SELECT * FROM test_posts"
+      standard_dump.should_not =~ /create_table "test_posts_mv"/
+    end
+  end
+
 end
 

data/spec/active_record/connection_adapters/oracle_enhanced_schema_spec.rb

@@ -667,7 +667,7 @@ describe "OracleEnhancedAdapter schema definition" do
       @db_link_password = CONNECTION_PARAMS[:password]
       @db_link_database = CONNECTION_PARAMS[:database]
       @conn.execute "DROP DATABASE LINK #{@db_link}" rescue nil
-      @conn.execute "CREATE DATABASE LINK #{@db_link} CONNECT TO #{@db_link_username} IDENTIFIED BY #{@db_link_password} USING '#{@db_link_database}'"
+      @conn.execute "CREATE DATABASE LINK #{@db_link} CONNECT TO #{@db_link_username} IDENTIFIED BY \"#{@db_link_password}\" USING '#{@db_link_database}'"
       schema_define do
         create_table :test_posts, :force => true do |t|
           t.string :title
@@ -781,4 +781,52 @@ describe "OracleEnhancedAdapter schema definition" do
 
   end
 
+  describe "miscellaneous options" do
+    before(:each) do
+      @conn.instance_variable_set :@would_execute_sql, @would_execute_sql=''
+      class <<@conn
+        def execute(sql,name=nil); @would_execute_sql << sql << ";\n"; end
+        def index_exists?(table_name, index_name, default); default; end
+      end
+    end
+
+    after(:each) do
+      class <<@conn
+        remove_method :execute
+      end
+      @conn.instance_eval{ remove_instance_variable :@would_execute_sql }
+    end
+    
+    it "should support the :options option to create_table" do
+      schema_define do
+        create_table :test_posts, :options=>'NOLOGGING', :force => true do |t|
+          t.string :title, :null => false
+        end
+      end
+      @would_execute_sql.should =~ /CREATE +TABLE .* \(.*\) NOLOGGING/
+    end
+    
+    it "should support the :tablespace option to create_table" do
+      schema_define do
+        create_table :test_posts, :tablespace=>'bogus', :force => true do |t|
+          t.string :title, :null => false
+        end
+      end
+      @would_execute_sql.should =~ /CREATE +TABLE .* \(.*\) TABLESPACE bogus/
+    end
+    
+    it "should support the :options option to add_index" do
+      schema_define do
+        add_index :keyboards, :name, :options=>'NOLOGGING'
+      end
+      @would_execute_sql.should =~ /CREATE +INDEX .* ON .* \(.*\) NOLOGGING/
+    end
+    
+    it "should support the :tablespace option to add_index" do
+      schema_define do
+        add_index :keyboards, :name, :tablespace=>'bogus'
+      end
+      @would_execute_sql.should =~ /CREATE +INDEX .* ON .* \(.*\) TABLESPACE bogus/
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -24,30 +24,46 @@ elsif ENV['RAILS_GEM_VERSION'] =~ /^2.3.3/
   gem 'actionpack', '=2.3.3'
   gem 'activesupport', '=2.3.3'
   gem 'composite_primary_keys', '=2.3.2'
-else
-  ENV['RAILS_GEM_VERSION'] ||= '2.3.5'
+elsif ENV['RAILS_GEM_VERSION'] =~ /^2.3.5/
   gem 'activerecord', '=2.3.5'
   gem 'actionpack', '=2.3.5'
   gem 'activesupport', '=2.3.5'
   NO_COMPOSITE_PRIMARY_KEYS = true
+elsif ENV['RAILS_GEM_VERSION'] =~ /^2.3/
+  gem 'activerecord', '=2.3.8'
+  gem 'actionpack', '=2.3.8'
+  gem 'activesupport', '=2.3.8'
+  NO_COMPOSITE_PRIMARY_KEYS = true
+else
+  # uses local copy of Rails 3 gems
+  ['rails/activerecord', 'rails/activemodel', 'rails/activesupport', 'arel', 'rails/actionpack', 'rails/railties'].each do |library|
+    $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../' + library + '/lib'))
+  end
+  ENV['RAILS_GEM_VERSION'] ||= '3.0'
+  NO_COMPOSITE_PRIMARY_KEYS = true
 end
 
 require 'active_record'
-require 'action_pack'
-if ENV['RAILS_GEM_VERSION'] >= '2.3'
+
+if ENV['RAILS_GEM_VERSION'] >= '3.0'
+  require 'action_dispatch'
+  require 'active_support/core_ext/module/attribute_accessors'
+  require "rails/log_subscriber"
+  require 'active_record/railties/log_subscriber'
+  require 'logger'
+elsif ENV['RAILS_GEM_VERSION'] =~ /^2.3/
+  require 'action_pack'
   require 'action_controller/session/abstract_store'
   require 'active_record/session_store'
-else
+elsif ENV['RAILS_GEM_VERSION'] <= '2.3'
+  require 'action_pack'
   require 'action_controller/session/active_record_store'
 end
-if !defined?(RUBY_ENGINE)
-  gem 'ruby-oci8', '=2.0.3'
-  require 'oci8'
-elsif RUBY_ENGINE == 'ruby'
-  gem 'ruby-oci8', '=2.0.3'
+if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
+  gem 'ruby-oci8', '>=2.0.4'
   require 'oci8'
 elsif RUBY_ENGINE == 'jruby'
-  gem "activerecord-jdbc-adapter"
+  gem 'activerecord-jdbc-adapter'
   require 'active_record/connection_adapters/jdbc_adapter'
 end
 
@@ -55,16 +71,78 @@ require 'active_record/connection_adapters/oracle_enhanced_adapter'
 require 'ruby-plsql'
 
 module LoggerSpecHelper
-  def log_to(stream)
-    ActiveRecord::Base.logger = Logger.new(stream)
-    if ActiveRecord::Base.respond_to?(:connection_pool)
-      ActiveRecord::Base.connection_pool.clear_reloadable_connections!
-    else
-      ActiveRecord::Base.clear_active_connections!
+  def set_logger
+    @logger = MockLogger.new
+
+    if ENV['RAILS_GEM_VERSION'] >= '3.0'
+      queue = ActiveSupport::Notifications::Fanout.new
+      @notifier = ActiveSupport::Notifications::Notifier.new(queue)
+
+      Rails::LogSubscriber.colorize_logging = false
+
+      ActiveRecord::Base.logger = @logger
+      ActiveSupport::Notifications.notifier = @notifier
+
+      Rails::LogSubscriber.add(:active_record, ActiveRecord::Railties::LogSubscriber.new)
+
+    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
+
+  end
+
+  class MockLogger
+    attr_reader :flush_count
+
+    def initialize
+      @flush_count = 0
+      @logged = Hash.new { |h,k| h[k] = [] }
+    end
+
+    # used in AtiveRecord 2.x
+    def debug?
+      true
+    end
+
+    def method_missing(level, message)
+      @logged[level] << message
+    end
+
+    def logged(level)
+      @logged[level].compact.map { |l| l.to_s.strip }
+    end
+
+    def output(level)
+      logged(level).join("\n")
+    end
+
+    def flush
+      @flush_count += 1
+    end
+
+    def clear(level)
+      @logged[level] = []
     end
-    ActiveRecord::Base.colorize_logging = false
-    ActiveRecord::Base.logger.level = Logger::DEBUG
   end
+
+  def clear_logger
+    ActiveRecord::Base.logger = @logger = nil
+    ActiveSupport::Notifications.notifier = @notifier = nil if @notifier
+  end
+
+  # Wait notifications to be published (for Rails 3.0)
+  # should not be currently used with sync queues in tests
+  def wait
+    @notifier.wait if @notifier
+  end
+
 end
 
 module SchemaSpecHelper

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  hash: 27
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -9,29 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 +02:00
+date: 2010-06-21 00:00:00 +03:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.0
-    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id001
 description: |
   Oracle "enhanced" ActiveRecord adapter contains useful additional methods for working with new and legacy Oracle databases.
   This adapter is superset of original ActiveRecord Oracle adapter.
@@ -47,21 +49,22 @@ files:
 - .gitignore
 - History.txt
 - License.txt
-- Manifest.txt
 - README.rdoc
 - Rakefile
 - VERSION
+- activerecord-oracle_enhanced-adapter.gemspec
 - lib/active_record/connection_adapters/emulation/oracle_adapter.rb
 - lib/active_record/connection_adapters/oracle_enhanced.rake
+- lib/active_record/connection_adapters/oracle_enhanced_activerecord_patches.rb
 - lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
 - lib/active_record/connection_adapters/oracle_enhanced_connection.rb
+- lib/active_record/connection_adapters/oracle_enhanced_context_index.rb
 - lib/active_record/connection_adapters/oracle_enhanced_core_ext.rb
 - lib/active_record/connection_adapters/oracle_enhanced_cpk.rb
 - lib/active_record/connection_adapters/oracle_enhanced_dirty.rb
 - lib/active_record/connection_adapters/oracle_enhanced_jdbc_connection.rb
 - lib/active_record/connection_adapters/oracle_enhanced_oci_connection.rb
 - lib/active_record/connection_adapters/oracle_enhanced_procedures.rb
-- lib/active_record/connection_adapters/oracle_enhanced_reserved_words.rb
 - lib/active_record/connection_adapters/oracle_enhanced_schema_definitions.rb
 - lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb
 - lib/active_record/connection_adapters/oracle_enhanced_schema_statements_ext.rb
@@ -70,6 +73,7 @@ files:
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_structure_dumper_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb
@@ -91,21 +95,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Oracle enhanced adapter for ActiveRecord
@@ -113,6 +123,7 @@ test_files:
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_structure_dumper_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb