activerecord-oracle_enhanced-adapter 1.8.2 → 5.2.0.beta1

data/spec/active_record/connection_adapters/{oracle_enhanced_context_index_spec.rb → oracle_enhanced/context_index_spec.rb}

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 describe "OracleEnhancedAdapter context index" do
   include SchemaSpecHelper
   include LoggerSpecHelper
+  include SchemaDumpingHelper
 
   def create_table_posts
     schema_define do
@@ -313,13 +316,6 @@ describe "OracleEnhancedAdapter context index" do
 
   describe "schema dump" do
 
-    def standard_dump
-      stream = StringIO.new
-      ActiveRecord::SchemaDumper.ignore_tables = []
-      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-      stream.string
-    end
-
     describe "without table prefixe and suffix" do
 
       before(:all) do
@@ -333,13 +329,15 @@ describe "OracleEnhancedAdapter context index" do
 
       it "should dump definition of single column index" do
         @conn.add_context_index :posts, :title
-        expect(standard_dump).to match(/add_context_index "posts", \["title"\], name: \"index_posts_on_title\"$/)
+        output = dump_table_schema "posts"
+        expect(output).to match(/add_context_index "posts", \["title"\], name: \"index_posts_on_title\"$/)
         @conn.remove_context_index :posts, :title
       end
 
       it "should dump definition of multiple column index" do
         @conn.add_context_index :posts, [:title, :body]
-        expect(standard_dump).to match(/add_context_index "posts", \[:title, :body\]$/)
+        output = dump_table_schema "posts"
+        expect(output).to match(/add_context_index "posts", \[:title, :body\]$/)
         @conn.remove_context_index :posts, [:title, :body]
       end
 
@@ -352,7 +350,8 @@ describe "OracleEnhancedAdapter context index" do
         }
         sub_query = "SELECT comments.author AS comment_author, comments.body AS comment_body FROM comments WHERE comments.post_id = :id"
         @conn.add_context_index :posts, [:title, :body, sub_query], options
-        expect(standard_dump).to match(/add_context_index "posts", \[:title, :body, "#{sub_query}"\], #{options.inspect[1..-2]}$/)
+        output = dump_table_schema "posts"
+        expect(output).to match(/add_context_index "posts", \[:title, :body, "#{sub_query}"\], #{options.inspect[1..-2]}$/)
         @conn.remove_context_index :posts, name: "post_and_comments_index"
       end
 
@@ -365,7 +364,8 @@ describe "OracleEnhancedAdapter context index" do
         }
         sub_query = "SELECT comments.author AS comment_author, comments.body AS comment_body FROM comments WHERE comments.post_id = :id#{' AND 1=1' * 500}"
         @conn.add_context_index :posts, [:title, :body, sub_query], options
-        expect(standard_dump).to match(/add_context_index "posts", \[:title, :body, "#{sub_query}"\], #{options.inspect[1..-2]}$/)
+        output = dump_table_schema "posts"
+        expect(output).to match(/add_context_index "posts", \[:title, :body, "#{sub_query}"\], #{options.inspect[1..-2]}$/)
         @conn.remove_context_index :posts, name: "post_and_comments_index"
       end
 
@@ -378,7 +378,8 @@ describe "OracleEnhancedAdapter context index" do
         }
         sub_query = "SELECT comments.author AS comment_author, comments.body AS comment_body\nFROM comments\nWHERE comments.post_id = :id"
         @conn.add_context_index :posts, [:title, :body, sub_query], options
-        expect(standard_dump).to match(/add_context_index "posts", \[:title, :body, "#{sub_query.gsub(/\n/, ' ')}"\], #{options.inspect[1..-2]}$/)
+        output = dump_table_schema "posts"
+        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
 
@@ -399,13 +400,15 @@ describe "OracleEnhancedAdapter context index" do
 
       it "should dump definition of single column index" do
         schema_define { add_context_index :posts, :title }
-        expect(standard_dump).to match(/add_context_index "posts", \["title"\], name: "i_xxx_posts_xxx_title"$/)
+        output = dump_table_schema "posts"
+        expect(output).to match(/add_context_index "posts", \["title"\], name: "i_xxx_posts_xxx_title"$/)
         schema_define { remove_context_index :posts, :title }
       end
 
       it "should dump definition of multiple column index" do
         schema_define { add_context_index :posts, [:title, :body] }
-        expect(standard_dump).to match(/add_context_index "posts", \[:title, :body\]$/)
+        output = dump_table_schema "posts"
+        expect(output).to match(/add_context_index "posts", \[:title, :body\]$/)
         schema_define { remove_context_index :posts, [:title, :body] }
       end
 
@@ -423,8 +426,9 @@ describe "OracleEnhancedAdapter context index" do
             "SELECT comments.author AS comment_author, comments.body AS comment_body FROM comments WHERE comments.post_id = :id"
             ], options
         end
-        expect(standard_dump).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| '\\' << s }}$/)
+        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 }}$/)
         schema_define { remove_context_index :posts, name: "xxx_post_and_comments_i" }
       end
 

