activerecord-oracle_enhanced-adapter 1.5.6 → 1.6.9

data/lib/active_record/connection_adapters/{oracle_enhanced_oci_connection.rb → oracle_enhanced/oci_connection.rb}

@@ -25,7 +25,9 @@ module ActiveRecord
       def initialize(config)
         @raw_connection = OCI8EnhancedAutoRecover.new(config, OracleEnhancedOCIFactory)
         # default schema owner
-        @owner = config[:username].to_s.upcase
+        @owner = config[:schema]
+        @owner ||= config[:username]
+        @owner = @owner.to_s.upcase
       end
 
       def raw_oci_connection
@@ -237,12 +239,12 @@ module ActiveRecord
 
       def typecast_result_value(value, get_lob_value)
         case value
-        when Fixnum, Bignum
+        when Integer
           value
         when String
           value
         when Float, BigDecimal
-          # return Fixnum or Bignum if value is integer (to avoid issues with _before_type_cast values for id attributes)
+          # return Integer if value is integer (to avoid issues with _before_type_cast values for id attributes)
           value == (v_to_i = value.to_i) ? v_to_i : value
         when OraNumber
           # change OraNumber value (returned in early versions of ruby-oci8 2.0.x) to BigDecimal
@@ -306,6 +308,7 @@ module ActiveRecord
         username = config[:username] && config[:username].to_s
         password = config[:password] && config[:password].to_s
         database = config[:database] && config[:database].to_s
+        schema = config[:schema] && config[:schema].to_s
         host, port = config[:host], config[:port]
         privilege = config[:privilege] && config[:privilege].to_sym
         async = config[:allow_concurrency]
@@ -314,8 +317,11 @@ module ActiveRecord
         # get session time_zone from configuration or from TZ environment variable
         time_zone = config[:time_zone] || ENV['TZ']
 
+        # using a connection string via DATABASE_URL
+        connection_string = if host == 'connection-string'
+          database
         # connection using host, port and database name
