activerecord-oracle_enhanced-adapter 1.4.3 → 1.5.0.beta1

data/lib/active_record/connection_adapters/oracle_enhanced_schema_definitions.rb

@@ -13,8 +13,8 @@ module ActiveRecord
     module OracleEnhancedColumnDefinition
        def self.included(base) #:nodoc:
         base.class_eval do
-          alias_method_chain :to_sql, :virtual_columns
-          alias to_s :to_sql
+          #alias_method_chain :to_sql, :virtual_columns
+          #alias to_s :to_sql
         end
        end
 
@@ -60,7 +60,7 @@ module ActiveRecord
       def self.included(base) #:nodoc:
         base.class_eval do
           alias_method_chain :references, :foreign_keys
-          alias_method_chain :to_sql, :foreign_keys
+          #alias_method_chain :to_sql, :foreign_keys
 
           alias_method_chain :column, :virtual_columns
         end
@@ -106,11 +106,15 @@ module ActiveRecord
       # Note: If no name is specified, the database driver creates one for you!
       def references_with_foreign_keys(*args)
         options = args.extract_options!
+        index_options = options[:index]
         fk_options = options.delete(:foreign_key)
 
         if fk_options && !options[:polymorphic]
           fk_options = {} if fk_options == true
-          args.each { |to_table| foreign_key(to_table, fk_options) }
+          args.each do |to_table| 
+            foreign_key(to_table, fk_options) 
+            add_index(to_table, "#{to_table}_id", index_options.is_a?(Hash) ? index_options : nil) if index_options
+          end
         end
 
         references_without_foreign_keys(*(args << options))
@@ -129,7 +133,8 @@ module ActiveRecord
       # ====== Defining the column of the +to_table+.
       #  t.foreign_key(:people, :column => :sender_id, :primary_key => :person_id)
       def foreign_key(to_table, options = {})
-        if @base.respond_to?(:supports_foreign_keys?) && @base.supports_foreign_keys?
+        #TODO
+        if ActiveRecord::Base.connection.supports_foreign_keys?
           to_table = to_table.to_s.pluralize if ActiveRecord::Base.pluralize_table_names
           foreign_keys << ForeignKey.new(@base, to_table, options)
         else
@@ -147,10 +152,9 @@ module ActiveRecord
         columns.select(&:lob?)
       end
     
-      private
-        def foreign_keys
-          @foreign_keys ||= []
-        end
+      def foreign_keys
+        @foreign_keys ||= []
+      end
     end
 
     module OracleEnhancedTable
@@ -208,6 +212,7 @@ module ActiveRecord
       def references_with_foreign_keys(*args)
         options = args.extract_options!
         polymorphic = options[:polymorphic]
+        index_options = options[:index]
         fk_options = options.delete(:foreign_key)
 
         references_without_foreign_keys(*(args << options))
@@ -215,7 +220,10 @@ module ActiveRecord
         args.extract_options!
         if fk_options && !polymorphic
           fk_options = {} if fk_options == true
-          args.each { |to_table| foreign_key(to_table, fk_options) }
+          args.each do |to_table| 
+            foreign_key(to_table, fk_options) 
+            add_index(to_table, "#{to_table}_id", index_options.is_a?(Hash) ? index_options : nil) if index_options
+          end
         end
       end
     end

data/lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb

@@ -51,7 +51,7 @@ module ActiveRecord #:nodoc:
         if @connection.respond_to?(:has_primary_key_trigger?) && @connection.has_primary_key_trigger?(table_name)
           pk, pk_seq = @connection.pk_and_sequence_for(table_name)
           stream.print "  add_primary_key_trigger #{table_name.inspect}"
-          stream.print ", :primary_key => \"#{pk}\"" if pk != 'id'
+          stream.print ", primary_key: \"#{pk}\"" if pk != 'id'
           stream.print "\n\n"
         end
       end
@@ -65,20 +65,20 @@ module ActiveRecord #:nodoc:
             if foreign_key.options[:columns].size == 1
               column = foreign_key.options[:columns].first
               if column != "#{foreign_key.to_table.singularize}_id"
-                statement_parts << (':column => ' + column.inspect)
+                statement_parts << ('column: ' + column.inspect)
               end
               
               if foreign_key.options[:references].first != 'id'
