ibm_db 5.6.1 → 5.7.0

data/test/cases/adapter_prevent_writes_test.rb

@@ -10,7 +10,7 @@ require "models/event"
 module ActiveRecord
   class AdapterPreventWritesTest < ActiveRecord::TestCase
     def setup
-      @connection = ActiveRecord::Base.connection
+      @connection = ActiveRecord::Base.lease_connection
     end
 
     def test_preventing_writes_predicate
@@ -24,13 +24,9 @@ module ActiveRecord
     end
 
     def test_errors_when_an_insert_query_is_called_while_preventing_writes
-      assert_no_queries do
+      ActiveRecord::Base.while_preventing_writes do
         assert_raises(ActiveRecord::ReadOnlyError) do
-          ActiveRecord::Base.while_preventing_writes do
-            @connection.transaction do
-              @connection.insert("INSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
-            end
-          end
+          @connection.insert("INSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
         end
       end
     end
@@ -38,13 +34,9 @@ module ActiveRecord
     def test_errors_when_an_update_query_is_called_while_preventing_writes
       @connection.insert("INSERT INTO subscribers(nick) VALUES ('138853948594')")
 
-      assert_no_queries do
+      ActiveRecord::Base.while_preventing_writes do
         assert_raises(ActiveRecord::ReadOnlyError) do
-          ActiveRecord::Base.while_preventing_writes do
-            @connection.transaction do
-              @connection.update("UPDATE subscribers SET nick = '9989' WHERE nick = '138853948594'")
-            end
-          end
+          @connection.update("UPDATE subscribers SET nick = '9989' WHERE nick = '138853948594'")
         end
       end
     end
@@ -52,21 +44,17 @@ module ActiveRecord
     def test_errors_when_a_delete_query_is_called_while_preventing_writes
       @connection.insert("INSERT INTO subscribers(nick) VALUES ('138853948594')")
 
-      assert_no_queries do
+      ActiveRecord::Base.while_preventing_writes do
         assert_raises(ActiveRecord::ReadOnlyError) do
-          ActiveRecord::Base.while_preventing_writes do
-            @connection.transaction do
-              @connection.delete("DELETE FROM subscribers WHERE nick = '138853948594'")
-            end
-          end
+          @connection.delete("DELETE FROM subscribers WHERE nick = '138853948594'")
         end
       end
     end
 
-    if current_adapter?(:PostgreSQLAdapter) or current_adapter?(:IBM_DBAdapter)
+    if current_adapter?(:PostgreSQLAdapter, :IBM_DBAdapter)
       def test_doesnt_error_when_a_select_query_has_encoding_errors
         ActiveRecord::Base.while_preventing_writes do
-          # Contrary to other adapters, Postgres will eagerly fail on encoding errors.
+          # Contrary to other adapters, PostgreSQL/DB2 will eagerly fail on encoding errors.
           # But at least we can assert it fails in the client and not before when trying to
           # match the query.
           assert_raises ActiveRecord::StatementInvalid do
@@ -77,7 +65,9 @@ module ActiveRecord
     else
       def test_doesnt_error_when_a_select_query_has_encoding_errors
         ActiveRecord::Base.while_preventing_writes do
-          @connection.select_all("SELECT '\xC8'")
+          assert_nothing_raised do
+            @connection.select_all("SELECT '\xC8'")
+          end
         end
       end
     end
@@ -91,7 +81,7 @@ module ActiveRecord
       end
     end
 
-    if ActiveRecord::Base.connection.supports_common_table_expressions?
+    if ActiveRecord::Base.lease_connection.supports_common_table_expressions?
       def test_doesnt_error_when_a_read_query_with_a_cte_is_called_while_preventing_writes
         @connection.insert("INSERT INTO subscribers(nick) VALUES ('138853948594')")
 
@@ -116,12 +106,8 @@ module ActiveRecord
 
     def test_errors_when_an_insert_query_prefixed_by_a_slash_star_comment_is_called_while_preventing_writes
       ActiveRecord::Base.while_preventing_writes do
-        @connection.transaction do
-          assert_no_queries do
-            assert_raises(ActiveRecord::ReadOnlyError) do
-              @connection.insert("/* some comment */ INSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
-            end
-          end
+        assert_raises(ActiveRecord::ReadOnlyError) do
+          @connection.insert("/* some comment */ INSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
         end
       end
     end
@@ -137,196 +123,34 @@ module ActiveRecord
 
     def test_errors_when_an_insert_query_prefixed_by_a_double_dash_comment_is_called_while_preventing_writes
       ActiveRecord::Base.while_preventing_writes do
-        @connection.transaction do
-          assert_no_queries do
-            assert_raises(ActiveRecord::ReadOnlyError) do
-              @connection.insert("-- some comment\nINSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
-            end
-          end
-        end
-      end
-    end
-
-    def test_errors_when_an_insert_query_prefixed_by_a_slash_star_comment_containing_read_command_is_called_while_preventing_writes
-      ActiveRecord::Base.while_preventing_writes do
-        @connection.transaction do
-          assert_no_queries do
-            assert_raises(ActiveRecord::ReadOnlyError) do
-              @connection.insert("/* SELECT */ INSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
-            end
-          end
-        end
-      end
-    end
-
-    def test_errors_when_an_insert_query_prefixed_by_a_double_dash_comment_containing_read_command_is_called_while_preventing_writes
-      ActiveRecord::Base.while_preventing_writes do
-        @connection.transaction do
-          assert_no_queries do
-            assert_raises(ActiveRecord::ReadOnlyError) do
-              @connection.insert("-- SELECT\nINSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
-            end
-          end
-        end
-      end
-    end
-  end
-
-  class AdapterPreventWritesLegacyTest < ActiveRecord::TestCase
-    def setup
-      @old_value = ActiveRecord::Base.legacy_connection_handling
-      ActiveRecord::Base.legacy_connection_handling = true
-
-      @connection = ActiveRecord::Base.connection
-      @connection_handler = ActiveRecord::Base.connection_handler
-    end
-
-    def teardown
-      clean_up_legacy_connection_handlers
-      ActiveRecord::Base.legacy_connection_handling = @old_value
-    end
-
-    def test_preventing_writes_predicate_legacy
-      assert_not_predicate @connection, :preventing_writes?
-
-      @connection_handler.while_preventing_writes do
-        assert_predicate @connection, :preventing_writes?
-      end
-
-      assert_not_predicate @connection, :preventing_writes?
-    end
-
-    def test_errors_when_an_insert_query_is_called_while_preventing_writes
-      assert_no_queries do
-        assert_raises(ActiveRecord::ReadOnlyError) do
-          assert_deprecated do
-            @connection_handler.while_preventing_writes do
-              @connection.transaction do
-                @connection.insert("INSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
-              end
-            end
-          end
-        end
-      end
-    end
-
-    def test_errors_when_an_update_query_is_called_while_preventing_writes
-      @connection.insert("INSERT INTO subscribers(nick) VALUES ('138853948594')")
-
-      assert_no_queries do
         assert_raises(ActiveRecord::ReadOnlyError) do
-          assert_deprecated do
-            @connection_handler.while_preventing_writes do
-              @connection.transaction do
-                @connection.update("UPDATE subscribers SET nick = '9989' WHERE nick = '138853948594'")
-              end
-            end
-          end
+          @connection.insert("-- some comment\nINSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
         end
       end
     end
 
-    def test_errors_when_a_delete_query_is_called_while_preventing_writes
-      @connection.insert("INSERT INTO subscribers(nick) VALUES ('138853948594')")
-
-      assert_no_queries do
+    def test_errors_when_an_insert_query_prefixed_by_a_multiline_double_dash_comment_is_called_while_preventing_writes
+      ActiveRecord::Base.while_preventing_writes do
         assert_raises(ActiveRecord::ReadOnlyError) do
-          assert_deprecated do
-            @connection_handler.while_preventing_writes do
-              @connection.transaction do
-                @connection.delete("DELETE FROM subscribers WHERE nick = '138853948594'")
-              end
-            end
-          end
-        end
-      end
-    end
-
-    def test_doesnt_error_when_a_select_query_is_called_while_preventing_writes
-      @connection.insert("INSERT INTO subscribers(nick) VALUES ('138853948594')")
-
-      @connection_handler.while_preventing_writes do
-        result = @connection.select_all("SELECT subscribers.* FROM subscribers WHERE nick = '138853948594'")
-        assert_equal 1, result.length
-      end
-    end
-
-    if ActiveRecord::Base.connection.supports_common_table_expressions?
-      def test_doesnt_error_when_a_read_query_with_a_cte_is_called_while_preventing_writes
-        @connection.insert("INSERT INTO subscribers(nick) VALUES ('138853948594')")
-
-        @connection_handler.while_preventing_writes do
-          result = @connection.select_all(<<~SQL)
-            WITH matching_subscribers AS (SELECT subscribers.* FROM subscribers WHERE nick = '138853948594')
-            SELECT * FROM matching_subscribers
-          SQL
-          assert_equal 1, result.length
-        end
-      end
-    end
-
-    def test_doesnt_error_when_a_select_query_starting_with_a_slash_star_comment_is_called_while_preventing_writes
-      @connection.insert("INSERT INTO subscribers(nick) VALUES ('138853948594')")
-
-      @connection_handler.while_preventing_writes do
-        result = @connection.select_all("/* some comment */ SELECT subscribers.* FROM subscribers WHERE nick = '138853948594'")
-        assert_equal 1, result.length
-      end
-    end
-
-    def test_errors_when_an_insert_query_prefixed_by_a_slash_star_comment_is_called_while_preventing_writes
-      @connection_handler.while_preventing_writes do
-        @connection.transaction do
-          assert_no_queries do
-            assert_raises(ActiveRecord::ReadOnlyError) do
-              @connection.insert("/* some comment */ INSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
-            end
-          end
-        end
-      end
-    end
-
-    def test_doesnt_error_when_a_select_query_starting_with_double_dash_comments_is_called_while_preventing_writes
-      @connection.insert("INSERT INTO subscribers(nick) VALUES ('138853948594')")
-
-      @connection_handler.while_preventing_writes do
-        result = @connection.select_all("-- some comment\n-- comment about INSERT\nSELECT subscribers.* FROM subscribers WHERE nick = '138853948594'")
-        assert_equal 1, result.length
-      end
-    end
-
-    def test_errors_when_an_insert_query_prefixed_by_a_double_dash_comment_is_called_while_preventing_writes
-      @connection_handler.while_preventing_writes do
-        @connection.transaction do
-          assert_no_queries do
-            assert_raises(ActiveRecord::ReadOnlyError) do
-              @connection.insert("-- some comment\nINSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
-            end
+          Timeout.timeout(0.1) do # should be fast to parse the query
+            @connection.insert("#{"-- comment\n" * 50}INSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
           end
         end
       end
     end
 
     def test_errors_when_an_insert_query_prefixed_by_a_slash_star_comment_containing_read_command_is_called_while_preventing_writes
-      @connection_handler.while_preventing_writes do
-        @connection.transaction do
-          assert_no_queries do
-            assert_raises(ActiveRecord::ReadOnlyError) do
-              @connection.insert("/* SELECT */ INSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
-            end
-          end
+      ActiveRecord::Base.while_preventing_writes do
+        assert_raises(ActiveRecord::ReadOnlyError) do
+          @connection.insert("/* SELECT */ INSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
         end
       end
     end
 
     def test_errors_when_an_insert_query_prefixed_by_a_double_dash_comment_containing_read_command_is_called_while_preventing_writes
-      @connection_handler.while_preventing_writes do
-        @connection.transaction do
-          assert_no_queries do
-            assert_raises(ActiveRecord::ReadOnlyError) do
-              @connection.insert("-- SELECT\nINSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
-            end
-          end
+      ActiveRecord::Base.while_preventing_writes do
+        assert_raises(ActiveRecord::ReadOnlyError) do
+          @connection.insert("-- SELECT\nINSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
         end
       end
     end