-        connection_string = if host || port
+        elsif host || port
           host ||= 'localhost'
           host = "[#{host}]" if host =~ /^[^\[].*:/  # IPv6
           port ||= 1521
@@ -326,13 +332,13 @@ module ActiveRecord
         else
           database
         end
-
         conn = OCI8.new username, password, connection_string, privilege
         conn.autocommit = true
         conn.non_blocking = true if async
         conn.prefetch_rows = prefetch_rows
         conn.exec "alter session set cursor_sharing = #{cursor_sharing}" rescue nil
         conn.exec "alter session set time_zone = '#{time_zone}'" unless time_zone.blank?
+        conn.exec "alter session set current_schema = #{schema}" unless schema.blank?
 
         # Initialize NLS parameters
         OracleEnhancedAdapter::DEFAULT_NLS_PARAMETERS.each do |key, default_value|

data/lib/active_record/connection_adapters/{oracle_enhanced_procedures.rb → oracle_enhanced/procedures.rb}

@@ -152,7 +152,7 @@ module ActiveRecord #:nodoc:
           if partial_writes?
             # Serialized attributes should always be written in case they've been
             # changed in place.
-            update_using_custom_method(changed | (attributes.keys & self.class.serialized_attributes.keys))
+            update_using_custom_method(changed | (attributes.keys & self.class.columns.select {|column| column.cast_type.is_a?(Type::Serialized)}))
           else
             update_using_custom_method(attribute_names)
           end

data/lib/active_record/connection_adapters/{oracle_enhanced_schema_creation.rb → oracle_enhanced/schema_creation.rb}

@@ -1,53 +1,47 @@
 module ActiveRecord
   module ConnectionAdapters
-    class OracleEnhancedAdapter < AbstractAdapter
+    module OracleEnhanced
       class SchemaCreation < AbstractAdapter::SchemaCreation
         private
 
         def visit_ColumnDefinition(o)
-          if o.type.to_sym == :virtual
-            sql_type = type_to_sql(o.default[:type], o.limit, o.precision, o.scale) if o.default[:type]
-            "#{quote_column_name(o.name)} #{sql_type} AS (#{o.default[:as]})"
-          else
-            super
+          case
+            when o.type.to_sym == :virtual
+              sql_type = type_to_sql(o.default[:type], o.limit, o.precision, o.scale) if o.default[:type]
+              return "#{quote_column_name(o.name)} #{sql_type} AS (#{o.default[:as]})"
+            when [:blob, :clob].include?(sql_type = type_to_sql(o.type.to_sym,  o.limit, o.precision, o.scale).downcase.to_sym)
+              if (tablespace = default_tablespace_for(sql_type))
+                @lob_tablespaces ||= {}
+                @lob_tablespaces[o.name] = tablespace
+              end
           end
+          super
         end
 
         def visit_TableDefinition(o)
-          tablespace = tablespace_for(:table, o.options[:tablespace])
           create_sql = "CREATE#{' GLOBAL TEMPORARY' if o.temporary} TABLE "
           create_sql << "#{quote_table_name(o.name)} ("
           create_sql << o.columns.map { |c| accept c }.join(', ')
           create_sql << ")"
+
           unless o.temporary
+            @lob_tablespaces.each do |lob_column, tablespace|
+              create_sql << " LOB (#{quote_column_name(lob_column)}) STORE AS (TABLESPACE #{tablespace}) \n"
+            end if defined?(@lob_tablespaces)
             create_sql << " ORGANIZATION #{o.options[:organization]}" if o.options[:organization]
-            create_sql << "#{tablespace}"
+            if (tablespace = o.options[:tablespace] || default_tablespace_for(:table))
+              create_sql << " TABLESPACE #{tablespace}"
+            end
           end
           create_sql << " #{o.options[:options]}"
           create_sql
         end
 
-        def tablespace_for(obj_type, tablespace_option, table_name=nil, column_name=nil)
-          tablespace_sql = ''
-          if tablespace = (tablespace_option || default_tablespace_for(obj_type))
-            tablespace_sql << if [:blob, :clob].include?(obj_type.to_sym)
-              " LOB (#{quote_column_name(column_name)}) STORE AS #{column_name.to_s[0..10]}_#{table_name.to_s[0..14]}_ls (TABLESPACE #{tablespace})"
-            else
-              " TABLESPACE #{tablespace}"
-            end
-          end
-          tablespace_sql
-        end
-
         def default_tablespace_for(type)
           (ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[type] || 
            ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[native_database_types[type][:name]]) rescue nil
         end
 
-        def foreign_key_definition(to_table, options = {})
-          @conn.foreign_key_definition(to_table, options)
-        end
-
         def add_column_options!(sql, options)
           type = options[:type] || ((column = options[:column]) && column.type)
           type = type && type.to_sym
@@ -56,8 +50,7 @@ module ActiveRecord
             if type == :text
               sql << " DEFAULT #{@conn.quote(options[:default])}"
             else
-              # from abstract adapter
-              sql << " DEFAULT #{@conn.quote(options[:default], options[:column])}"
+              sql << " DEFAULT #{quote_value(options[:default], options[:column])}"
             end
           end
           # must explicitly add NULL or NOT NULL to allow change_column to work on migrations
@@ -72,18 +65,24 @@ module ActiveRecord
           end
         end
 
-        # This method does not exist in SchemaCreation at Rails 4.0
-        # It can be removed only when Oracle enhanced adapter supports Rails 4.1 and higher
-        def options_include_default?(options)
-          options.include?(:default) && !(options[:null] == false && options[:default].nil?)
+        def action_sql(action, dependency)
+          if action == 'UPDATE'
+            raise ArgumentError, <<-MSG.strip_heredoc
+              '#{action}' is not supported by Oracle
+            MSG
+          end
+          case dependency
+          when :nullify then "ON #{action} SET NULL"
+          when :cascade  then "ON #{action} CASCADE"
+          else
+            raise ArgumentError, <<-MSG.strip_heredoc
+              '#{dependency}' is not supported for #{action}
+              Supported values are: :nullify, :cascade
+            MSG
+          end
         end
 
       end
-      
-      def schema_creation
-          SchemaCreation.new self
-      end
-
     end
   end
 end

data/lib/active_record/connection_adapters/oracle_enhanced/schema_definitions.rb

@@ -0,0 +1,95 @@
+module ActiveRecord
+  module ConnectionAdapters
+    #TODO: Overriding `aliased_types` cause another database adapter behavior changes
+    #It should be addressed by supporting `create_table_definition`
+    class TableDefinition
+      private
+      def aliased_types(name, fallback)
+        fallback
+      end
+    end
+
+    module OracleEnhanced
+
+      class ForeignKeyDefinition < ActiveRecord::ConnectionAdapters::ForeignKeyDefinition
+        def name
+          if options[:name].length > OracleEnhancedAdapter::IDENTIFIER_MAX_LENGTH
+            ActiveSupport::Deprecation.warn "Foreign key name #{options[:name]} is too long. It will not get shorten in later version of Oracle enhanced adapter"
+            'c'+Digest::SHA1.hexdigest(options[:name])[0,OracleEnhancedAdapter::IDENTIFIER_MAX_LENGTH-1]
+          else
+            options[:name]
+          end
+        end
+      end
+
+      class SynonymDefinition < Struct.new(:name, :table_owner, :table_name, :db_link) #:nodoc:
+      end
+
+      class IndexDefinition < ActiveRecord::ConnectionAdapters::IndexDefinition
+        attr_accessor :table, :name, :unique, :type, :parameters, :statement_parameters, :tablespace, :columns
+ 
+        def initialize(table, name, unique, type, parameters, statement_parameters, tablespace, columns)
+          @table = table
+          @name = name
+          @unique = unique
+          @type = type
+          @parameters = parameters
+          @statement_parameters = statement_parameters
+          @tablespace = tablespace
+          @columns = columns
+          super(table, name, unique, columns, nil, nil, nil, nil)
+        end
+      end
+
+      class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
+
+        def raw(name, options={})
+          column(name, :raw, options)
+        end
+
+        def virtual(* args)
+          options = args.extract_options!
+          column_names = args
+          column_names.each { |name| column(name, :virtual, options) }
+        end
+
+        def column(name, type, options = {})
+          if type == :virtual
+            default = {:type => options[:type]}
+            if options[:as]
+              default[:as] = options[:as]
+            elsif options[:default]
+              warn "[DEPRECATION] virtual column `:default` option is deprecated.  Please use `:as` instead."
+              default[:as] = options[:default]
+            else
+              raise "No virtual column definition found."
+            end
+            options[:default] = default
+          end
+          super(name, type, options)
+        end
+
+      end
+
+      class AlterTable < ActiveRecord::ConnectionAdapters::AlterTable
+        def add_foreign_key(to_table, options)
+          @foreign_key_adds << OracleEnhanced::ForeignKeyDefinition.new(name, to_table, options)
+        end
+      end
+
+      class Table < ActiveRecord::ConnectionAdapters::Table
+        def foreign_key(to_table, options = {})
+          ActiveSupport::Deprecation.warn "`foreign_key` option will be deprecated. Please use `references` option"
+          to_table = to_table.to_s.pluralize if ActiveRecord::Base.pluralize_table_names
+          @base.add_foreign_key(@name, to_table, options)
+        end
+
+        def remove_foreign_key(options = {})
+          ActiveSupport::Deprecation.warn "`remove_foreign_key` option will be deprecated. Please use `remove_references` option"
+          @base.remove_foreign_key(@name, options)
+        end
+      end
+
+    end
+  end
+end

data/lib/active_record/connection_adapters/{oracle_enhanced_schema_dumper.rb → oracle_enhanced/schema_dumper.rb}

@@ -7,6 +7,7 @@ module ActiveRecord #:nodoc:
           private
           alias_method_chain :tables, :oracle_enhanced
           alias_method_chain :indexes, :oracle_enhanced
+          alias_method_chain :foreign_keys, :oracle_enhanced
         end
       end
 
@@ -49,44 +50,15 @@ module ActiveRecord #:nodoc:
 
       def primary_key_trigger(table_name, stream)
         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)