-                statement_parts << (':primary_key => ' + foreign_key.options[:primary_key].inspect)
+                statement_parts << ('primary_key: ' + foreign_key.options[:primary_key].inspect)
               end
             else
-              statement_parts << (':columns => ' + foreign_key.options[:columns].inspect)
+              statement_parts << ('columns: ' + foreign_key.options[:columns].inspect)
             end
 
-            statement_parts << (':name => ' + foreign_key.options[:name].inspect)
+            statement_parts << ('name: ' + foreign_key.options[:name].inspect)
             
             unless foreign_key.options[:dependent].blank?
-              statement_parts << (':dependent => ' + foreign_key.options[:dependent].inspect)
+              statement_parts << ('dependent: ' + foreign_key.options[:dependent].inspect)
             end
 
             '  ' + statement_parts.join(', ')
@@ -97,7 +97,7 @@ module ActiveRecord #:nodoc:
             table_name = syn.table_name
             table_name = "#{syn.table_owner}.#{table_name}" if syn.table_owner
             table_name = "#{table_name}@#{syn.db_link}" if syn.db_link
-            stream.print "  add_synonym #{syn.name.inspect}, #{table_name.inspect}, :force => true"
+            stream.print "  add_synonym #{syn.name.inspect}, #{table_name.inspect}, force: true"
             stream.puts
           end
           stream.puts unless syns.empty?
@@ -118,9 +118,9 @@ module ActiveRecord #:nodoc:
               # use table.inspect as it will remove prefix and suffix
               statement_parts = [ ('add_index ' + table.inspect) ]
               statement_parts << index.columns.inspect
-              statement_parts << (':name => ' + index.name.inspect)
-              statement_parts << ':unique => true' if index.unique
-              statement_parts << ':tablespace => ' + index.tablespace.inspect if index.tablespace
+              statement_parts << ('name: ' + index.name.inspect)
+              statement_parts << 'unique: true' if index.unique
+              statement_parts << 'tablespace: ' + index.tablespace.inspect if index.tablespace
             when 'CTXSYS.CONTEXT'
               if index.statement_parameters
                 statement_parts = [ ('add_context_index ' + table.inspect) ]
@@ -128,7 +128,7 @@ module ActiveRecord #:nodoc:
               else
                 statement_parts = [ ('add_context_index ' + table.inspect) ]
                 statement_parts << index.columns.inspect
-                statement_parts << (':name => ' + index.name.inspect)
+                statement_parts << ('name: ' + index.name.inspect)
               end
             else
               # unrecognized index type
@@ -157,42 +157,30 @@ module ActiveRecord #:nodoc:
           tbl.print "  create_table #{table.inspect}"
           
           # addition to make temporary option work
-          tbl.print ", :temporary => true" if @connection.temporary_table?(table)
+          tbl.print ", temporary: true" if @connection.temporary_table?(table)
           
           if columns.detect { |c| c.name == pk }
             if pk != 'id'
-              tbl.print %Q(, :primary_key => "#{pk}")
+              tbl.print %Q(, primary_key: "#{pk}")
             end
           else
-            tbl.print ", :id => false"
+            tbl.print ", id: false"
           end
-          tbl.print ", :force => true"
+          tbl.print ", force: true"
           tbl.puts " do |t|"
 
           # then dump all non-primary key columns
           column_specs = columns.map do |column|
             raise StandardError, "Unknown type '#{column.sql_type}' for column '#{column.name}'" if @types[column.type].nil?
             next if column.name == pk
-            spec = {}
-            spec[:name]      = column.name.inspect
-            spec[:type]      = column.virtual? ? 'virtual' : column.type.to_s
-            spec[:type]      = column.virtual? ? 'virtual' : column.type.to_s
-            spec[:virtual_type] = column.type.inspect if column.virtual? && column.sql_type != 'NUMBER'
-            spec[:limit]     = column.limit.inspect if column.limit != @types[column.type][:limit] && column.type != :decimal
-            spec[:precision] = column.precision.inspect if !column.precision.nil?
-            spec[:scale]     = column.scale.inspect if !column.scale.nil?
-            spec[:null]      = 'false' if !column.null
-            spec[:as]        = column.virtual_column_data_default if column.virtual?
-            spec[:default]   = default_string(column.default) if column.has_default? && !column.virtual?
-            (spec.keys - [:name, :type]).each do |k|
-              key_s = (k == :virtual_type ? ":type => " : "#{k.inspect} => ")
-              spec[k] = key_s + spec[k]
-            end
-            spec
+            @connection.column_spec(column, @types)
           end.compact
 
           # find all migration keys used in this table