data/spec/active_record/connection_adapters/{oracle_enhanced_database_tasks_spec.rb → oracle_enhanced/database_tasks_spec.rb}

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+
 require "active_record/connection_adapters/oracle_enhanced/database_tasks"
 require "stringio"
 require "tempfile"
 
 describe "Oracle Enhanced adapter database tasks" do
+  include SchemaSpecHelper
+
   let(:config) { CONNECTION_PARAMS.with_indifferent_access }
 
   describe "create" do
@@ -17,7 +21,7 @@ describe "Oracle Enhanced adapter database tasks" do
       expect(ActiveRecord::Base.connection.select_value(query)).to eq(1)
     end
     after do
-      ActiveRecord::Base.connection.execute("DROP USER #{new_user_config[:username]}");
+      ActiveRecord::Base.connection.execute("DROP USER #{new_user_config[:username]}")
     end
 
     def fake_terminal(input)
@@ -44,7 +48,11 @@ describe "Oracle Enhanced adapter database tasks" do
 
     before do
       ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-      ActiveRecord::Base.connection.execute "CREATE TABLE test_posts (name VARCHAR2(20))"
+      schema_define do
+        create_table :test_posts, force: true do |t|
+          t.string :name, limit: 20
+        end
+      end
     end
 
     describe "drop" do
@@ -63,7 +71,7 @@ describe "Oracle Enhanced adapter database tasks" do
     end
 
     describe "structure" do
-      let(:temp_file) { Tempfile.new(["oracle_enhanced", ".sql"]).path }
+      let(:temp_file) { Tempfile.create(["oracle_enhanced", ".sql"]).path }
       before do
         ActiveRecord::SchemaMigration.create_table
         ActiveRecord::Base.connection.execute "INSERT INTO schema_migrations (version) VALUES ('20150101010000')"
@@ -90,11 +98,15 @@ describe "Oracle Enhanced adapter database tasks" do
       end
 
       after do
-        File.delete(temp_file)
+        File.unlink(temp_file)
         ActiveRecord::SchemaMigration.drop_table
       end
     end
 
-    after { ActiveRecord::Base.connection.execute "DROP TABLE test_posts" rescue nil }
+    after do
+      schema_define do
+        drop_table :test_posts, if_exists: true
+      end
+    end
   end
 end

