activerecord-oracle_enhanced-adapter 5.2.8 → 6.0.0.beta1

data/lib/active_record/type/oracle_enhanced/character_string.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "active_model/type/string"
+
+module ActiveRecord
+  module Type
+    module OracleEnhanced
+      class CharacterString < ActiveRecord::Type::OracleEnhanced::String # :nodoc:
+        def serialize(value)
+          return unless value
+          Data.new(super, self.limit)
+        end
+
+        class Data # :nodoc:
+          def initialize(value, limit)
+            @value = value
+            @limit = limit
+          end
+
+          def to_s
+            @value
+          end
+
+          def to_character_str
+            len = @value.to_s.length
+            if len < @limit
+              "%-#{@limit}s" % @value
+            else
+              @value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/active_record/connection_adapters/emulation/oracle_adapter_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 describe "OracleEnhancedAdapter emulate OracleAdapter" do
-
   before(:all) do
     @old_oracle_adapter = nil
     if defined?(ActiveRecord::ConnectionAdapters::OracleAdapter)
@@ -22,5 +21,4 @@ describe "OracleEnhancedAdapter emulate OracleAdapter" do
       ActiveRecord::ConnectionAdapters::OracleAdapter = @old_oracle_adapter
     end
   end
-
 end

data/spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 describe "OracleEnhancedAdapter establish connection" do
-
   it "should connect to database" do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     expect(ActiveRecord::Base.connection).not_to be_nil
@@ -44,7 +43,6 @@ describe "OracleEnhancedAdapter establish connection" do
 end
 
 describe "OracleEnhancedConnection" do
-
   describe "create connection" do
     before(:all) do
       @conn = ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(CONNECTION_PARAMS)
@@ -75,11 +73,9 @@ describe "OracleEnhancedConnection" do
     it "should be in autocommit mode after connection" do
       expect(@conn).to be_autocommit
     end
-
   end
 
   describe "create connection with schema option" do
-
     it "should create new connection" do
       ActiveRecord::Base.establish_connection(CONNECTION_WITH_SCHEMA_PARAMS)
       expect(ActiveRecord::Base.connection).to be_active
@@ -88,68 +84,57 @@ describe "OracleEnhancedConnection" do
     it "should swith to specified schema" do
       ActiveRecord::Base.establish_connection(CONNECTION_WITH_SCHEMA_PARAMS)
       expect(ActiveRecord::Base.connection.current_schema).to eq(CONNECTION_WITH_SCHEMA_PARAMS[:schema].upcase)
+      expect(ActiveRecord::Base.connection.current_user).to eq(CONNECTION_WITH_SCHEMA_PARAMS[:username].upcase)
     end
 
     it "should swith to specified schema after reset" do
       ActiveRecord::Base.connection.reset!
       expect(ActiveRecord::Base.connection.current_schema).to eq(CONNECTION_WITH_SCHEMA_PARAMS[:schema].upcase)
     end
-
   end
 
   describe "create connection with NLS parameters" do
+    after do
+      ENV["NLS_TERRITORY"] = nil
+    end
+
+    it "should use NLS_TERRITORY environment variable" do
+      ENV["NLS_TERRITORY"] = "JAPAN"
+      @conn = ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(CONNECTION_PARAMS)
+      expect(@conn.select("select SYS_CONTEXT('userenv', 'NLS_TERRITORY') as value from dual")).to eq([{ "value" => "JAPAN" }])
+    end
+
+    it "should use configuration value and ignore NLS_TERRITORY environment variable" do
+      ENV["NLS_TERRITORY"] = "AMERICA"
+      @conn = ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(CONNECTION_PARAMS.merge(nls_territory: "INDONESIA"))
+      expect(@conn.select("select SYS_CONTEXT('userenv', 'NLS_TERRITORY') as value from dual")).to eq([{ "value" => "INDONESIA" }])
+    end
+  end
+
+  describe "Fixed NLS parameters" do
     after do
       ENV["NLS_DATE_FORMAT"] = nil
     end
 
