activerecord-pg-extensions 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abfb428bb45f993d1a1ee897e81be0372dafc62b5a345c433eb9e69c821ba100
-  data.tar.gz: d8a2f84e3a2a70576d165e1ad56a17d2cb122acc1bf784a9a17c969cc3f018a8
+  metadata.gz: 3b240f7e9306ba57d7f52add8cef37ebe735e2f3d900d328d7cfb2e22fe1fcc6
+  data.tar.gz: 04b62ecf9b4c250e2f664f1a0be0c71baac1b6f5d117dc8d45f08bb7b7100459
 SHA512:
-  metadata.gz: 4e83d36db41c570b469ccac0e931b0a3ce04536319b9a357e28225b6c3adb613d1cd300993b7eb9c45733ea54e2b3c3b2ab79a51a932c428aa054dae13fb138d
-  data.tar.gz: 0f404b7d50dd5e48cdf729987888c164f133301da6b1be5867fa6d8c1aa3ba5223eae556778c082ad31afb10bccdc2eecba1f166f69c3b12311630047dea2a55
+  metadata.gz: c5a1ae9925eb093ea81424574d409186c85ef2474b1cc2a38f388757ff4e94a8b3893ca7e582e5010e8dbe8915a2e499d1600103c12936169d0447703b5c8d68
+  data.tar.gz: 256b8740a417e1bcc84a7edd23663da83543aa412a7221ae2a818721dd04a16b7ccf3f06915cb625d50f95ecb55ccd0719e1d8204441294dd9860ba25cb54b6a

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [0.2.3] - 2021-06-23
+
+- Fix extension_available?
+
+## [0.2.2] - 2021-06-22
+
+- Fix bug in Ruby 2.6 calling format wrong.
+
+## [0.2.1] - 2021-06-22
+
+- Ensure numeric is in the PG type map for Rails 6.0. So that lsn_diff will
+  return a numeric, instead of a string.
+
 ## [0.2.0] - 2021-06-07
 
 - Add PostgreSQLAdapter#set_replica_identity

data/lib/active_record/pg_extensions/errors.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  class QueryTimeout < ActiveRecord::StatementInvalid; end
+end

data/lib/active_record/pg_extensions/pessimistic_migrations.rb

@@ -6,20 +6,36 @@ module ActiveRecord
     # to executing, in order to reduce the amount of time the actual DDL takes to
     # execute (and thus how long it needs the lock)
     module PessimisticMigrations
-      # does a query first to warm the db cache, to make the actual constraint adding fast
+      # adds a temporary check constraint to reduce locking when changing to NOT NULL, and we're not in a transaction
       def change_column_null(table, column, nullness, default = nil)
-        # no point in pre-warming the cache to avoid locking if we're already in a transaction
+        # no point in doing extra work to avoid locking if we're already in a transaction
         return super if nullness != false || open_transactions.positive?
+        return if columns(table).find { |c| c.name == column.to_s }&.null == false
+
+        temp_constraint_name = "chk_rails_#{table}_#{column}_not_null"
+        scope = quoted_scope(temp_constraint_name)
+        # check for temp constraint
+        valid = select_value(<<~SQL, "SCHEMA")
+          SELECT convalidated FROM pg_constraint INNER JOIN pg_namespace ON pg_namespace.oid=connamespace WHERE conname=#{scope[:name]} AND nspname=#{scope[:schema]}
+        SQL
+        if valid.nil?
+          add_check_constraint(table,
+                               "#{quote_column_name(column)} IS NOT NULL",
+                               name: temp_constraint_name,
+                               validate: false)
+        end
+        begin
+          validate_constraint(table, temp_constraint_name)
+        rescue ActiveRecord::StatementInvalid => e
+          raise ActiveRecord::NotNullViolation.new(sql: e.sql, binds: e.binds) if e.cause.is_a?(PG::CheckViolation)
+
+          raise
+        end
 
         transaction do