+          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 "\n\n"
         end
       end
 
-      def foreign_keys(table_name, stream)
-        if @connection.respond_to?(:foreign_keys) && (foreign_keys = @connection.foreign_keys(table_name)).any?
-          add_foreign_key_statements = foreign_keys.map do |foreign_key|
-            statement_parts = [ ('add_foreign_key ' + foreign_key.from_table.inspect) ]
-            statement_parts << foreign_key.to_table.inspect
-
-            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)
-              end
-
-              if foreign_key.options[:references].first != 'id'
-                statement_parts << ('primary_key: ' + foreign_key.options[:references].first.inspect)
-              end
-            else
-              statement_parts << ('columns: ' + foreign_key.options[:columns].inspect)
-            end
-
-            statement_parts << ('name: ' + foreign_key.options[:name].inspect)
-            
-            unless foreign_key.options[:dependent].blank?
-              statement_parts << ('dependent: ' + foreign_key.options[:dependent].inspect)
-            end
-
-            '  ' + statement_parts.join(', ')
-          end
-
-          stream.puts add_foreign_key_statements.sort.join("\n")
-          stream.puts
-        end
+      def foreign_keys_with_oracle_enhanced(table_name, stream)
+        return foreign_keys_without_oracle_enhanced(table_name, stream)
       end
 
       def synonyms(stream)
@@ -149,16 +121,21 @@ module ActiveRecord #:nodoc:
 
           # first dump primary key column
           if @connection.respond_to?(:pk_and_sequence_for)
-            pk, pk_seq = @connection.pk_and_sequence_for(table)
+            pk, _pk_seq = @connection.pk_and_sequence_for(table)
           elsif @connection.respond_to?(:primary_key)
             pk = @connection.primary_key(table)
           end
-          
+
           tbl.print "  create_table #{table.inspect}"
-          
+
           # addition to make temporary option work
           tbl.print ", temporary: true" if @connection.temporary_table?(table)
-          
+
+          table_comments = @connection.table_comment(table)
+          unless table_comments.nil?
+            tbl.print ", comment: #{table_comments.inspect}"
+          end
+
           if columns.detect { |c| c.name == pk }
             if pk != 'id'
               tbl.print %Q(, primary_key: "#{pk}")
@@ -166,7 +143,7 @@ module ActiveRecord #:nodoc:
           else
             tbl.print ", id: false"
           end
-          tbl.print ", force: true"
+          tbl.print ", force: :cascade"
           tbl.puts " do |t|"
 
           # then dump all non-primary key columns