-    it "should use NLS_DATE_FORMAT environment variable" do
+    it "should ignore NLS_DATE_FORMAT environment variable" do
       ENV["NLS_DATE_FORMAT"] = "YYYY-MM-DD"
       @conn = ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(CONNECTION_PARAMS)
-      expect(@conn.select("select SYS_CONTEXT('userenv', 'NLS_DATE_FORMAT') as value from dual")).to eq([{ "value" => "YYYY-MM-DD" }])
+      expect(@conn.select("select SYS_CONTEXT('userenv', 'NLS_DATE_FORMAT') as value from dual")).to eq([{ "value" => "YYYY-MM-DD HH24:MI:SS" }])
     end
 
-    it "should use configuration value and ignore NLS_DATE_FORMAT environment variable" do
-      ENV["NLS_DATE_FORMAT"] = "YYYY-MM-DD"
+    it "should ignore NLS_DATE_FORMAT configuration value" do
       @conn = ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(CONNECTION_PARAMS.merge(nls_date_format: "YYYY-MM-DD HH24:MI"))
-      expect(@conn.select("select SYS_CONTEXT('userenv', 'NLS_DATE_FORMAT') as value from dual")).to eq([{ "value" => "YYYY-MM-DD HH24:MI" }])
+      expect(@conn.select("select SYS_CONTEXT('userenv', 'NLS_DATE_FORMAT') as value from dual")).to eq([{ "value" => "YYYY-MM-DD HH24:MI:SS" }])
     end
 
     it "should use default value when NLS_DATE_FORMAT environment variable is not set" do
       ENV["NLS_DATE_FORMAT"] = nil
       @conn = ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(CONNECTION_PARAMS)
-      default = ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter::DEFAULT_NLS_PARAMETERS[:nls_date_format]
+      default = ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter::FIXED_NLS_PARAMETERS[:nls_date_format]
       expect(@conn.select("select SYS_CONTEXT('userenv', 'NLS_DATE_FORMAT') as value from dual")).to eq([{ "value" => default }])
     end
   end
 
-  if defined?(OCI8)
-    describe "with TCP keepalive parameters" do
-      it "should use database default `tcp_keepalive` value true by default" do
-        ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(CONNECTION_PARAMS)
-
-        expect(OCI8.properties[:tcp_keepalive]).to be true
-      end
-
-      it "should use modified `tcp_keepalive` value false" do
-        ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(CONNECTION_PARAMS.dup.merge(tcp_keepalive: false))
-
-        expect(OCI8.properties[:tcp_keepalive]).to be false
-      end
-
-      it "should use database default `tcp_keepalive_time` value 600 by default" do
-        ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(CONNECTION_PARAMS)
-
-        expect(OCI8.properties[:tcp_keepalive_time]).to eq(600)
-      end
-
-      it "should use modified `tcp_keepalive_time` value 3000" do
-        ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(CONNECTION_PARAMS.dup.merge(tcp_keepalive_time: 3000))
-
-        expect(OCI8.properties[:tcp_keepalive_time]).to eq(3000)
-      end
-    end
-  end
-
   describe "with non-string parameters" do
     before(:all) do
       params = CONNECTION_PARAMS.dup
@@ -202,7 +187,6 @@ describe "OracleEnhancedConnection" do
       created_at = post.created_at
       expect(post).to eq(Post.find_by!(created_at: created_at))
     end
-
   end
 
   describe 'with host="connection-string"' do
@@ -225,7 +209,6 @@ describe "OracleEnhancedConnection" do
   if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
 
     describe "create JDBC connection" do
-
       it "should create new connection using :url" do
         params = CONNECTION_PARAMS.dup
         params[:url] = "jdbc:oracle:thin:@#{DATABASE_HOST && "//#{DATABASE_HOST}#{DATABASE_PORT && ":#{DATABASE_PORT}"}/"}#{DATABASE_NAME}"