-          # make sure the query ignores indexes, because the actual ALTER TABLE will also ignore
-          # indexes
-          execute("SET LOCAL enable_indexscan=off")
-          execute("SET LOCAL enable_bitmapscan=off")
-          execute("SELECT COUNT(*) FROM #{quote_table_name(table)} WHERE #{quote_column_name(column)} IS NULL")
-          raise ActiveRecord::Rollback
+          super
+          remove_check_constraint(table, name: temp_constraint_name)
         end
-        super
       end
 
       # several improvements:

data/lib/active_record/pg_extensions/postgresql_adapter.rb

@@ -47,6 +47,7 @@ module ActiveRecord
         sql << " VERSION #{quote(version)}" if version
         sql << " CASCADE" if cascade
         execute(sql)
+        reload_type_map
         @extensions&.delete(extension.to_s)
       end
 
@@ -61,6 +62,7 @@ module ActiveRecord
         sql << " TO #{quote(version)}" if version && version != true
         sql << " SET SCHEMA #{schema}" if schema
         execute(sql)
+        reload_type_map
         @extensions&.delete(extension.to_s)
       end
 
@@ -73,13 +75,14 @@ module ActiveRecord
         sql << extensions.join(", ")
         sql << " CASCADE" if cascade
         execute(sql)
+        reload_type_map
         @extensions&.except!(*extensions.map(&:to_s))
       end
 
       # check if a particular extension can be installed
       def extension_available?(extension, version = nil)
         sql = +"SELECT 1 FROM "
-        sql << version ? "pg_available_extensions" : "pg_available_extension_versions"
+        sql << (version ? "pg_available_extension_versions" : "pg_available_extensions")
         sql << " WHERE name=#{quote(extension)}"
         sql << " AND version=#{quote(version)}" if version
         select_value(sql).to_i == 1
@@ -233,8 +236,77 @@ module ActiveRecord
         select_value("SELECT pg_is_in_recovery()")
       end
 
+      def with_statement_timeout(timeout = nil)
+        timeout = 30 if timeout.nil? || timeout == true
+        transaction do
+          execute("SET LOCAL statement_timeout=#{(timeout * 1000).to_i}")
+          yield
+        rescue ActiveRecord::StatementInvalid => e
+          raise ActiveRecord::QueryTimeout.new(sql: e.sql, binds: e.binds) if e.cause.is_a?(PG::QueryCanceled)
+
+          raise
+        end
+      end
+
+      unless ::Rails.version >= "6.1"
+        def add_check_constraint(table_name, expression, name:, validate: true)
+          sql = +"ALTER TABLE #{quote_table_name(table_name)} ADD CONSTRAINT #{quote_column_name(name)} CHECK (#{expression})" # rubocop:disable Layout/LineLength
+          sql << " NOT VALID" unless validate
+          execute(sql)
+        end
+
+        def remove_check_constraint(table_name, name:)
+          execute("ALTER TABLE #{quote_table_name(table_name)} DROP CONSTRAINT #{quote_column_name(name)}")
+        end
+      end
+
       private
 
