activerecord-oracle_enhanced-adapter 1.4.2.rc1 → 1.4.2.rc2

data/History.md

@@ -1,3 +1,16 @@
+### 1.4.2.rc2 / 2013-03-01
+
+* Bug fixes:
+  * Do not consider the numeric attribute as changed if the old value is zero and the new value is not a string [#247]
+  * Removed table_name_prefix and table_name_suffix when schema dumper executed [#248]
+  * Remove_column should raise an ArgumentError when no columns are passed [#246]
+  * Don't dump type for NUMBER virtual columns [#256]
+  * Address :returning_id column should be of type Column [#274]
+  * Migrated versions should be dumped in order [#277]
+  * Always write serialized LOB columns [#275]
+  * Truncate the schema_migrations index [#276]
+  * Split paths on windows machines in the right way [#231]
+
 ### 1.4.2.rc1 / 2012-11-13
 
 * Enhancements:

data/README.md

@@ -113,6 +113,8 @@ If you deploy JRuby on Rails application in Java application server that support
       adapter: oracle_enhanced
       jndi: "jdbc/jndi_connection_name"
 
+To use jndi with Tomcat you need to set the accessToUnderlyingConnectionAllowed to true property on the pool. See  the [Tomcat Documentation](http://tomcat.apache.org/tomcat-7.0-doc/jndi-resources-howto.html) for reference.
+
 You can find other available database.yml connection parameters in [oracle_enhanced_adapter.rb](/rsim/oracle-enhanced/blob/master/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb). There are many NLS settings as well as some other Oracle session settings.
 
 ### Adapter settings
@@ -257,7 +259,7 @@ And you can even create index on multiple tables by providing SELECT statements
     Post.contains(:all_text, "aaa within title")
     Post.contains(:all_text, "bbb within comment_author")
 
-### Oracle virtual collumns support
+### Oracle virtual columns support
 
 Since version R11G1 Oracle database allows adding computed [Virtual Columns](http://www.oracle-base.com/articles/11g/virtual-columns-11gr1.php) to the table.
 They can be used as normal fields in the queries, in the foreign key contstraints and to partitioning data.

data/VERSION

@@ -1 +1 @@
-1.4.2.rc1
+1.4.2.rc2

data/activerecord-oracle_enhanced-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.4.2.rc1"
+  s.version = "1.4.2.rc2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Raimonds Simanovskis}]
-  s.date = %q{2012-11-13}
+  s.date = %q{2013-03-01}
   s.description = %q{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.
 }

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -46,7 +46,7 @@ module ActiveRecord
     # Oracle enhanced adapter will work with both
     # Ruby 1.8/1.9 ruby-oci8 gem (which provides interface to Oracle OCI client)
     # or with JRuby and Oracle JDBC driver.
-    # 
+    #
     # It should work with Oracle 9i, 10g and 11g databases.
     # Limited set of functionality should work on Oracle 8i as well but several features
     # rely on newer functionality in Oracle database.
@@ -71,9 +71,9 @@ module ActiveRecord
     # * <tt>:username</tt>
     # * <tt>:password</tt>
     # * <tt>:database</tt> - either TNS alias or connection string for OCI client or database name in JDBC connection string
-    # 
+    #
     # Optional parameters:
-    # 
+    #
     # * <tt>:host</tt> - host name for JDBC connection, defaults to "localhost"
     # * <tt>:port</tt> - port number for JDBC connection, defaults to 1521
     # * <tt>:privilege</tt> - set "SYSDBA" if you want to connect with this privilege
@@ -82,11 +82,10 @@ module ActiveRecord
     # * <tt>:cursor_sharing</tt> - cursor sharing mode to minimize amount of unique statements, defaults to "force"
     # * <tt>:time_zone</tt> - database session time zone
     #   (it is recommended to set it using ENV['TZ'] which will be then also used for database session time zone)
-    # 
+    #
     # Optionals NLS parameters:
-    # 
+    #
     # * <tt>:nls_calendar</tt>
-    # * <tt>:nls_characterset</tt>
     # * <tt>:nls_comp</tt>
     # * <tt>:nls_currency</tt>
     # * <tt>:nls_date_format</tt> - format for :date columns, defaults to <tt>YYYY-MM-DD HH24:MI:SS</tt>
@@ -96,7 +95,6 @@ module ActiveRecord
     # * <tt>:nls_language</tt>
     # * <tt>:nls_length_semantics</tt> - semantics of size of VARCHAR2 and CHAR columns, defaults to <tt>CHAR</tt>
     #   (meaning that size specifies number of characters and not bytes)
-    # * <tt>:nls_nchar_characterset</tt>
     # * <tt>:nls_nchar_conv_excp</tt>
     # * <tt>:nls_numeric_characters</tt>
     # * <tt>:nls_sort</tt>
@@ -105,7 +103,7 @@ module ActiveRecord
     # * <tt>:nls_timestamp_tz_format</tt>
     # * <tt>:nls_time_format</tt>
     # * <tt>:nls_time_tz_format</tt>
-    # 
+    #
     class OracleEnhancedAdapter < AbstractAdapter
 
       ##
@@ -126,12 +124,12 @@ module ActiveRecord
       # to Date then you can add the following line to your initializer file:
       #
       #   ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates = true
-      # 
+      #
       # As this option can have side effects when unnecessary typecasting is done it is recommended
       # that Date columns are explicily defined with +set_date_columns+ method.
       cattr_accessor :emulate_dates
       self.emulate_dates = false
-      
+
        ##
         # :singleton-method:
         # OracleEnhancedAdapter will use the default tablespace, but if you want specific types of
@@ -139,7 +137,7 @@ module ActiveRecord
         #
         #   ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces =
         #  {:clob => 'TS_LOB', :blob => 'TS_LOB', :index => 'TS_INDEX', :table => 'TS_DATA'}
-        # 
+        #
         # Using the :tablespace option where available (e.g create_table) will take precedence
         # over these settings.
       cattr_accessor :default_tablespaces
@@ -153,7 +151,7 @@ module ActiveRecord
       # to Date then you can add the following line to your initializer file:
       #
       #   ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
-      # 
+      #
       # As this option can have side effects when unnecessary typecasting is done it is recommended
       # that Date columns are explicily defined with +set_date_columns+ method.
       cattr_accessor :emulate_dates_by_column_name
@@ -212,7 +210,7 @@ module ActiveRecord
         return true if ["CHAR(1)","VARCHAR2(1)"].include?(field_type)
         field_type =~ /^VARCHAR2/ && (name =~ /_flag$/i || name =~ /_yn$/i)
       end
-      
+
       # How boolean value should be quoted to String.
       # Used if +emulate_booleans_from_strings+ option is set to +true+.
       def self.boolean_to_string(bool)
@@ -222,15 +220,15 @@ module ActiveRecord
       ##
       # :singleton-method:
       # Specify non-default date format that should be used when assigning string values to :date columns, e.g.:
-      # 
+      #
       #   ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.string_to_date_format = “%d.%m.%Y”
       cattr_accessor :string_to_date_format
       self.string_to_date_format = nil
-      
+
       ##
       # :singleton-method:
       # Specify non-default time format that should be used when assigning string values to :datetime columns, e.g.:
-      # 
+      #
       #   ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.string_to_time_format = “%d.%m.%Y %H:%M:%S”
       cattr_accessor :string_to_time_format
       self.string_to_time_format = nil
@@ -279,7 +277,7 @@ module ActiveRecord
       end
 
       ADAPTER_NAME = 'OracleEnhanced'.freeze
-      
+
       def adapter_name #:nodoc:
         ADAPTER_NAME
       end
@@ -299,7 +297,6 @@ module ActiveRecord
       #:stopdoc:
       DEFAULT_NLS_PARAMETERS = {
         :nls_calendar            => nil,
-        :nls_characterset        => nil,
         :nls_comp                => nil,
         :nls_currency            => nil,
         :nls_date_format         => 'YYYY-MM-DD HH24:MI:SS',
@@ -308,7 +305,6 @@ module ActiveRecord
         :nls_iso_currency        => nil,
         :nls_language            => nil,
         :nls_length_semantics    => 'CHAR',
-        :nls_nchar_characterset  => nil,
         :nls_nchar_conv_excp     => nil,
         :nls_numeric_characters  => nil,
         :nls_sort                => nil,
@@ -418,12 +414,12 @@ module ActiveRecord
       # Names must be from 1 to 30 bytes long with these exceptions:
       # * Names of databases are limited to 8 bytes.
       # * Names of database links can be as long as 128 bytes.
-      #  
+      #
       # Nonquoted identifiers cannot be Oracle Database reserved words
-      #  
+      #
       # Nonquoted identifiers must begin with an alphabetic character from
       # your database character set
-      #  
+      #
       # Nonquoted identifiers can contain only alphanumeric characters from
       # your database character set and the underscore (_), dollar sign ($),
       # and pound sign (#). Database links can also contain periods (.) and
@@ -438,7 +434,7 @@ module ActiveRecord
       # can be prefixed with schema name
       # CamelCase table names should be quoted
       def self.valid_table_name?(name) #:nodoc:
-        name = name.to_s 
+        name = name.to_s
         name =~ VALID_TABLE_NAME && !(name =~ /[A-Z]/ && name =~ /[a-z]/) ? true : false
       end
 
@@ -446,7 +442,7 @@ module ActiveRecord
         name = name.to_s
         @quoted_table_names[name] ||= name.split('.').map{|n| n.split('@').map{|m| quote_column_name(m)}.join('@')}.join('.')
       end
-      
+
       def quote_string(s) #:nodoc:
         s.gsub(/'/, "''")
       end
@@ -696,17 +692,16 @@ module ActiveRecord
       def sql_for_insert(sql, pk, id_value, sequence_name, binds)
         unless id_value || pk.nil? || (defined?(CompositePrimaryKeys) && pk.kind_of?(CompositePrimaryKeys::CompositeKeys))
           sql = "#{sql} RETURNING #{quote_column_name(pk)} INTO :returning_id"
-          (binds = binds.dup) << [:returning_id, nil]
+          returning_id_col = OracleEnhancedColumn.new("returning_id", nil, "number", true, "dual", :integer, true, true)
+          (binds = binds.dup) << [returning_id_col, nil]
         end
         [sql, binds]
       end
 
-      EXEC_INSERT_RESULT_COLUMNS = %w(returning_id) #:nodoc:
-
       # New method in ActiveRecord 3.1
       def exec_insert(sql, name, binds)
         log(sql, name, binds) do
-          returning_id_index = nil
+          returning_id_col = returning_id_index = nil
           cursor = if @statements.key?(sql)
             @statements[sql]
           else
@@ -715,7 +710,8 @@ module ActiveRecord
 
           binds.each_with_index do |bind, i|
             col, val = bind
-            if col == :returning_id
+            if col.returning_id?
+              returning_id_col = [col]
               returning_id_index = i + 1
               cursor.bind_returning_param(returning_id_index, Integer)
             else
@@ -730,7 +726,7 @@ module ActiveRecord
             returning_id = cursor.get_returning_param(returning_id_index, Integer)
             rows << [returning_id]
           end
-          ActiveRecord::Result.new(EXEC_INSERT_RESULT_COLUMNS, rows)
+          ActiveRecord::Result.new(returning_id_col || [], rows)
         end
       end
 
@@ -977,7 +973,7 @@ module ActiveRecord
               current_index = row['index_name']
             end
 
-            # Functional index columns and virtual columns both get stored as column expressions, 
+            # Functional index columns and virtual columns both get stored as column expressions,
             # but re-creating a virtual column index as an expression (instead of using the virtual column's name)
             # results in a ORA-54018 error.  Thus, we only want the column expression value returned
             # when the column is not virtual.
@@ -1003,12 +999,12 @@ module ActiveRecord
         @@ignore_table_columns[table_name] += args.map{|a| a.to_s.downcase}
         @@ignore_table_columns[table_name].uniq!
       end
-      
+
       def ignored_table_columns(table_name) #:nodoc:
         @@ignore_table_columns ||= {}
         @@ignore_table_columns[table_name]
       end
-      
+
       # used just in tests to clear ignored table columns
       def clear_ignored_table_columns #:nodoc:
         @@ignore_table_columns = nil
@@ -1024,7 +1020,7 @@ module ActiveRecord
           @@table_column_type[table_name][col.to_s.downcase] = column_type
         end
       end
-      
+
       def get_type_for_column(table_name, column_name) #:nodoc:
         @@table_column_type && @@table_column_type[table_name] && @@table_column_type[table_name][column_name.to_s.downcase]
       end
@@ -1111,7 +1107,7 @@ module ActiveRecord
           if row['data_default'] && !is_virtual
             row['data_default'].sub!(/^(.*?)\s*$/, '\1')
 
-            # If a default contains a newline these cleanup regexes need to 
+            # If a default contains a newline these cleanup regexes need to
             # match newlines.
             row['data_default'].sub!(/^'(.*)'$/m, '\1')
             row['data_default'] = nil if row['data_default'] =~ /^(null|empty_[bc]lob\(\))$/i
@@ -1150,7 +1146,7 @@ module ActiveRecord
       cattr_accessor :default_sequence_start_value
       self.default_sequence_start_value = 10000
 
-      # Find a table's primary key and sequence. 
+      # Find a table's primary key and sequence.
       # *Note*: Only primary key is implemented - sequence will be nil.
       def pk_and_sequence_for(table_name, owner=nil, desc_table_name=nil, db_link=nil) #:nodoc:
         if @@cache_columns
@@ -1198,7 +1194,7 @@ module ActiveRecord
       # Oracle requires the ORDER BY columns to be in the SELECT list for DISTINCT
       # queries. However, with those columns included in the SELECT DISTINCT list, you
       # won't actually get a distinct list of the column you want (presuming the column
-      # has duplicates with multiple values for the ordered-by columns. So we use the 
+      # has duplicates with multiple values for the ordered-by columns. So we use the
       # FIRST_VALUE function to get a single (first) value for each column, effectively
       # making every row the same.
       #
@@ -1296,7 +1292,7 @@ module ActiveRecord
       #
       # PL/SQL in Oracle uses dbms_output for logging print statements
       # These methods stick that output into the Rails log so Ruby and PL/SQL
-      # code can can be debugged together in a single application 
+      # code can can be debugged together in a single application
 
       # Maximum DBMS_OUTPUT buffer size
       DBMS_OUTPUT_BUFFER_SIZE = 10000  # can be 1-1000000
@@ -1328,7 +1324,7 @@ module ActiveRecord
       ensure
         log_dbms_output if dbms_output_enabled?
       end
-      
+
       private
 
       def set_dbms_output_plsql_connection

data/lib/active_record/connection_adapters/oracle_enhanced_base_ext.rb

@@ -75,7 +75,10 @@ module ActiveRecord
       end
     end
     def record_changed_lobs
-      @changed_lob_columns = self.class.lob_columns.select{|col| self.send(:"#{col.name}_changed?") && !self.class.readonly_attributes.to_a.include?(col.name)}
+      @changed_lob_columns = self.class.lob_columns.select do |col|
+        self.class.serialized_attributes.keys.include?(col.name) ||
+          (self.send(:"#{col.name}_changed?") && !self.class.readonly_attributes.to_a.include?(col.name))
+      end
     end
     private :enhanced_write_lobs
     private :record_changed_lobs

data/lib/active_record/connection_adapters/oracle_enhanced_column.rb

@@ -2,13 +2,14 @@ module ActiveRecord
   module ConnectionAdapters #:nodoc:
     class OracleEnhancedColumn < Column
 
-      attr_reader :table_name, :forced_column_type, :nchar, :virtual_column_data_default #:nodoc:
+      attr_reader :table_name, :forced_column_type, :nchar, :virtual_column_data_default, :returning_id #:nodoc:
 
-      def initialize(name, default, sql_type = nil, null = true, table_name = nil, forced_column_type = nil, virtual=false) #:nodoc:
+      def initialize(name, default, sql_type = nil, null = true, table_name = nil, forced_column_type = nil, virtual=false, returning_id=false) #:nodoc:
         @table_name = table_name
         @forced_column_type = forced_column_type
         @virtual = virtual
         @virtual_column_data_default = default.inspect if virtual
+        @returning_id = returning_id
         default = nil if virtual
         super(name, default, sql_type, null)
         # Is column NCHAR or NVARCHAR2 (will need to use N'...' value quoting for these data types)?
@@ -26,6 +27,10 @@ module ActiveRecord
         @virtual
       end
 
+      def returning_id?
+        @returning_id
+      end
+
       def lob?
         self.sql_type =~ /LOB$/i
       end

data/lib/active_record/connection_adapters/oracle_enhanced_dirty.rb

@@ -18,6 +18,8 @@ module ActiveRecord #:nodoc:
             # therefore need to convert empty string value to nil if old value is nil
             elsif column.type == :string && column.null && old.nil?
               value = nil if value == ''
+            elsif old == 0 && value.is_a?(String) && value.present? && value != '0'
+              value = nil
             else
               value = column.type_cast(value)
             end
@@ -41,4 +43,4 @@ if ActiveRecord::Base.method_defined?(:changed?)
       alias_method :field_changed?, :_field_changed?
     end
   end
-end
+end

data/lib/active_record/connection_adapters/oracle_enhanced_jdbc_connection.rb

@@ -15,7 +15,7 @@ begin
 
   unless ojdbc_jar.nil? || ENV_JAVA['java.class.path'] =~ Regexp.new(ojdbc_jar)
     # On Unix environment variable should be PATH, on Windows it is sometimes Path
-    env_path = (ENV["PATH"] || ENV["Path"] || '').split(/[:;]/)
+    env_path = (ENV["PATH"] || ENV["Path"] || '').split(File::PATH_SEPARATOR)
     # Look for JDBC driver at first in lib subdirectory (application specific JDBC file version)
     # then in Ruby load path and finally in environment PATH
     if ojdbc_jar_path = ['./lib'].concat($LOAD_PATH).concat(env_path).find{|d| File.exists?(File.join(d,ojdbc_jar))}

data/lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb

@@ -13,10 +13,10 @@ module ActiveRecord #:nodoc:
       private
 
       def ignore_table?(table)
-        [ActiveRecord::Migrator.proper_table_name('schema_migrations'), ignore_tables].flatten.any? do |ignored|
+        ['schema_migrations', ignore_tables].flatten.any? do |ignored|
           case ignored
-          when String; table == ignored
-          when Regexp; table =~ ignored
+          when String; remove_prefix_and_suffix(table) == ignored
+          when Regexp; remove_prefix_and_suffix(table) =~ ignored
           else
             raise StandardError, 'ActiveRecord::SchemaDumper.ignore_tables accepts an array of String and / or Regexp values.'
           end
@@ -177,7 +177,7 @@ module ActiveRecord #:nodoc:
             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?
+            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?
@@ -230,7 +230,10 @@ module ActiveRecord #:nodoc:
         
         stream
       end
-      
+
+      def remove_prefix_and_suffix(table)
+        table.gsub(/^(#{ActiveRecord::Base.table_name_prefix})(.+)(#{ActiveRecord::Base.table_name_suffix})$/,  "\\2")
+      end 
       
       # remove table name prefix and suffix when doing #inspect (which is used in tables method)
       module TableInspect #:nodoc:

data/lib/active_record/connection_adapters/oracle_enhanced_schema_statements.rb

@@ -22,11 +22,11 @@ module ActiveRecord
       #   end
       #
       # Create primary key trigger (so that you can skip primary key value in INSERT statement).
-      # By default trigger name will be "table_name_pkt", you can override the name with 
+      # By default trigger name will be "table_name_pkt", you can override the name with
       # :trigger_name option (but it is not recommended to override it as then this trigger will
       # not be detected by ActiveRecord model and it will still do prefetching of sequence value).
       # Example:
-      # 
+      #
       #   create_table :users, :primary_key_trigger => true do |t|
       #     # ...
       #   end
@@ -37,11 +37,11 @@ module ActiveRecord
       #     t.string      :first_name, :comment => “Given name”
       #     t.string      :last_name, :comment => “Surname”
       #   end
-      
+
       def create_table(name, options = {}, &block)
         create_sequence = options[:id] != false
         column_comments = {}
-        
+
         table_definition = TableDefinition.new(self)
         table_definition.primary_key(options[:primary_key] || Base.get_primary_key(name.to_s.singularize)) unless options[:id] == false
 
@@ -87,14 +87,14 @@ module ActiveRecord
         end
         create_sql << " #{options[:options]}"
         execute create_sql
-        
+
         create_sequence_and_trigger(name, options) if create_sequence
-        
+
         add_table_comment name, options[:comment]
         column_comments.each do |column_name, comment|
           add_comment name, column_name, comment
         end
-        
+
       end
 
       def rename_table(name, new_name) #:nodoc:
@@ -116,6 +116,35 @@ module ActiveRecord
         clear_table_columns_cache(name)
       end
 
+      def initialize_schema_migrations_table
+        sm_table = ActiveRecord::Migrator.schema_migrations_table_name
+
+        unless table_exists?(sm_table)
+          index_name = "#{Base.table_name_prefix}unique_schema_migrations#{Base.table_name_suffix}"
+          if index_name.length > index_name_length
+            truncate_to    = index_name_length - index_name.to_s.length - 1
+            truncated_name = "unique_schema_migrations"[0..truncate_to]
+            index_name     = "#{Base.table_name_prefix}#{truncated_name}#{Base.table_name_suffix}"
+          end
+
+          create_table(sm_table, :id => false) do |schema_migrations_table|
+            schema_migrations_table.column :version, :string, :null => false
+          end
+          add_index sm_table, :version, :unique => true, :name => index_name
+
+          # Backwards-compatibility: if we find schema_info, assume we've
+          # migrated up to that point:
+          si_table = Base.table_name_prefix + 'schema_info' + Base.table_name_suffix
+          if table_exists?(si_table)
+            ActiveSupport::Deprecation.warn "Usage of the schema table `#{si_table}` is deprecated. Please switch to using `schema_migrations` table"
+
+            old_version = select_value("SELECT version FROM #{quote_table_name(si_table)}").to_i
+            assume_migrated_upto_version(old_version)
+            drop_table(si_table)
+          end
+        end
+      end
+
       # clear cached indexes when adding new index
       def add_index(table_name, column_name, options = {}) #:nodoc:
         column_names = Array(column_name)
@@ -166,10 +195,10 @@ module ActiveRecord
         options = {} unless options.is_a?(Hash)
         identifier_max_length = options[:identifier_max_length] || index_name_length
         return default_name if default_name.length <= identifier_max_length
-        
+
         # remove 'index', 'on' and 'and' keywords
         shortened_name = "i_#{table_name}_#{Array(options[:column]) * '_'}"
-        
+
         # leave just first three letters from each word
         if shortened_name.length > identifier_max_length
           shortened_name = shortened_name.split('_').map{|w| w[0,3]}.join('_')
@@ -271,6 +300,8 @@ module ActiveRecord
       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
 

data/lib/active_record/connection_adapters/oracle_enhanced_schema_statements_ext.rb

@@ -94,9 +94,11 @@ module ActiveRecord
           references = options[:references] ? options[:references].first : nil
           references_sql = quote_column_name(options[:primary_key] || references || "id")
         end
-        
-        sql = "FOREIGN KEY (#{columns_sql}) REFERENCES #{quote_table_name(to_table)}(#{references_sql})"
-        
+
+        table_name = ActiveRecord::Migrator.proper_table_name(to_table)
+
+        sql = "FOREIGN KEY (#{columns_sql}) REFERENCES #{quote_table_name(table_name)}(#{references_sql})"
+
         case options[:dependent]
         when :nullify
           sql << " ON DELETE SET NULL"

data/lib/active_record/connection_adapters/oracle_enhanced_structure_dump.rb

@@ -136,7 +136,7 @@ module ActiveRecord #:nodoc:
 
       def dump_schema_information #:nodoc:
         sm_table = ActiveRecord::Migrator.schema_migrations_table_name
-        migrated = select_values("SELECT version FROM #{sm_table}")
+        migrated = select_values("SELECT version FROM #{sm_table} ORDER BY version")
         join_with_statement_token(migrated.map{|v| "INSERT INTO #{sm_table} (version) VALUES ('#{v}')" })
       end
 

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -1052,6 +1052,18 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
     @employee.reload
     @employee.comments.should == @char_data
   end
+
+  it "should keep unchanged serialized data when other columns changed" do
+    @employee = Test2Employee.create!(
+      :first_name => "First",
+      :last_name => "Last",
+      :comments => "initial serialized data"
+    )
+    @employee.first_name = "Steve"
+    @employee.save
+    @employee.reload
+    @employee.comments.should == "initial serialized data"
+  end
 end
 
 describe "OracleEnhancedAdapter handling of BLOB columns" do

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -355,6 +355,7 @@ describe "OracleEnhancedAdapter schema dump" do
             t.virtual :full_name,        :as => "first_name || ', ' || last_name"
             t.virtual :short_name,       :as => "COALESCE(first_name, last_name)", :type => :string, :limit => 300
             t.virtual :abbrev_name,      :as => "SUBSTR(first_name,1,50) || ' ' || SUBSTR(last_name,1,1) || '.'", :type => "VARCHAR(100)"
+            t.virtual :name_ratio, :as=>'(LENGTH(first_name)*10/LENGTH(last_name)*10)'
             t.column  :full_name_length, :virtual, :as => "length(first_name || ', ' || last_name)", :type => :integer
             t.virtual :field_with_leading_space, :as => "' ' || first_name || ' '", :limit => 300, :type => :string
           end
@@ -388,6 +389,7 @@ describe "OracleEnhancedAdapter schema dump" 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/
     end

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe "OracleEnhancedAdapter schema definition" do
   include SchemaSpecHelper
+  include LoggerSpecHelper
 
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
@@ -186,6 +187,14 @@ describe "OracleEnhancedAdapter schema definition" do
         e = TestEmployee.create!(:first_name => 'Raimonds')
         @conn.select_value("SELECT test_employees_seq.currval FROM dual").should == e.id
       end
+
+      it "should not generate NoMethodError for :returning_id:Symbol" do
+        set_logger
+        insert_id = @conn.insert("INSERT INTO test_employees (first_name) VALUES ('Yasuo')", nil, "id")
+        @logger.output(:error).should_not match(/^Could not log "sql.active_record" event. NoMethodError: undefined method `name' for :returning_id:Symbol/)
+        clear_logger
+      end
+
     end
 
     describe "with separate creation of primary key trigger" do
@@ -313,7 +322,7 @@ describe "OracleEnhancedAdapter schema definition" do
         drop_table :test_employees
       end
       Object.send(:remove_const, "TestEmployee")
-      ActiveRecord::Base.table_name_prefix = nil
+      ActiveRecord::Base.table_name_prefix = ''
       ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
     end
 
@@ -536,7 +545,12 @@ end
   end
 
   describe "foreign key constraints" do
+    let(:table_name_prefix) { '' }
+    let(:table_name_suffix) { '' }
+
     before(:each) do
+      ActiveRecord::Base.table_name_prefix = table_name_prefix
+      ActiveRecord::Base.table_name_suffix = table_name_suffix
       schema_define do
         create_table :test_posts, :force => true do |t|
           t.string :title
@@ -562,6 +576,8 @@ end
         drop_table :test_comments rescue nil
         drop_table :test_posts rescue nil
       end
+      ActiveRecord::Base.table_name_prefix = ''
+      ActiveRecord::Base.table_name_suffix = ''
       ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
     end
 
@@ -574,6 +590,34 @@ end
       end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.TEST_COMMENTS_TEST_POST_ID_FK/}
     end
 
+    context "with table_name_prefix" do
+      let(:table_name_prefix) { 'xxx_' }
+
+      it "should use table_name_prefix for foreign table" do
+        schema_define do
+          add_foreign_key :test_comments, :test_posts
+        end
+
+        lambda do
+          TestComment.create(:body => "test", :test_post_id => 1)
+        end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.XXX_TES_COM_TES_POS_ID_FK/}
+      end
+    end
+
+    context "with table_name_suffix" do
+      let(:table_name_suffix) { '_xxx' }
+
+      it "should use table_name_suffix for foreign table" do
+        schema_define do
+          add_foreign_key :test_comments, :test_posts
+        end
+
+        lambda do
+          TestComment.create(:body => "test", :test_post_id => 1)
+        end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.TES_COM_XXX_TES_POS_ID_FK/}
+      end
+    end
+
     it "should add foreign key with name" do
       schema_define do
         add_foreign_key :test_comments, :test_posts, :name => "comments_posts_fk"
@@ -1276,5 +1320,65 @@ end
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:index)
       @would_execute_sql.should =~ /CREATE +INDEX .* ON .* \(.*\) TABLESPACE #{DATABASE_NON_DEFAULT_TABLESPACE}/
     end
+
+    describe "#initialize_schema_migrations_table" do
+      # In Rails 2.3 to 3.2.x the index name for the migrations
+      # table is hard-coded. We can modify the index name here
+      # so we can support prefixes/suffixes that would
+      # cause the index to be too long.
+      #
+      # Rails 4 can use this solution as well.
+      after(:each) do
+        ActiveRecord::Base.table_name_prefix = ''
+        ActiveRecord::Base.table_name_suffix = ''
+      end
+
+      def add_schema_migrations_index
+        schema_define do
+          initialize_schema_migrations_table
+        end
+      end
+
+      context "without prefix or suffix" do
+        it "should not truncate the index name" do
+          add_schema_migrations_index
+
+          @would_execute_sql.should include('CREATE UNIQUE INDEX "UNIQUE_SCHEMA_MIGRATIONS" ON "SCHEMA_MIGRATIONS" ("VERSION")')
+        end
+      end
+
+      context "with prefix" do
+        before { ActiveRecord::Base.table_name_prefix = 'toolong_' }
+
+        it "should truncate the 'unique_schema_migrations' portion of the index name to fit the prefix within the limit" do
+          add_schema_migrations_index
+
+          @would_execute_sql.should include('CREATE UNIQUE INDEX "TOOLONG_UNIQUE_SCHEMA_MIGRATIO" ON "TOOLONG_SCHEMA_MIGRATIONS" ("VERSION")')
+        end
+      end
+
+      context "with suffix" do
+        before { ActiveRecord::Base.table_name_suffix = '_toolong' }
+
+        it "should truncate the 'unique_schema_migrations' portion of the index name to fit the suffix within the limit" do
+          add_schema_migrations_index
+
+          @would_execute_sql.should include('CREATE UNIQUE INDEX "UNIQUE_SCHEMA_MIGRATIO_TOOLONG" ON "SCHEMA_MIGRATIONS_TOOLONG" ("VERSION")')
+        end
+      end
+
+      context "with prefix and suffix" do
+        before do
+          ActiveRecord::Base.table_name_prefix = 'begin_'
+          ActiveRecord::Base.table_name_suffix = '_end'
+        end
+
+        it "should truncate the 'unique_schema_migrations' portion of the index name to fit the suffix within the limit" do
+          add_schema_migrations_index
+
+          @would_execute_sql.should include('CREATE UNIQUE INDEX "BEGIN_UNIQUE_SCHEMA_MIGRAT_END" ON "BEGIN_SCHEMA_MIGRATIONS_END" ("VERSION")')
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.4.2.rc1
+  version: 1.4.2.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,9 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  type: :development
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     none: false
@@ -19,15 +20,15 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
+  prerelease: false
 - !ruby/object:Gem::Dependency
+  type: :development
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
@@ -35,15 +36,15 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
+  prerelease: false
 - !ruby/object:Gem::Dependency
+  type: :development
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     none: false
@@ -51,79 +52,79 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
 - !ruby/object:Gem::Dependency
+  type: :development
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
-  type: :development
-  prerelease: false
+        version: 3.2.12
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.2.12
+  prerelease: false
 - !ruby/object:Gem::Dependency
+  type: :development
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
-  type: :development
-  prerelease: false
+        version: 3.2.12
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.2.12
+  prerelease: false
 - !ruby/object:Gem::Dependency
+  type: :development
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
-  type: :development
-  prerelease: false
+        version: 3.2.12
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.2.12
+  prerelease: false
 - !ruby/object:Gem::Dependency
+  type: :development
   name: railties
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
-  type: :development
-  prerelease: false
+        version: 3.2.12
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.2.12
+  prerelease: false
 - !ruby/object:Gem::Dependency
+  type: :development
   name: ruby-plsql
   requirement: !ruby/object:Gem::Requirement
     none: false
@@ -131,15 +132,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
+  prerelease: false
 - !ruby/object:Gem::Dependency
+  type: :development
   name: ruby-oci8
   requirement: !ruby/object:Gem::Requirement
     none: false
@@ -147,14 +148,13 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.4
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.4
+  prerelease: false
 description: ! 'Oracle "enhanced" ActiveRecord adapter contains useful additional
   methods for working with new and legacy Oracle databases.
 
@@ -223,10 +223,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -4041151724223707895
+      version: '0'
+      hash: -4155307569324953447
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Oracle enhanced adapter for ActiveRecord