-          keys = [:name, :limit, :precision, :scale, :default, :null, :as, :virtual_type] & column_specs.map(&:keys).flatten
+          # 
+          # TODO `& column_specs.map(&:keys).flatten` should be executed 
+          # in migration_keys_with_oracle_enhanced
+          keys = @connection.migration_keys & column_specs.map(&:keys).flatten
 
           # figure out the lengths for each column based on above keys
           lengths = keys.map{ |key| column_specs.map{ |spec| spec[key] ? spec[key].length + 2 : 0 }.max }

data/lib/active_record/connection_adapters/oracle_enhanced_schema_statements.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'digest/sha1'
 
 module ActiveRecord
@@ -38,11 +39,12 @@ module ActiveRecord
       #     t.string      :last_name, :comment => “Surname”
       #   end
 
-      def create_table(name, options = {}, &block)
+      def create_table(name, options = {})
         create_sequence = options[:id] != false
         column_comments = {}
-
-        table_definition = TableDefinition.new(self)
+        temporary = options.delete(:temporary)
+        additional_options = options
+        table_definition = create_table_definition name, temporary, additional_options
         table_definition.primary_key(options[:primary_key] || Base.get_primary_key(name.to_s.singularize)) unless options[:id] == false
 
         # store that primary key was defined in create_table block
@@ -68,7 +70,7 @@ module ActiveRecord
           end
         end
 
-        result = block.call(table_definition) if block
+        yield table_definition if block_given? 
         create_sequence = create_sequence || table_definition.create_sequence
         column_comments = table_definition.column_comments if table_definition.column_comments
         tablespace = tablespace_for(:table, options[:tablespace])
@@ -77,16 +79,7 @@ module ActiveRecord
           drop_table(name, options)
         end
 
-        create_sql = "CREATE#{' GLOBAL TEMPORARY' if options[:temporary]} TABLE "
-        create_sql << quote_table_name(name)
-        create_sql << " (#{table_definition.to_sql})"
-        unless options[:temporary]
-          create_sql << " ORGANIZATION #{options[:organization]}" if options[:organization]
-          create_sql << tablespace
-          table_definition.lob_columns.each{|cd| create_sql << tablespace_for(cd.sql_type.downcase.to_sym, nil, name, cd.name)}
-        end
-        create_sql << " #{options[:options]}"
-        execute create_sql
+        execute schema_creation.accept table_definition
 
         create_sequence_and_trigger(name, options) if create_sequence
 
@@ -94,18 +87,30 @@ module ActiveRecord
         column_comments.each do |column_name, comment|
           add_comment name, column_name, comment
         end
+        table_definition.indexes.each_pair { |c,o| add_index name, c, o }
+
+        unless table_definition.foreign_keys.nil?
+          table_definition.foreign_keys.each do |foreign_key|
+            add_foreign_key(table_definition.name, foreign_key.to_table, foreign_key.options)
+          end
+        end
+      end
 
+      def create_table_definition(name, temporary, options)
+        TableDefinition.new native_database_types, name, temporary, options
       end
 
-      def rename_table(name, new_name) #:nodoc:
+      def rename_table(table_name, new_name) #:nodoc:
         if new_name.to_s.length > table_name_length
           raise ArgumentError, "New table name '#{new_name}' is too long; the limit is #{table_name_length} characters"
         end
         if "#{new_name}_seq".to_s.length > sequence_name_length
           raise ArgumentError, "New sequence name '#{new_name}_seq' is too long; the limit is #{sequence_name_length} characters"
         end
-        execute "RENAME #{quote_table_name(name)} TO #{quote_table_name(new_name)}"
-        execute "RENAME #{quote_table_name("#{name}_seq")} TO #{quote_table_name("#{new_name}_seq")}" rescue nil
+        execute "RENAME #{quote_table_name(table_name)} TO #{quote_table_name(new_name)}"
+        execute "RENAME #{quote_table_name("#{table_name}_seq")} TO #{quote_table_name("#{new_name}_seq")}" rescue nil
+
+        rename_table_indexes(table_name, new_name)
       end
 
       def drop_table(name, options = {}) #:nodoc:
