activerecord-oracle_enhanced-adapter 1.5.6 → 1.6.0.beta1

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -22,7 +22,7 @@ describe "OracleEnhancedAdapter schema dump" do
     schema_define do
       create_table :test_posts, options do |t|
         t.string :title
-        t.timestamps
+        t.timestamps null: true
       end
       add_index :test_posts, :title
     end
@@ -376,7 +376,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)/LENGTH(last_name))'
+            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
@@ -402,30 +402,13 @@ describe "OracleEnhancedAdapter schema dump" do
       end
     end
 
-    context "when number_datatype_coercion is :float" do
-      before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:float) }
-
-      it 'should dump correctly' do
-        standard_dump.should =~ /t\.virtual "full_name",(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\"",(\s*)type: :string/
-        standard_dump.should =~ /t\.virtual "short_name",(\s*)limit: 300,(\s*)as:(.*),(\s*)type: :string/
-        standard_dump.should =~ /t\.virtual "full_name_length",(\s*)precision: 38,(\s*)scale: 0,(\s*)as:(.*),(\s*)type: :integer/
-        standard_dump.should =~ /t\.virtual "name_ratio",(\s*)as:(.*),(\s*)type: :float$/
-        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
-    end
-
-    context "when number_datatype_coercion is :decimal" do
-      before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:decimal) }
-
-      it 'should dump correctly' do
-        standard_dump.should =~ /t\.virtual "full_name",(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\"",(\s*)type: :string/
-        standard_dump.should =~ /t\.virtual "short_name",(\s*)limit: 300,(\s*)as:(.*),(\s*)type: :string/
-        standard_dump.should =~ /t\.virtual "full_name_length",(\s*)precision: 38,(\s*)scale: 0,(\s*)as:(.*),(\s*)type: :integer/
-        standard_dump.should =~ /t\.virtual "name_ratio",(\s*)as:(.*)\"$/
-        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
+    it 'should dump correctly' do
+      standard_dump.should =~ /t\.virtual "full_name",(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\"",(\s*)type: :string/
+      standard_dump.should =~ /t\.virtual "short_name",(\s*)limit: 300,(\s*)as:(.*),(\s*)type: :string/
+      standard_dump.should =~ /t\.virtual "full_name_length",(\s*)precision: 38,(\s*)scale: 0,(\s*)as:(.*),(\s*)type: :integer/
+      standard_dump.should =~ /t\.virtual "name_ratio",(\s*)as:(.*)\"$/ # no :type
+      standard_dump.should =~ /t\.virtual "abbrev_name",(\s*)limit: 100,(\s*)as:(.*),(\s*)type: :string/
+      standard_dump.should =~ /t\.virtual "field_with_leading_space",(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '",(\s*)type: :string/
     end
 
     context 'with column cache' do
@@ -471,160 +454,23 @@ describe "OracleEnhancedAdapter schema dump" do
     end
   end
 
-  describe "NUMBER columns" do
-    after(:each) do
+  describe ":float datatype" do
+    before(:each) do
       schema_define do
-        drop_table "test_numbers"
-      end
-    end
-
-    let(:value_within_max_precision)    { (10 ** @conn.class::NUMBER_MAX_PRECISION) - 1 }
-    let(:value_exceeding_max_precision) { (10 ** @conn.class::NUMBER_MAX_PRECISION) + 1 }
-
-    context "when using ActiveRecord::Schema.define and ActiveRecord::ConnectionAdapters::TableDefinition#float" do
-      before :each do
-        schema_define do
-          create_table :test_numbers, :force => true do |t|
-            t.float :value
-          end
-        end
-      end
-
-      context "when number_datatype_coercion is :float" do
-        before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:float) }
-
-        it "should dump correctly" do
-          standard_dump.should =~ /t\.float "value"$/
-        end
-      end
-
-      context "when number_datatype_coercion is :decimal" do
-        before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:decimal) }
-
-        it "should dump correctly" do
-          standard_dump.should =~ /t\.decimal "value"$/
+        create_table :test_floats, force: true do |t|
+          t.float :hourly_rate
         end
       end
     end
 