+      if ::Rails.version < "6.1"
+        # significant change: add PG::TextDecoder::Numeric
+        def add_pg_decoders
+          @default_timezone = nil
+          @timestamp_decoder = nil
+
+          coders_by_name = {
+            "int2" => PG::TextDecoder::Integer,
+            "int4" => PG::TextDecoder::Integer,
+            "int8" => PG::TextDecoder::Integer,
+            "oid" => PG::TextDecoder::Integer,
+            "float4" => PG::TextDecoder::Float,
+            "float8" => PG::TextDecoder::Float,
+            "bool" => PG::TextDecoder::Boolean,
+            "numeric" => PG::TextDecoder::Numeric
+          }
+
+          if defined?(PG::TextDecoder::TimestampUtc)
+            # Use native PG encoders available since pg-1.1
+            coders_by_name["timestamp"] = PG::TextDecoder::TimestampUtc
+            coders_by_name["timestamptz"] = PG::TextDecoder::TimestampWithTimeZone
+          end
+
+          known_coder_types = coders_by_name.keys.map { |n| quote(n) }
+          query = format(<<~SQL, *known_coder_types.join(", "))
+            SELECT t.oid, t.typname
+            FROM pg_type as t
+            WHERE t.typname IN (%s)
+          SQL
+          coders = execute_and_clear(query, "SCHEMA", []) do |result|
+            result
+              .map { |row| construct_coder(row, coders_by_name[row["typname"]]) }
+              .compact
+          end
+
+          map = PG::TypeMapByOid.new
+          coders.each { |coder| map.add_coder(coder) }
+          @connection.type_map_for_results = map
+
+          # extract timestamp decoder for use in update_typemap_for_default_timezone
+          @timestamp_decoder = coders.find { |coder| coder.name == "timestamp" }
+          update_typemap_for_default_timezone
+        end
+      end
+
       def initialize_type_map(map = type_map)
         map.register_type "pg_lsn", ActiveRecord::ConnectionAdapters::PostgreSQL::OID::SpecializedString.new(:pg_lsn)
 

data/lib/active_record/pg_extensions/railtie.rb

@@ -8,9 +8,10 @@ module ActiveRecord
     class Railtie < Rails::Railtie
       initializer "pg_extensions.extend_ar", after: "active_record.initialize_database" do
         ActiveSupport.on_load(:active_record) do
+          require "active_record/pg_extensions/errors"
           require "active_record/pg_extensions/postgresql_adapter"
 
-          ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(PostgreSQLAdapter)
+          ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(PostgreSQLAdapter)
           # if they've already require 'all', then inject now
           defined?(All) && All.inject
         end

data/lib/active_record/pg_extensions/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module PGExtensions
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/spec/pessimistic_migrations_spec.rb

@@ -6,32 +6,61 @@ describe ActiveRecord::PGExtensions::PessimisticMigrations do
   end
 
   describe "#change_column_null" do
+    # Rails 6.1 doesn't quote the constraint name when adding a check constraint??
+    def quote_constraint_name(name)
+      Rails.version >= "6.1" ? name : connection.quote_column_name(name)
+    end
+
     it "does nothing extra when changing a column to nullable" do
       connection.change_column_null(:table, :column, true)
       expect(connection.executed_statements).to eq ['ALTER TABLE "table" ALTER COLUMN "column" DROP NOT NULL']
     end
 
-    it "pre-warms the cache" do
+    it "does nothing if we're in a transaction" do
+      connection.transaction do
+        connection.change_column_null(:table, :column, true)
+      end
+      expect(connection.executed_statements).to eq ["BEGIN",
+                                                    'ALTER TABLE "table" ALTER COLUMN "column" DROP NOT NULL',
+                                                    "COMMIT"]
+    end
+
+    it "skips entirely if the column is already NOT NULL" do
+      expect(connection).to receive(:columns).with(:table).and_return([double(name: "column", null: false)])
       connection.change_column_null(:table, :column, false)
-      expect(connection.executed_statements).to eq(
-        ["BEGIN",
-         "SET LOCAL enable_indexscan=off",
-         "SET LOCAL enable_bitmapscan=off",
-         'SELECT COUNT(*) FROM "table" WHERE "column" IS NULL',
-         "ROLLBACK",
-         'ALTER TABLE "table" ALTER COLUMN "column" SET NOT NULL']
-      )
+      expect(connection.executed_statements).to eq([])
     end
 