data/spec/active_record/connection_adapters/{oracle_enhanced_dbms_output_spec.rb → oracle_enhanced/dbms_output_spec.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe "OracleEnhancedAdapter logging dbms_output from plsql" do
   include LoggerSpecHelper
 

data/spec/active_record/connection_adapters/{oracle_enhanced_procedures_spec.rb → oracle_enhanced/procedures_spec.rb}

@@ -1,33 +1,28 @@
+# frozen_string_literal: true
+
 require "ruby-plsql"
 
 describe "OracleEnhancedAdapter custom methods for create, update and destroy" do
   include LoggerSpecHelper
+  include SchemaSpecHelper
 
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
     plsql.activerecord_class = ActiveRecord::Base
-    @conn.execute("DROP TABLE test_employees") rescue nil
-    @conn.execute <<-SQL
-      CREATE TABLE test_employees (
-        employee_id   NUMBER(6,0) PRIMARY KEY,
-        first_name    VARCHAR2(20),
-        last_name     VARCHAR2(25),
-        hire_date     DATE,
-        salary        NUMBER(8,2),
-        description   CLOB,
-        version       NUMBER(15,0),
-        create_time   DATE,
-        update_time   DATE,
-        created_at    DATE,
-        updated_at    DATE
-      )
-    SQL
-    @conn.execute("DROP SEQUENCE test_employees_s") rescue nil
-    @conn.execute <<-SQL
-      CREATE SEQUENCE test_employees_s  MINVALUE 1
-        INCREMENT BY 1 CACHE 20 NOORDER NOCYCLE
-    SQL
+    schema_define do
+      create_table :test_employees, force: true do |t|
+        t.string  :first_name, limit: 20
+        t.string  :last_name, limit: 25
+        t.date    :hire_date
+        t.decimal :salary, scale: 2, precision: 8
+        t.text    :description
+        t.decimal :version, scale: 0, precision: 15
+        t.date    :create_time
+        t.date    :update_time
+        t.timestamps null: true
+      end
+    end
     @conn.execute <<-SQL
       CREATE OR REPLACE PACKAGE test_employees_pkg IS
         PROCEDURE create_employee(
@@ -59,8 +54,8 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
             p_employee_id   OUT NUMBER)
         IS
         BEGIN
-          SELECT test_employees_s.NEXTVAL INTO p_employee_id FROM dual;
-          INSERT INTO test_employees (employee_id, first_name, last_name, hire_date, salary, description,
+          SELECT test_employees_seq.NEXTVAL INTO p_employee_id FROM dual;
+          INSERT INTO test_employees (id, first_name, last_name, hire_date, salary, description,
                                       version, create_time, update_time)
           VALUES (p_employee_id, p_first_name, p_last_name, p_hire_date, p_salary, p_description,
                                       1, SYSDATE, SYSDATE);
@@ -76,19 +71,19 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
         IS
             v_version       NUMBER;
         BEGIN
-          SELECT version INTO v_version FROM test_employees WHERE employee_id = p_employee_id FOR UPDATE;
+          SELECT version INTO v_version FROM test_employees WHERE id = p_employee_id FOR UPDATE;
           UPDATE test_employees
           SET first_name = p_first_name, last_name = p_last_name,
               hire_date = p_hire_date, salary = p_salary, description = p_description,
               version = v_version + 1, update_time = SYSDATE
-          WHERE employee_id = p_employee_id;
+          WHERE id = p_employee_id;
         END update_employee;
 
         PROCEDURE delete_employee(
             p_employee_id   NUMBER)
         IS
         BEGIN
-          DELETE FROM test_employees WHERE employee_id = p_employee_id;
+          DELETE FROM test_employees WHERE id = p_employee_id;
         END delete_employee;
       END;
     SQL
@@ -97,15 +92,13 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
 
   after(:all) do
     @conn = ActiveRecord::Base.connection
-    @conn.execute "DROP TABLE test_employees"
-    @conn.execute "DROP SEQUENCE test_employees_s"
+    @conn.drop_table :test_employees, if_exists: true
     @conn.execute "DROP PACKAGE test_employees_pkg"
   end
 
   before(:each) do
     class ::TestEmployee < ActiveRecord::Base
       include ActiveRecord::OracleEnhancedProcedures
-      self.primary_key = :employee_id
 
       validates_presence_of :first_name, :last_name, :hire_date
 
@@ -255,7 +248,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     empl_id = @employee.id
     @employee.destroy
     expect(@employee).to be_frozen
-    expect(TestEmployee.find_by_employee_id(empl_id)).to be_nil
+    expect(TestEmployee.find_by_id(empl_id)).to be_nil
   end
 
   it "should delete record and set destroyed flag" do
@@ -284,7 +277,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       @employee.destroy
     }.to raise_error("Make the transaction rollback")
     expect(@employee.id).to eq(empl_id)
-    expect(TestEmployee.find_by_employee_id(empl_id)).not_to be_nil
+    expect(TestEmployee.find_by_id(empl_id)).not_to be_nil
     clear_logger
   end
 
@@ -333,7 +326,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     )
     set_logger
     @employee.save!