-    context "when using handwritten 'CREATE_TABLE' SQL" do
-      before :each do
-        ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-        @conn = ActiveRecord::Base.connection
-        @conn.execute <<-SQL
-          CREATE TABLE test_numbers (
-            id     NUMBER(#{@conn.class::NUMBER_MAX_PRECISION},0) PRIMARY KEY,
-            value  NUMBER
-          )
-        SQL
-        @conn.execute <<-SQL
-          CREATE SEQUENCE test_numbers_seq  MINVALUE 1
-            INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE
-        SQL
-      end
-
-      context "when number_datatype_coercion is :float" do
-        before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:float) }
-
-        it "should dump correctly" do
-          standard_dump.should =~ /t\.float "value"$/
-        end
-
-        describe "ActiveRecord saving" do
-          before :each do
-            class ::TestNumber < ActiveRecord::Base
-              self.table_name = "test_numbers"
-            end
-          end
-
-          it "should allow saving of values within NUMBER_MAX_PRECISION" do
-            number = TestNumber.new(value: value_within_max_precision)
-            number.save!
-            number.reload
-            number.value.should eq(value_within_max_precision)
-          end
-
-          it "should allow saving of values larger than NUMBER_MAX_PRECISION" do
-            number = TestNumber.new(value: value_exceeding_max_precision)
-            number.save!
-            number.reload
-            number.value.should eq(value_exceeding_max_precision)
-          end
-
-          it "should be recreatable from dump and have same properties" do
-            # Simulating db:schema:dump & db:test:load
-            2.times do
-              create_table_dump = standard_dump[/(create_table.+?end)/m]
-
-              schema_define do
-                drop_table "test_numbers"
-              end
-
-              schema_define(&eval("-> * { #{create_table_dump} }"))
-            end
-
-            number = TestNumber.new(value: value_within_max_precision)
-            number.save!
-
-            number2 = TestNumber.new(value: value_exceeding_max_precision)
-            number2.save!
-          end
-        end
+    after(:each) do
+      schema_define do
+        drop_table :test_floats
       end
+    end
 
-      context "when number_datatype_coercion is :decimal" do
-        before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:decimal) }
-
-        it "should dump correctly" do
-          standard_dump.should =~ /t\.decimal "value"$/
-        end
-
-        describe "ActiveRecord saving" do
-          before :each do
-            class ::TestNumber < ActiveRecord::Base
-              self.table_name = "test_numbers"
-            end
-          end
-
-          it "should allow saving of values within NUMBER_MAX_PRECISION" do
-            number = TestNumber.new(value: value_within_max_precision)
-            number.save!
-            number.reload
-            number.value.should eq(value_within_max_precision)
-          end
-
-          it "should allow saving of values larger than NUMBER_MAX_PRECISION" do
-            number = TestNumber.new(value: value_exceeding_max_precision)
-            number.save!
-            number.reload
-            number.value.should eq(value_exceeding_max_precision)
-          end
-
-          it "should be recreatable from dump and have same properties" do
-            # Simulating db:schema:dump & db:test:load
-            2.times do |i|
-              create_table_dump = standard_dump[/(create_table.+?end)/m]
-
-              schema_define do
-                drop_table "test_numbers"
-              end
-
-              schema_define(&eval("-> * { #{create_table_dump} }"))
-            end
-
-            number = TestNumber.new(value: value_within_max_precision)
-            number.save!
-
-            # Raises 'ORA-01438' as :value column type isn't FLOAT'ish
-            number2 = TestNumber.new(value: value_exceeding_max_precision)
-            lambda do
-              number2.save!
-            end.should raise_error() { |e| e.message.should =~ /ORA-01438/ }
-          end
-        end
-      end # context (:decimal)
-
-    end # context (handwritten)
-  end # describe (NUMBER columns)
-
+    it "should dump float type correctly" do
+      standard_dump.should =~ /t\.float "hourly_rate"$/
+    end
+  end
 end

data/spec/spec_config.yaml.template

@@ -0,0 +1,10 @@
+rails:
+  gem_version: '4.0-master'
+database:
+  name:         'orcl'
+  host:         '127.0.0.1'
+  port:         1521
+  user:         'oracle_enhanced'
+  password:     'oracle_enhanced'
+  sys_password: 'admin'
+timezone: 'Europe/Riga'

data/spec/spec_helper.rb