@@ -253,7 +236,6 @@ describe "OracleEnhancedConnection" do
       end
 
       it "should create a new connection using JNDI" do
-
         begin
           import "oracle.jdbc.driver.OracleDriver"
           import "org.apache.commons.pool.impl.GenericObjectPool"
@@ -274,7 +256,7 @@ describe "OracleEnhancedConnection" do
             @data_source.access_to_underlying_connection_allowed = true
           end
           def lookup(path)
-            if (path == "java:/comp/env")
+            if path == "java:/comp/env"
               self
             else
               @data_source
@@ -289,7 +271,6 @@ describe "OracleEnhancedConnection" do
         @conn = ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(params)
         expect(@conn).to be_active
       end
-
     end
 
     it "should fall back to directly instantiating OracleDriver" do
@@ -320,7 +301,6 @@ describe "OracleEnhancedConnection" do
     it "should execute SQL select and return also columns" do
       expect(@conn.select("SELECT * FROM dual", nil, true)).to eq([ [{ "dummy" => "X" }], ["dummy"] ])
     end
-
   end
 
   describe "SQL with bind parameters" do
@@ -432,7 +412,6 @@ describe "OracleEnhancedConnection" do
         expect { @conn.select("SELECT * FROM dual") }.to raise_error(OCIError)
       end
     end
-
   end
 
   describe "describe table" do
@@ -483,15 +462,11 @@ describe "OracleEnhancedConnection" do
 
     if defined?(OCI8)
       context "OCI8 adapter" do
-
         it "should not fallback to SELECT-based logic when querying non-existent table information" do
           expect(@conn).not_to receive(:select_one)
           @conn.describe("non_existent") rescue ActiveRecord::ConnectionAdapters::OracleEnhanced::ConnectionException
         end
-
       end
     end
-
   end
-
 end

data/spec/active_record/connection_adapters/oracle_enhanced/context_index_spec.rb

@@ -131,10 +131,10 @@ describe "OracleEnhancedAdapter context index" do
       @post = Post.create(title: "abc", body: "def")
       expect(Post.contains(:all_text, "abc").to_a).to eq([@post])
       expect(Post.contains(:all_text, "def").to_a).to eq([@post])
-      @post.update_attributes!(title: "ghi")
+      @post.update!(title: "ghi")
       # index will not be updated as all_text column is not changed
       expect(Post.contains(:all_text, "ghi").to_a).to be_empty
-      @post.update_attributes!(all_text: "1")
+      @post.update!(all_text: "1")
       # index will be updated when all_text column is changed
       expect(Post.contains(:all_text, "ghi").to_a).to eq([@post])
       @conn.remove_context_index :posts, index_column: :all_text
@@ -147,7 +147,7 @@ describe "OracleEnhancedAdapter context index" do
       @post = Post.create(title: "abc", body: "def")
       expect(Post.contains(:all_text, "abc").to_a).to eq([@post])
       expect(Post.contains(:all_text, "def").to_a).to eq([@post])
-      @post.update_attributes!(title: "ghi")
+      @post.update!(title: "ghi")
       # index should be updated as created_at column is changed
       expect(Post.contains(:all_text, "ghi").to_a).to eq([@post])
       @conn.remove_context_index :posts, index_column: :all_text
@@ -168,7 +168,7 @@ describe "OracleEnhancedAdapter context index" do
       Post.transaction do
         @post = Post.create(title: "abc")
         expect(Post.contains(:title, "abc").to_a).to eq([@post])
-        @post.update_attributes!(title: "ghi")
+        @post.update!(title: "ghi")
         expect(Post.contains(:title, "ghi").to_a).to eq([@post])
       end
       @conn.remove_context_index :posts, :title
@@ -265,7 +265,6 @@ describe "OracleEnhancedAdapter context index" do
       expect(Post.contains(:all_text, "ddd within comment_body").to_a).to eq([@post])
       expect(Post.contains(:all_text, "ddd within comment_author").to_a).to be_empty
     end