-    expect(@logger.logged(:debug).last).to match(/^TestEmployee Update \(\d+\.\d+(ms)?\)  custom update method with employee_id=#{@employee.id}$/)
+    expect(@logger.logged(:debug).last).to match(/^TestEmployee Update \(\d+\.\d+(ms)?\)  custom update method with id=#{@employee.id}$/)
     clear_logger
   end
 
@@ -345,7 +338,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     )
     set_logger
     @employee.destroy
-    expect(@logger.logged(:debug).last).to match(/^TestEmployee Destroy \(\d+\.\d+(ms)?\)  custom delete method with employee_id=#{@employee.id}$/)
+    expect(@logger.logged(:debug).last).to match(/^TestEmployee Destroy \(\d+\.\d+(ms)?\)  custom delete method with id=#{@employee.id}$/)
     clear_logger
   end
 

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

@@ -0,0 +1,196 @@
+# frozen_string_literal: true
+
+describe "OracleEnhancedAdapter quoting" do
+  include LoggerSpecHelper
+  include SchemaSpecHelper
+
+  before(:all) do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+  end
+
+  describe "reserved words column quoting" do
+
+    before(:all) do
+      schema_define do
+        create_table :test_reserved_words do |t|
+          t.string      :varchar2
+          t.integer     :integer
+          t.text        :comment
+        end
+      end
+      class ::TestReservedWord < ActiveRecord::Base; end
+    end
+
+    after(:all) do
+      schema_define do
+        drop_table :test_reserved_words
+      end
+      Object.send(:remove_const, "TestReservedWord")
+      ActiveRecord::Base.table_name_prefix = nil
+      ActiveRecord::Base.clear_cache!
+    end
+
+    before(:each) do
+      set_logger
+    end
+
+    after(:each) do
+      clear_logger
+    end
+
+    it "should create table" do
+      [:varchar2, :integer, :comment].each do |attr|
+        expect(TestReservedWord.columns_hash[attr.to_s].name).to eq(attr.to_s)
+      end
+    end
+
+    it "should create record" do
+      attrs = {
+        varchar2: "dummy",
+        integer: 1,
+        comment: "dummy"
+      }
+      record = TestReservedWord.create!(attrs)
+      record.reload
+      attrs.each do |k, v|
+        expect(record.send(k)).to eq(v)
+      end
+    end
+
+    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
+    before(:all) do
+      @adapter = ActiveRecord::ConnectionAdapters::OracleEnhanced::Quoting
+    end
+
+    it "should be valid with letters and digits" do
+      expect(@adapter.valid_table_name?("abc_123")).to be_truthy
+    end
+
+    it "should be valid with schema name" do
+      expect(@adapter.valid_table_name?("abc_123.def_456")).to be_truthy
+    end
+
+    it "should be valid with schema name and object name in different case" do
+      expect(@adapter.valid_table_name?("TEST_DBA.def_456")).to be_truthy
+    end
+
+    it "should be valid with $ in name" do
+      expect(@adapter.valid_table_name?("sys.v$session")).to be_truthy
+    end
+
+    it "should be valid with upcase schema name" 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
+
+    it "should not be valid with invalid characters" do
+      expect(@adapter.valid_table_name?("warehouse-things")).to be_falsey
+    end
+
+    it "should not be valid with for camel-case" do
+      expect(@adapter.valid_table_name?("Abc")).to be_falsey
+      expect(@adapter.valid_table_name?("aBc")).to be_falsey
+      expect(@adapter.valid_table_name?("abC")).to be_falsey
+    end
+
+    it "should not be valid for names > 30 characters" do
+      expect(@adapter.valid_table_name?("a" * 31)).to be_falsey
+    end
+
+    it "should not be valid for schema names > 30 characters" 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
+      expect(@adapter.valid_table_name?("abc.1xyz")).to be_falsey
+      expect(@adapter.valid_table_name?("abc._xyz")).to be_falsey
+    end
+  end
+
+  describe "table quoting" do
+
+    def create_warehouse_things_table
+      ActiveRecord::Schema.define do
+        suppress_messages do
+          create_table "warehouse-things" do |t|
+            t.string      :name
+            t.integer     :foo
+          end
+        end
+      end
+    end
+
+    def create_camel_case_table
+      ActiveRecord::Schema.define do
+        suppress_messages do
+          create_table "CamelCase" do |t|
+            t.string      :name
+            t.integer     :foo
+          end
+        end
+      end
+    end
+
+    before(:all) do
+      @conn = ActiveRecord::Base.connection
+    end
+
+    after(:each) do
+      ActiveRecord::Schema.define do
+        suppress_messages do
+          drop_table "warehouse-things", if_exists: true
+          drop_table "CamelCase", if_exists: true
+        end
+      end
+      Object.send(:remove_const, "WarehouseThing") rescue nil
+      Object.send(:remove_const, "CamelCase") rescue nil
+    end
+
+    it "should allow creation of a table with non alphanumeric characters" do
+      create_warehouse_things_table
+      class ::WarehouseThing < ActiveRecord::Base
+        self.table_name = "warehouse-things"
+      end
+
+      wh = WarehouseThing.create!(name: "Foo", foo: 2)
+      expect(wh.id).not_to be_nil
+
+      expect(@conn.tables).to include("warehouse-things")
+    end
+
+    it "should allow creation of a table with CamelCase name" do
+      create_camel_case_table
+      class ::CamelCase < ActiveRecord::Base
+        self.table_name = "CamelCase"
+      end
+
+      cc = CamelCase.create!(name: "Foo", foo: 2)
+      expect(cc.id).not_to be_nil
+
+      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