@@ -1,8 +1,17 @@
-require 'rubygems'
+require "rubygems"
 require "bundler"
+require "yaml"
 Bundler.setup(:default, :development)
 
 $:.unshift(File.expand_path('../../lib', __FILE__))
+config_path = File.expand_path('../spec_config.yaml', __FILE__)
+if File.exist?(config_path)
+  puts "==> Loading config from #{config_path}"
+  config = YAML.load_file(config_path)
+else
+  puts "==> Loading config from ENV or use default"
+  config = {"rails" => {}, "database" => {}}
+end
 
 require 'rspec'
 
@@ -13,10 +22,10 @@ elsif RUBY_ENGINE == 'jruby'
   puts "==> Running specs with JRuby version #{JRUBY_VERSION}"
 end
 
-ENV['RAILS_GEM_VERSION'] ||= '4.0-master'
+ENV['RAILS_GEM_VERSION'] ||= config["rails"]["gem_version"] || '4.0-master'
 NO_COMPOSITE_PRIMARY_KEYS = true
 
-puts "==> Running specs with Rails version #{ENV['RAILS_GEM_VERSION']}"
+puts "==> Selected Rails version #{ENV['RAILS_GEM_VERSION']}"
 
 require 'active_record'
 
@@ -32,6 +41,8 @@ require 'logger'
 require 'active_record/connection_adapters/oracle_enhanced_adapter'
 require 'ruby-plsql'
 
+puts "==> Effective ActiveRecord version #{ActiveRecord::VERSION::STRING}"
+
 module LoggerSpecHelper
   def set_logger
     @logger = MockLogger.new
@@ -109,12 +120,12 @@ module SchemaSpecHelper
   end
 end
 