-
   end
 
   describe "with specified tablespace" do
@@ -311,13 +310,10 @@ describe "OracleEnhancedAdapter context index" do
       expect(Post.contains(:title, "aaa AND bbb").to_a).to eq([@post])
       @conn.remove_context_index :posts, name: "index_posts_text"
     end
-
   end
 
   describe "schema dump" do
-
     describe "without table prefixe and suffix" do
-
       before(:all) do
         @conn = ActiveRecord::Base.connection
         create_tables
@@ -382,7 +378,6 @@ describe "OracleEnhancedAdapter context index" do
         expect(output).to match(/add_context_index "posts", \[:title, :body, "#{sub_query.gsub(/\n/, ' ')}"\], #{options.inspect[1..-2]}$/)
         @conn.remove_context_index :posts, name: "post_and_comments_index"
       end
-
     end
 
     describe "with table prefix and suffix" do
@@ -428,12 +423,9 @@ describe "OracleEnhancedAdapter context index" do
         end
         output = dump_table_schema "posts"
         expect(output).to match(/add_context_index "posts", \[:title, :body, "SELECT comments.author AS comment_author, comments.body AS comment_body FROM comments WHERE comments.post_id = :id"\], #{
-          options.inspect[1..-2].gsub(/[{}]/) { |s| '\\'.dup << s }}$/)
+          options.inspect[1..-2].gsub(/[{}]/) { |s| +'\\' << s }}$/)
         schema_define { remove_context_index :posts, name: "xxx_post_and_comments_i" }
       end
-
     end
-
   end
-
 end

data/spec/active_record/connection_adapters/oracle_enhanced/procedures_spec.rb

@@ -87,7 +87,6 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
         END delete_employee;
       END;
     SQL
-
   end
 
   after(:all) do
@@ -361,5 +360,4 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     expect(@employee.save).to be_falsey
     expect(@employee.errors[:first_name]).not_to be_blank
   end
-
 end

data/spec/active_record/connection_adapters/oracle_enhanced/quoting_spec.rb

@@ -9,7 +9,6 @@ describe "OracleEnhancedAdapter quoting" do
   end
 
   describe "reserved words column quoting" do
-
     before(:all) do
       schema_define do
         create_table :test_reserved_words do |t|
@@ -60,7 +59,6 @@ describe "OracleEnhancedAdapter quoting" do
     it "should remove double quotes in column quoting" do
       expect(ActiveRecord::Base.connection.quote_column_name('aaa "bbb" ccc')).to eq('"aaa bbb ccc"')
     end
-
   end
 
   describe "valid table names" do
@@ -88,10 +86,6 @@ describe "OracleEnhancedAdapter quoting" do
       expect(@adapter.valid_table_name?("ABC_123.DEF_456")).to be_truthy
     end
 
-    it "should be valid with irregular schema name and database links" do
-      expect(@adapter.valid_table_name?('abc$#_123.abc$#_123@abc$#@._123')).to be_truthy
-    end
-
     it "should not be valid with two dots in name" do
       expect(@adapter.valid_table_name?("abc_123.def_456.ghi_789")).to be_falsey
     end
@@ -114,10 +108,6 @@ describe "OracleEnhancedAdapter quoting" do
       expect(@adapter.valid_table_name?(("a" * 31) + ".validname")).to be_falsey
     end
 
-    it "should not be valid for database links > 128 characters" do
-      expect(@adapter.valid_table_name?("name@" + "a" * 129)).to be_falsey
-    end
-
     it "should not be valid for names that do not begin with alphabetic characters" do
       expect(@adapter.valid_table_name?("1abc")).to be_falsey
       expect(@adapter.valid_table_name?("_abc")).to be_falsey
@@ -127,7 +117,6 @@ describe "OracleEnhancedAdapter quoting" do
   end
 
   describe "table quoting" do