-    it "does nothing extra if a transaction is already active" do
-      connection.transaction do
-        connection.change_column_null(:table, :column, false)
-      end
-      expect(connection.executed_statements).to eq(
-        ["BEGIN",
-         'ALTER TABLE "table" ALTER COLUMN "column" SET NOT NULL',
-         "COMMIT"]
-      )
+    it "adds and removes a check constraint" do
+      expect(connection).to receive(:columns).and_return([])
+      allow(connection).to receive(:check_constraint_for!).and_return(double(name: "chk_rails_table_column_not_null"))
+      connection.change_column_null(:table, :column, false)
+
+      expect(connection.executed_statements).to eq [
+        "SELECT convalidated FROM pg_constraint INNER JOIN pg_namespace ON pg_namespace.oid=connamespace WHERE conname='chk_rails_table_column_not_null' AND nspname=ANY (current_schemas(false))\n", # rubocop:disable Layout/LineLength
+        %{ALTER TABLE "table" ADD CONSTRAINT #{quote_constraint_name('chk_rails_table_column_not_null')} CHECK ("column" IS NOT NULL) NOT VALID}, # rubocop:disable Layout/LineLength
+        'ALTER TABLE "table" VALIDATE CONSTRAINT "chk_rails_table_column_not_null"',
+        "BEGIN",
+        'ALTER TABLE "table" ALTER COLUMN "column" SET NOT NULL',
+        'ALTER TABLE "table" DROP CONSTRAINT "chk_rails_table_column_not_null"',
+        "COMMIT"
+      ]
+    end
+
+    it "verifies an existing check constraint" do
+      expect(connection).to receive(:columns).and_return([])
+      allow(connection).to receive(:check_constraint_for!).and_return(double(name: "chk_rails_table_column_not_null"))
+      expect(connection).to receive(:select_value).and_return(false)
+      connection.change_column_null(:table, :column, false)
+
+      expect(connection.executed_statements).to eq [
+        # stubbed out <check constraint valid>
+        'ALTER TABLE "table" VALIDATE CONSTRAINT "chk_rails_table_column_not_null"',
+        "BEGIN",
+        'ALTER TABLE "table" ALTER COLUMN "column" SET NOT NULL',
+        'ALTER TABLE "table" DROP CONSTRAINT "chk_rails_table_column_not_null"',
+        "COMMIT"
+      ]
     end
   end
 
@@ -92,8 +121,8 @@ describe ActiveRecord::PGExtensions::PessimisticMigrations do
       expect(connection).to receive(:remove_index).with(:users, name: "index_users_on_name", algorithm: :concurrently)
 
       connection.add_index :users, :name, algorithm: :concurrently
-      expect(connection.executed_statements).to eq(
-        ['CREATE INDEX CONCURRENTLY "index_users_on_name" ON "users" ("name")']
+      expect(connection.executed_statements).to match(
+        [match(/\ACREATE +INDEX CONCURRENTLY "index_users_on_name" ON "users" +\("name"\)\z/)]
       )
     end
 

data/spec/postgresql_adapter_spec.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 describe ActiveRecord::ConnectionAdapters::PostgreSQLAdapter do
+  before do
+    allow(connection).to receive(:reload_type_map)
+  end
+
   describe "#set_constraints" do
     around do |example|
       connection.dont_execute(&example)
@@ -131,6 +135,20 @@ describe ActiveRecord::ConnectionAdapters::PostgreSQLAdapter do
       it "does not allow dropping no extensions" do
         expect { connection.drop_extension }.to raise_error(ArgumentError)
       end
+
+      describe "#extension_available?" do
+        it "works with no version constraint" do
+          connection.extension_available?(:postgis)
+          expect(connection.executed_statements).to eq ["SELECT 1 FROM pg_available_extensions WHERE name='postgis'"]
+        end
+
+        it "works with a version constraint" do
+          connection.extension_available?(:postgis, "2.0")
+          expect(connection.executed_statements).to eq(
+            ["SELECT 1 FROM pg_available_extension_versions WHERE name='postgis' AND version='2.0'"]
+          )
+        end
+      end
     end
   end
 
@@ -243,5 +261,110 @@ describe ActiveRecord::ConnectionAdapters::PostgreSQLAdapter do
         expect(connection.in_recovery?).to eq false
       end
     end
+
+    describe "#select_value" do
+      it "casts numeric types" do
+        expect(connection.select_value("SELECT factorial(2)")).to eq 2
+      end
+    end
+  end
+
+  describe "#with_statement_timeout" do
+    it "stops long-running queries" do
+      expect do
+        connection.with_statement_timeout(0.01) do
+          connection.execute("SELECT pg_sleep(3)")
+        end
+      end.to raise_error(ActiveRecord::QueryTimeout)
+    end
+
+    it "re-raises other errors" do
+      expect do
+        connection.with_statement_timeout(1) do
+          connection.execute("bad sql")
+        end
+      end.to raise_error(ActiveRecord::StatementInvalid)
+    end
+
+    context "without executing" do
+      it "converts integer to ms" do
+        connection.with_statement_timeout(30) { nil }
+        expect(connection.executed_statements).to eq(
+          [
+            "BEGIN",
+            "SET LOCAL statement_timeout=30000",
+            "COMMIT"
+          ]
+        )
+      end
+
+      it "converts float to ms" do
+        connection.with_statement_timeout(5.5) { nil }
+        expect(connection.executed_statements).to eq(
+          [
+            "BEGIN",
+            "SET LOCAL statement_timeout=5500",
+            "COMMIT"
+          ]
+        )
+      end
+
+      it "converts ActiveSupport::Duration to ms" do
+        connection.with_statement_timeout(5.seconds) { nil }
+        expect(connection.executed_statements).to eq(
+          [
+            "BEGIN",
+            "SET LOCAL statement_timeout=5000",
+            "COMMIT"
+          ]
+        )
+      end
+
+      it "allows true" do
+        connection.with_statement_timeout(true) { nil }
+        expect(connection.executed_statements).to eq(
+          [
+            "BEGIN",
+            "SET LOCAL statement_timeout=30000",
+            "COMMIT"
+          ]
+        )
+      end
+    end
+  end
+
+  unless Rails.version >= "6.1"
+    describe "#add_check_constraint" do
+      around do |example|
+        connection.dont_execute(&example)
+      end
+
+      it "works" do
+        connection.add_check_constraint(:table, "column IS NOT NULL", name: :my_constraint)
+        expect(connection.executed_statements).to eq(
+          ['ALTER TABLE "table" ADD CONSTRAINT "my_constraint" CHECK (column IS NOT NULL)']
+        )
+      end
+
+      it "defers validation" do
+        connection.add_check_constraint(:table, "column IS NOT NULL", name: :my_constraint, validate: false)
+        expect(connection.executed_statements).to eq(
+          ['ALTER TABLE "table" ADD CONSTRAINT "my_constraint" CHECK (column IS NOT NULL) NOT VALID']
+        )
+      end
+    end
+
+    describe "#remove_check_constraint" do
+      around do |example|
+        connection.dont_execute(&example)
+      end
+
+      it "works" do
+        connection.remove_check_constraint(:table, name: :my_constraint)
+        expect(connection.executed_statements).to eq(
+          ['ALTER TABLE "table" DROP CONSTRAINT "my_constraint"']
+        )
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pg-extensions
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -50,6 +50,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.2'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +175,7 @@ files:
 - config/database.yml
 - lib/active_record/pg_extensions.rb
 - lib/active_record/pg_extensions/all.rb
+- lib/active_record/pg_extensions/errors.rb
 - lib/active_record/pg_extensions/extension.rb
 - lib/active_record/pg_extensions/pessimistic_migrations.rb
 - lib/active_record/pg_extensions/postgresql_adapter.rb
@@ -190,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.24
 signing_key:
 specification_version: 4
 summary: Several extensions to ActiveRecord's PostgreSQLAdapter.