-DATABASE_NAME = ENV['DATABASE_NAME'] || 'orcl'
-DATABASE_HOST = ENV['DATABASE_HOST']
-DATABASE_PORT = ENV['DATABASE_PORT']
-DATABASE_USER = ENV['DATABASE_USER'] || 'oracle_enhanced'
-DATABASE_PASSWORD = ENV['DATABASE_PASSWORD'] || 'oracle_enhanced'
-DATABASE_SYS_PASSWORD = ENV['DATABASE_SYS_PASSWORD'] || 'admin'
+DATABASE_NAME         = config["database"]["name"]         || ENV['DATABASE_NAME']         || 'orcl'
+DATABASE_HOST         = config["database"]["host"]         || ENV['DATABASE_HOST']         || "127.0.0.1"
+DATABASE_PORT         = config["database"]["port"]         || ENV['DATABASE_PORT']         || 1521
+DATABASE_USER         = config["database"]["user"]         || ENV['DATABASE_USER']         || 'oracle_enhanced'
+DATABASE_PASSWORD     = config["database"]["password"]     || ENV['DATABASE_PASSWORD']     || 'oracle_enhanced'
+DATABASE_SYS_PASSWORD = config["database"]["sys_password"] || ENV['DATABASE_SYS_PASSWORD'] || 'admin'
 
 CONNECTION_PARAMS = {
   :adapter => "oracle_enhanced",
@@ -148,7 +159,7 @@ DATABASE_NON_DEFAULT_TABLESPACE = ENV['DATABASE_NON_DEFAULT_TABLESPACE'] || "SYS
 
 # set default time zone in TZ environment variable
 # which will be used to set session time zone
-ENV['TZ'] ||= 'Europe/Riga'
+ENV['TZ'] ||= config["timezone"] || 'Europe/Riga'
 
 # ActiveRecord::Base.logger = Logger.new(STDOUT)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.6.0.beta1
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -211,25 +211,28 @@ files:
 - VERSION
 - activerecord-oracle_enhanced-adapter.gemspec
 - lib/active_record/connection_adapters/emulation/oracle_adapter.rb
+- lib/active_record/connection_adapters/oracle_enhanced/column.rb
+- lib/active_record/connection_adapters/oracle_enhanced/column_dumper.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/cpk.rb
+- lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb
+- lib/active_record/connection_adapters/oracle_enhanced/database_tasks.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/schema_creation.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.rb
+- lib/active_record/connection_adapters/oracle_enhanced/schema_statements_ext.rb
+- lib/active_record/connection_adapters/oracle_enhanced/structure_dump.rb
+- lib/active_record/connection_adapters/oracle_enhanced/version.rb
 - lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
-- lib/active_record/connection_adapters/oracle_enhanced_column.rb
-- lib/active_record/connection_adapters/oracle_enhanced_column_dumper.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_cpk.rb
-- lib/active_record/connection_adapters/oracle_enhanced_database_statements.rb
-- lib/active_record/connection_adapters/oracle_enhanced_database_tasks.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_schema_creation.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.rb
-- lib/active_record/connection_adapters/oracle_enhanced_schema_statements_ext.rb
-- lib/active_record/connection_adapters/oracle_enhanced_structure_dump.rb
-- lib/active_record/connection_adapters/oracle_enhanced_version.rb
+- lib/active_record/oracle_enhanced/type/integer.rb
+- lib/active_record/oracle_enhanced/type/raw.rb
+- lib/active_record/oracle_enhanced/type/timestamp.rb
 - lib/activerecord-oracle_enhanced-adapter.rb
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb
@@ -244,6 +247,7 @@ files:
 - spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb
+- spec/spec_config.yaml.template
 - spec/spec_helper.rb
 homepage: http://github.com/rsim/oracle-enhanced
 licenses:
@@ -260,12 +264,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord

data/lib/active_record/connection_adapters/oracle_enhanced_column_dumper.rb

@@ -1,77 +0,0 @@
-module ActiveRecord #:nodoc:
-  module ConnectionAdapters #:nodoc:
-    module OracleEnhancedColumnDumper #:nodoc:
-
-      def self.included(base) #:nodoc:
-        base.class_eval do
-          private
-          alias_method_chain :column_spec,            :oracle_enhanced
-          alias_method_chain :prepare_column_options, :oracle_enhanced
-          alias_method_chain :migration_keys,         :oracle_enhanced
-
-          def oracle_enhanced_adapter?
-          # return original method if not using 'OracleEnhanced'
-            if (rails_env = defined?(Rails.env) ? Rails.env : (defined?(RAILS_ENV) ? RAILS_ENV : nil)) &&
-                ActiveRecord::Base.configurations[rails_env] &&
-                ActiveRecord::Base.configurations[rails_env]['adapter'] != 'oracle_enhanced'
-              return false
-            else
-              return true
-            end
-          end
-        end
-      end
-
-      def column_spec_with_oracle_enhanced(column, types)
-        # return original method if not using 'OracleEnhanced'
-        return column_spec_without_oracle_enhanced(column, types) unless oracle_enhanced_adapter?
-        
-        spec = prepare_column_options(column, types)
-        (spec.keys - [:name, :type]).each do |k|
-          key_s = (k == :virtual_type ? "type: " : "#{k.to_s}: ")
-          spec[k] = key_s + spec[k]
-        end
-        spec
-      end
-
-      def prepare_column_options_with_oracle_enhanced(column, types)
-        # return original method if not using 'OracleEnhanced'
-        return prepare_column_options_without_oracle_enhanced(column, types) unless oracle_enhanced_adapter?
-
-        spec = {}
-
-        spec[:name]      = column.name.inspect
-        spec[:type]      = column.virtual? ? 'virtual' : column.type.to_s
-        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?
-
-        if column.virtual?
-          # Supports backwards compatibility with older OracleEnhancedAdapter versions where 'NUMBER' virtual column type is not included in dump
-          if column.sql_type != "NUMBER" || ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.number_datatype_coercion != :decimal
-            spec[:virtual_type] = column.type.inspect
-          end
-        end
-
-        spec
-      end
-
-      def migration_keys_with_oracle_enhanced
-        # TODO `& column_specs.map(&:keys).flatten` should be exetuted here
-        # return original method if not using 'OracleEnhanced'
-        return migration_keys_without_oracle_enhanced unless oracle_enhanced_adapter?
-
-        [:name, :limit, :precision, :scale, :default, :null, :as, :virtual_type]
-      end
-
-
-    end
-  end
-end
-
-ActiveRecord::ConnectionAdapters::ColumnDumper.class_eval do
-  include ActiveRecord::ConnectionAdapters::OracleEnhancedColumnDumper
-end