-
     def create_warehouse_things_table
       ActiveRecord::Schema.define do
         suppress_messages do
@@ -188,9 +177,5 @@ describe "OracleEnhancedAdapter quoting" do
 
       expect(@conn.tables).to include("CamelCase")
     end
-
-    it "properly quotes database links" do
-      expect(@conn.quote_table_name("asdf@some.link")).to eq('"ASDF"@"SOME.LINK"')
-    end
   end
 end

data/spec/active_record/connection_adapters/oracle_enhanced/schema_dumper_spec.rb

@@ -19,7 +19,7 @@ describe "OracleEnhancedAdapter schema dump" do
   end
 
   def create_test_posts_table(options = {})
-    options.merge! force: true
+    options[:force] = true
     schema_define do
       create_table :test_posts, options do |t|
         t.string :title
@@ -51,7 +51,6 @@ describe "OracleEnhancedAdapter schema dump" do
       create_test_posts_table
       expect(standard_dump(ignore_tables: [ /test_posts/i ])).not_to match(/create_table "test_posts"/)
     end
-
   end
 
   describe "dumping default values" do
@@ -86,7 +85,6 @@ describe "OracleEnhancedAdapter schema dump" do
       output = dump_table_schema "test_posts"
       expect(output).to match(/create_table "test_posts", primary_key: "post_id"/)
     end
-
   end
 
   describe "table with ntext columns" do
@@ -110,24 +108,6 @@ describe "OracleEnhancedAdapter schema dump" do
     end
   end
 
-  describe "table with primary key trigger" do
-
-    after(:each) do
-      drop_test_posts_table
-    end
-
-    it "should include primary key trigger in schema dump" do
-      create_test_posts_table(primary_key_trigger: true)
-      expect(standard_dump).to match(/create_table "test_posts".*add_primary_key_trigger "test_posts"/m)
-    end
-
-    it "should include primary key trigger with non-default primary key in schema dump" do
-      create_test_posts_table(primary_key_trigger: true, primary_key: "post_id")
-      expect(standard_dump).to match(/create_table "test_posts", primary_key: "post_id".*add_primary_key_trigger "test_posts", primary_key: "post_id"/m)
-    end
-
-  end
-
   describe "foreign key constraints" do
     before(:all) do
       schema_define do
@@ -235,7 +215,6 @@ describe "OracleEnhancedAdapter schema dump" do
       output = dump_table_schema "test_comments"
       expect(output).to match(/add_foreign_key "test_comments", "test_posts", column: "baz_id", primary_key: "baz_id", name: "test_comments_baz_id_fk"/)
     end
-
   end
 
   describe "synonyms" do
@@ -252,13 +231,6 @@ describe "OracleEnhancedAdapter schema dump" do
       expect(standard_dump).to match(/add_synonym "test_synonym", "schema_name.table_name", force: true/)
     end
 
-    it "should include synonym to other database table in schema dump" do
-      schema_define do
-        add_synonym :test_synonym, "table_name@link_name", force: true
-      end
-      expect(standard_dump).to match(/add_synonym "test_synonym", "table_name@link_name(\.[-A-Za-z0-9_]+)*", force: true/)
-    end
-
     it "should not include ignored table names in schema dump" do
       schema_define do
         add_synonym :test_synonym, "schema_name.table_name", force: true
@@ -279,7 +251,6 @@ describe "OracleEnhancedAdapter schema dump" do
       end
       expect(standard_dump(ignore_tables: [ /table_name/i ])).to match(/add_synonym "test_synonym"/)
     end
-
   end
 
   describe "temporary tables" do
@@ -319,7 +290,6 @@ describe "OracleEnhancedAdapter schema dump" do
       output = dump_table_schema "test_posts"
       expect(output).to match(/t\.index \["NVL\(\\"CREATED_AT\\",\\"UPDATED_AT\\"\)"\], name: "index_test_posts_cr_upd_at"$/)
     end
-
   end
 
   describe "materialized views" do