@@ -114,6 +119,7 @@ module ActiveRecord
         execute "DROP SEQUENCE #{quote_table_name(seq_name)}" rescue nil
       ensure
         clear_table_columns_cache(name)
+        self.all_schema_indexes = nil
       end
 
       def initialize_schema_migrations_table
@@ -148,25 +154,39 @@ module ActiveRecord
       # clear cached indexes when adding new index
       def add_index(table_name, column_name, options = {}) #:nodoc:
         column_names = Array(column_name)
-        index_name   = index_name(table_name, :column => column_names)
+        index_name   = index_name(table_name, column: column_names)
 
         if Hash === options # legacy support, since this param was a string
+          options.assert_valid_keys(:unique, :order, :name, :where, :length, :internal, :tablespace, :options, :using)
+
           index_type = options[:unique] ? "UNIQUE" : ""
           index_name = options[:name].to_s if options.key?(:name)
           tablespace = tablespace_for(:index, options[:tablespace])
+          max_index_length = options.fetch(:internal, false) ? index_name_length : allowed_index_name_length
+          additional_options = options[:options]
         else
+          if options
+            message = "Passing a string as third argument of `add_index` is deprecated and will" +
+              " be removed in Rails 4.1." +
+              " Use add_index(#{table_name.inspect}, #{column_name.inspect}, unique: true) instead"
+
+            ActiveSupport::Deprecation.warn message
+          end
+
           index_type = options
+          additional_options = nil
+          max_index_length = allowed_index_name_length
         end
 
-        if index_name.to_s.length > index_name_length
-          raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' is too long; the limit is #{index_name_length} characters"
+        if index_name.to_s.length > max_index_length
+          raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' is too long; the limit is #{max_index_length} characters"
         end
         if index_name_exists?(table_name, index_name, false)
           raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' already exists"
         end
         quoted_column_names = column_names.map { |e| quote_column_name_or_expression(e) }.join(", ")
 
-        execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} (#{quoted_column_names})#{tablespace} #{options[:options]}"
+        execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} (#{quoted_column_names})#{tablespace} #{additional_options}"
       ensure
         self.all_schema_indexes = nil
       end
@@ -176,6 +196,14 @@ module ActiveRecord
       def remove_index(table_name, options = {}) #:nodoc:
         index_name = index_name(table_name, options)
         unless index_name_exists?(table_name, index_name, true)
+          # sometimes options can be String or Array with column names
+          options = {} unless options.is_a?(Hash)
+          if options.has_key? :name
+            options_without_column = options.dup
+            options_without_column.delete :column
+            index_name_without_column = index_name(table_name, options_without_column)
+            return index_name_without_column if index_name_exists?(table_name, index_name_without_column, false)
+          end
           raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' does not exist"
         end
         remove_index!(table_name, index_name)
@@ -295,27 +323,18 @@ module ActiveRecord
 
       def rename_column(table_name, column_name, new_column_name) #:nodoc:
         execute "ALTER TABLE #{quote_table_name(table_name)} RENAME COLUMN #{quote_column_name(column_name)} to #{quote_column_name(new_column_name)}"
+        self.all_schema_indexes = nil
+        rename_column_indexes(table_name, column_name, new_column_name)
       ensure
         clear_table_columns_cache(table_name)
       end
 
       def remove_column(table_name, *column_names) #:nodoc:
-        raise ArgumentError.new("You must specify at least one column name.  Example: remove_column(:people, :first_name)") if column_names.empty?
-
-        major, minor = ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR
-        is_deprecated = (major == 3 and minor >= 2) or major > 3
-
-        if column_names.flatten! and is_deprecated
-          message = 'Passing array to remove_columns is deprecated, please use ' +
-            'multiple arguments, like: `remove_columns(:posts, :foo, :bar)`'
-          ActiveSupport::Deprecation.warn message, caller
-        end
-
-        column_names.each do |column_name|
-          execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)}"
-        end
+        raise ArgumentError.new("You must specify at least one column name. Example: remove_column(:people, :first_name)") if column_names.empty?
+        column_names.each {|column_name| execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)}"}
       ensure
         clear_table_columns_cache(table_name)
+        self.all_schema_indexes = nil
       end
 
       def add_comment(table_name, column_name, comment) #:nodoc:

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -41,76 +41,6 @@ describe "OracleEnhancedAdapter" do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
   end
   
