Merge pull request #2074 from yahonda/enable_style_redundant_regexp_escape_cop

Enable  `Style/RedundantRegexpEscape` cop

Author: yahonda

.rubocop.yml

@@ -204,6 +204,9 @@ Style/RedundantReturn:
   Enabled: true
   AllowMultipleReturnValues: true
 
+Style/RedundantRegexpEscape:
+  Enabled: true
+
 Style/Semicolon:
   Enabled: true
   AllowAsExpressionSeparator: true

lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb

@@ -113,7 +113,7 @@ def new_connection(config)
             if database && (using_tns_alias || host == "connection-string")
               url = "jdbc:oracle:thin:@#{database}"
             else
-              unless database.match?(/^(\:|\/)/)
+              unless database.match?(/^(:|\/)/)
                 # assume database is a SID if no colon or slash are supplied (backward-compatibility)
                 database = "/#{database}"
               end

lib/active_record/connection_adapters/oracle_enhanced/quoting.rb

@@ -12,7 +12,7 @@ def quote_column_name(name) #:nodoc:
           name = name.to_s
           self.class.quoted_column_names[name] ||= begin
             # if only valid lowercase column characters in name
-            if /\A[a-z][a-z_0-9\$#]*\Z/.match?(name)
+            if /\A[a-z][a-z_0-9$#]*\Z/.match?(name)
               "\"#{name.upcase}\""
             else
               # remove double quotes which cannot be used inside quoted identifier
@@ -27,9 +27,9 @@ def quote_column_name_or_expression(name) #:nodoc:
           name = name.to_s
           case name
           # if only valid lowercase column characters in name
-          when /^[a-z][a-z_0-9\$#]*$/
+          when /^[a-z][a-z_0-9$#]*$/
             "\"#{name.upcase}\""
-          when /^[a-z][a-z_0-9\$#\-]*$/i
+          when /^[a-z][a-z_0-9$#\-]*$/i
             "\"#{name}\""
           # if other characters present then assume that it is expression
           # which should not be quoted

spec/active_record/connection_adapters/oracle_enhanced/context_index_spec.rb

@@ -326,7 +326,7 @@ def verify_logged_statements
       it "should dump definition of single column index" do
         @conn.add_context_index :posts, :title
         output = dump_table_schema "posts"
-        expect(output).to match(/add_context_index "posts", \["title"\], name: \"index_posts_on_title\"$/)
+        expect(output).to match(/add_context_index "posts", \["title"\], name: "index_posts_on_title"$/)
         @conn.remove_context_index :posts, :title
       end
 

spec/active_record/connection_adapters/oracle_enhanced/schema_dumper_spec.rb

@@ -71,7 +71,7 @@ def drop_test_posts_table
 
     it "should be able to dump default values using special characters" do
       output = dump_table_schema "test_defaults"
-      expect(output).to match(/t.string \"special_c\", default: "\\n"/)
+      expect(output).to match(/t.string "special_c", default: "\\n"/)
     end
   end
 
@@ -104,7 +104,7 @@ def drop_test_posts_table
 
     it "should be able to dump ntext columns" do
       output = dump_table_schema "test_ntexts"
-      expect(output).to match(/t.ntext \"ntext_column\"/)
+      expect(output).to match(/t.ntext "ntext_column"/)
     end
   end
 
@@ -370,7 +370,7 @@ class ::TestName < ActiveRecord::Base
       expect(output).to match(/t\.virtual "full_name",(\s*)type: :string,(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\""/)
       expect(output).to match(/t\.virtual "short_name",(\s*)type: :string,(\s*)limit: 300,(\s*)as:(.*)/)
       expect(output).to match(/t\.virtual "full_name_length",(\s*)type: :integer,(\s*)precision: 38,(\s*)as:(.*)/)
-      expect(output).to match(/t\.virtual "name_ratio",(\s*)as:(.*)\"$/) # no :type
+      expect(output).to match(/t\.virtual "name_ratio",(\s*)as:(.*)"$/) # no :type
       expect(output).to match(/t\.virtual "abbrev_name",(\s*)type: :string,(\s*)limit: 100,(\s*)as:(.*)/)
       expect(output).to match(/t\.virtual "field_with_leading_space",(\s*)type: :string,(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '"/)
     end

spec/active_record/connection_adapters/oracle_enhanced/structure_dump_spec.rb

@@ -68,7 +68,7 @@ class ::TestPost < ActiveRecord::Base
       SQL
       dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
       expect(dump.split('\n').length).to eq(1)
-      expect(dump).to match(/ALTER TABLE \"?TEST_POSTS\"? ADD CONSTRAINT \"?FK_TEST_POST_FOO\"? FOREIGN KEY \(\"?FOO_ID\"?\) REFERENCES \"?FOOS\"?\(\"?ID\"?\)/i)
+      expect(dump).to match(/ALTER TABLE "?TEST_POSTS"? ADD CONSTRAINT "?FK_TEST_POST_FOO"? FOREIGN KEY \("?FOO_ID"?\) REFERENCES "?FOOS"?\("?ID"?\)/i)
     end
 
     it "should dump foreign keys when reference column name is not 'id'" do
@@ -88,7 +88,7 @@ class ::TestPost < ActiveRecord::Base
 
       dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
       expect(dump.split('\n').length).to eq(1)
-      expect(dump).to match(/ALTER TABLE \"?TEST_POSTS\"? ADD CONSTRAINT \"?FK_TEST_POST_BAZ\"? FOREIGN KEY \(\"?BAZ_ID\"?\) REFERENCES \"?FOOS\"?\(\"?BAZ_ID\"?\)/i)
+      expect(dump).to match(/ALTER TABLE "?TEST_POSTS"? ADD CONSTRAINT "?FK_TEST_POST_BAZ"? FOREIGN KEY \("?BAZ_ID"?\) REFERENCES "?FOOS"?\("?BAZ_ID"?\)/i)
     end
 
     it "should not error when no foreign keys are present" do
@@ -136,7 +136,7 @@ class ::TestPost < ActiveRecord::Base
         )
       SQL
       dump = ActiveRecord::Base.connection.structure_dump
-      expect(dump).to match(/\"?ID_PLUS\"? NUMBER GENERATED ALWAYS AS \(ID\+2\) VIRTUAL/)
+      expect(dump).to match(/"?ID_PLUS"? NUMBER GENERATED ALWAYS AS \(ID\+2\) VIRTUAL/)
     end
 
     it "should dump RAW virtual columns" do
@@ -149,7 +149,7 @@ class ::TestPost < ActiveRecord::Base
         )
       SQL
       dump = ActiveRecord::Base.connection.structure_dump
-      expect(dump).to match(/CREATE TABLE \"BARS\" \(\n \"ID\" NUMBER\(38,0\) NOT NULL,\n \"SUPER\" RAW\(255\) GENERATED ALWAYS AS \(HEXTORAW\(TO_CHAR\(ID\)\)\) VIRTUAL/)
+      expect(dump).to match(/CREATE TABLE "BARS" \(\n "ID" NUMBER\(38,0\) NOT NULL,\n "SUPER" RAW\(255\) GENERATED ALWAYS AS \(HEXTORAW\(TO_CHAR\(ID\)\)\) VIRTUAL/)
     end
 
     it "should dump NCLOB columns" do
@@ -161,7 +161,7 @@ class ::TestPost < ActiveRecord::Base
         )
       SQL
       dump = ActiveRecord::Base.connection.structure_dump
-      expect(dump).to match(/CREATE TABLE \"BARS\" \(\n \"ID\" NUMBER\(38,0\) NOT NULL,\n \"NCLOB_TEXT\" NCLOB/)
+      expect(dump).to match(/CREATE TABLE "BARS" \(\n "ID" NUMBER\(38,0\) NOT NULL,\n "NCLOB_TEXT" NCLOB/)
     end
 
     it "should dump unique keys" do
@@ -187,7 +187,7 @@ class ::TestPost < ActiveRecord::Base
 
       dump = ActiveRecord::Base.connection.structure_dump
       expect(dump).to match(/CREATE UNIQUE INDEX "?IX_TEST_POSTS_FOO_ID"? ON "?TEST_POSTS"? \("?FOO_ID"?\)/i)
-      expect(dump).to match(/CREATE  INDEX "?IX_TEST_POSTS_FOO\"? ON "?TEST_POSTS"? \("?FOO"?\)/i)
+      expect(dump).to match(/CREATE  INDEX "?IX_TEST_POSTS_FOO"? ON "?TEST_POSTS"? \("?FOO"?\)/i)
       expect(dump).not_to match(/CREATE UNIQUE INDEX "?UK_TEST_POSTS_/i)
     end
 
@@ -199,8 +199,8 @@ class ::TestPost < ActiveRecord::Base
       SQL
 
       dump = ActiveRecord::Base.connection.structure_dump
-      expect(dump).to match(/CREATE  INDEX "?IX_TEST_POSTS_FOO_FOO_ID\"? ON "?TEST_POSTS"? \("?FOO"?, "?FOO_ID"?\)/i)
-      expect(dump).to match(/CREATE  INDEX "?IX_TEST_POSTS_FUNCTION\"? ON "?TEST_POSTS"? \(TO_CHAR\(LENGTH\("?FOO"?\)\)\|\|"?FOO"?\)/i)
+      expect(dump).to match(/CREATE  INDEX "?IX_TEST_POSTS_FOO_FOO_ID"? ON "?TEST_POSTS"? \("?FOO"?, "?FOO_ID"?\)/i)
+      expect(dump).to match(/CREATE  INDEX "?IX_TEST_POSTS_FUNCTION"? ON "?TEST_POSTS"? \(TO_CHAR\(LENGTH\("?FOO"?\)\)\|\|"?FOO"?\)/i)
     end
 
     it "should dump RAW columns" do
@@ -212,7 +212,7 @@ class ::TestPost < ActiveRecord::Base
         )
       SQL
       dump = ActiveRecord::Base.connection.structure_dump
-      expect(dump).to match(/CREATE TABLE \"BARS\" \(\n \"ID\" NUMBER\(38,0\) NOT NULL,\n \"SUPER\" RAW\(255\)/)
+      expect(dump).to match(/CREATE TABLE "BARS" \(\n "ID" NUMBER\(38,0\) NOT NULL,\n "SUPER" RAW\(255\)/)
     end
 
     it "should dump table comments" do
@@ -269,7 +269,7 @@ class ::TestPost < ActiveRecord::Base
     end
     context "default sequence" do
       let(:sql) { "CREATE SEQUENCE \"#{sequence_name}\"" }
-      it { is_expected.to_not match(%r{CREATE SEQUENCE \"#{sequence_name}" MAXVALUE \d+ MINVALUE \d+ NOORDER NOCYCLE}) }
+      it { is_expected.to_not match(%r{CREATE SEQUENCE "#{sequence_name}" MAXVALUE \d+ MINVALUE \d+ NOORDER NOCYCLE}) }
     end
     context "noorder" do
       let(:sql) { "CREATE SEQUENCE \"#{sequence_name}\" NOORDER" }

spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -99,10 +99,10 @@ class ::TestEmployee2 < ActiveRecord::Base
 
       it "should get sequence value at next time" do
         TestEmployee.create!
-        expect(@logger.logged(:debug).first).not_to match(/SELECT \"TEST_EMPLOYEES_SEQ\".NEXTVAL FROM dual/im)
+        expect(@logger.logged(:debug).first).not_to match(/SELECT "TEST_EMPLOYEES_SEQ".NEXTVAL FROM dual/im)
         @logger.clear(:debug)
         TestEmployee.create!
-        expect(@logger.logged(:debug).first).to match(/SELECT \"TEST_EMPLOYEES_SEQ\".NEXTVAL FROM dual/im)
+        expect(@logger.logged(:debug).first).to match(/SELECT "TEST_EMPLOYEES_SEQ".NEXTVAL FROM dual/im)
       end
     end
   end