-  describe "database session store" do
-    before(:all) do
-      @conn.execute "DROP TABLE sessions" rescue nil
-      @conn.execute "DROP SEQUENCE sessions_seq" rescue nil
-      @conn = ActiveRecord::Base.connection
-      @conn.execute <<-SQL
-        CREATE TABLE sessions (
-          id          NUMBER(38,0) NOT NULL,
-          session_id  VARCHAR2(255) DEFAULT NULL,
-          data        CLOB DEFAULT NULL,
-          created_at  DATE DEFAULT NULL,
-          updated_at  DATE DEFAULT NULL,
-          PRIMARY KEY (ID)
-        )
-      SQL
-      @conn.execute <<-SQL
-        CREATE SEQUENCE sessions_seq  MINVALUE 1 MAXVALUE 999999999999999999999999999
-          INCREMENT BY 1 START WITH 10040 CACHE 20 NOORDER NOCYCLE
-      SQL
-      if ENV['RAILS_GEM_VERSION'] >= '2.3'
-        @session_class = ActiveRecord::SessionStore::Session
-      else
-        @session_class = CGI::Session::ActiveRecordStore::Session
-      end
-    end
-
-    after(:all) do
-      @conn.execute "DROP TABLE sessions"
-      @conn.execute "DROP SEQUENCE sessions_seq"
-    end
-
-    it "should create sessions table" do
-      ActiveRecord::Base.connection.tables.grep("sessions").should_not be_empty
-    end
-
-    it "should save session data" do
-      @session = @session_class.new :session_id => "111111", :data  => "something" #, :updated_at => Time.now
-      @session.save!
-      @session = @session_class.find_by_session_id("111111")
-      @session.data.should == "something"
-    end
-
-    it "should change session data when partial updates enabled" do
-      return pending("Not in this ActiveRecord version") unless @session_class.respond_to?(:partial_updates=)
-      @session_class.partial_updates = true
-      @session = @session_class.new :session_id => "222222", :data  => "something" #, :updated_at => Time.now
-      @session.save!
-      @session = @session_class.find_by_session_id("222222")
-      @session.data = "other thing"
-      @session.save!
-      # second save should call again blob writing callback
-      @session.save!
-      @session = @session_class.find_by_session_id("222222")
-      @session.data.should == "other thing"
-    end
-
-    it "should have one enhanced_write_lobs callback" do
-      return pending("Not in this ActiveRecord version") unless @session_class.respond_to?(:after_save_callback_chain)
-      @session_class.after_save_callback_chain.select{|cb| cb.method == :enhanced_write_lobs}.should have(1).record
-    end
-
-    it "should not set sessions table session_id column type as integer if emulate_integers_by_column_name is true" do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
-      columns = @conn.columns('sessions')
-      column = columns.detect{|c| c.name == "session_id"}
-      column.type.should == :string
-    end
-
-  end
-
   describe "ignore specified table columns" do
     before(:all) do
       @conn = ActiveRecord::Base.connection
@@ -186,13 +116,14 @@ describe "OracleEnhancedAdapter" do
     before(:all) do
       @conn = ActiveRecord::Base.connection
       @conn.execute "DROP TABLE test_employees" rescue nil
-      @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")
       @conn.execute <<-SQL
         CREATE TABLE test_employees (
           id            NUMBER PRIMARY KEY,
           first_name    VARCHAR2(20),
           last_name     VARCHAR2(25),
-          #{ @oracle11g ? "full_name AS (first_name || ' ' || last_name)," : "full_name VARCHAR2(46),"}
+          #{ @oracle11g_or_higher ? "full_name AS (first_name || ' ' || last_name)," : "full_name VARCHAR2(46),"}
           hire_date     DATE
         )
       SQL
@@ -244,7 +175,7 @@ describe "OracleEnhancedAdapter" do
       end
 
       it 'should identify virtual columns as such' do
-        pending "Not supported in this database version" unless @oracle11g
+        pending "Not supported in this database version" unless @oracle11g_or_higher
         te = TestEmployee.connection.columns('test_employees').detect(&:virtual?)
         te.name.should == 'full_name'
       end
@@ -682,7 +613,7 @@ describe "OracleEnhancedAdapter" do
     end
 
     it "should load included association with more than 1000 records" do
-      posts = TestPost.includes(:test_comments).all
+      posts = TestPost.includes(:test_comments).to_a
       posts.size.should == @ids.size
     end