pact_broker 2.120.0 → 2.121.0

data/Gemfile

@@ -5,8 +5,6 @@ gemspec
 
 gem "rake", "~> 13.3"
 gem "sqlite3", ">=2.0.0"
-gem "conventional-changelog", "~>1.3"
-gem "bump", "~> 0.5"
 gem "padrino-core", ">= 0.16.0.pre3", require: false
 gem "rackup", "~> 2.2"
 gem "thor", "~> 1.4" # thor is secondary dependency but bumping here to avoid CVEs
@@ -49,10 +47,6 @@ group :pg, optional: true do
   gem "pg", "~>1.6"
 end
 
-group :mysql, optional: true do
-  gem "mysql2", "~>0.5"
-end
-
 if ENV["X_PACT_DEVELOPMENT"] == "true"
   gem "pact-support", path: "../pact-support"
 end

data/README.md

@@ -151,7 +151,6 @@ You can use the [Pact Broker Docker image][docker] or [Terraform on AWS][terrafo
 * Are you sure you don't just want to use the [Pact Broker Docker image][docker]? No Docker at your company yet? Ah well, keep reading.
 * Create a PostgreSQL database.
   * To ensure you're on a supported version of the database that you choose, check the [.github/workflows/test.yml](.github/workflows/test.yml) file to see which versions we're currently running our tests against.
-  * MySQL was supported for the native Ruby application until around 2021, but the official `pactfoundation/pact-broker` Docker image does not support it. New features will not be optimised for MySQL, and some new features may not even be supported on it (eg. the database clean feature).
 * You'll find a sample database creation script in the [example/config.ru](https://github.com/pact-foundation/pact_broker/blob/master/example/config.ru).
 * Install ruby 2.7 and the latest version of bundler (if you've come this far, I'm assuming you know how to do both of these. Did I mention there was a [Docker][docker] image?)
 * Copy the [pact\_broker](https://github.com/DiUS/pact_broker-docker/tree/master/pact_broker) directory from the Pact Broker Docker project. This will have the recommended settings for database connections, logging, basic auth etc. Note that the Docker image uses Phusion Passenger as the web application server in front of the Pact Broker Ruby application, which is the recommended set up if you are not using a containerized solution.

data/docs/CONFIGURATION.md

@@ -34,6 +34,25 @@ The application log format. Can be any value supported by Semantic Logger.
 **Allowed values:** `default`, `json`, `color`<br/>
 **More information:** https://github.com/rocketjob/semantic_logger/tree/master/lib/semantic_logger/formatters<br/>
 
+### log_otel_enabled
+
+Controls whether logs are also emitted to the OpenTelemetry logs pipeline.
+
+`auto` (the default) adds the OpenTelemetry appender only when the
+`opentelemetry-logs-sdk` gem is installed and an OpenTelemetry logger provider
+is configured. `true` forces the appender on and raises an error if the gem is
+not available. `false` disables it entirely.
+
+The `opentelemetry-logs-sdk` gem is an optional, runtime-detected dependency and
+is not bundled with the Pact Broker. When `log_format` is set to `json`, active
+trace and span IDs are also embedded in the JSON log output.
+
+**Supported versions:** From v2.120.0<br/>
+**Environment variable name:** `PACT_BROKER_LOG_OTEL_ENABLED`<br/>
+**YAML configuration key name:** `log_otel_enabled`<br/>
+**Default:** `auto`<br/>
+**Allowed values:** `auto`, `true`, `false`<br/>
+
 ### log_dir
 
 The log file directory
@@ -248,8 +267,8 @@ The number of seconds after which an SQL query will be aborted. Only supported f
 
 **Environment variable name:** `PACT_BROKER_DATABASE_STATEMENT_TIMEOUT`<br/>
 **YAML configuration key name:** `database_statement_timeout`<br/>
-**Default:** `15000`<br/>
-**Allowed values:** A positive integer in milliseconds<br/>
+**Default:** `15`<br/>
+**Allowed values:** A positive integer or float.<br/>
 **More information:** https://www.postgresql.org/docs/9.3/runtime-config-client.html<br/>
 
 ### metrics_sql_statement_timeout
@@ -533,6 +552,14 @@ The URL of the shields.io server used to generate the README badges.
 **Default:** `https://img.shields.io`<br/>
 **More information:** https://shields.io<br/>
 
+### badge_default_cache_setting
+
+Cache Control header value for the badge, this  sets the cache-control header for the badge image, for more information on header formats see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/cache-control
+
+**Environment variable name:** `PACT_BROKER_BADGE_DEFAULT_CACHE_SETTING`<br/>
+**YAML configuration key name:** `badge_default_cache_setting`<br/>
+**Default:** `max-age=30`<br/>
+
 ### badge_provider_mode
 
 The method by which the badges are generated. When set to `redirect`, a request to the Pact Broker for a badge will be sent a redirect response

data/docs/matrix-optimisation/README.md

@@ -0,0 +1,85 @@
+# Matrix query baselines
+
+Tooling to capture a query-profile baseline (per-request query count, exact SQL,
+and `EXPLAIN` plans) for the `/matrix` and `/can-i-deploy` endpoints, so query
+cost can be compared before and after changes to the query engine.
+
+The generated baseline files (`baseline-*.md`) are **git-ignored** — generate them
+locally and diff two runs; they are not committed.
+
+## Generate a baseline (Postgres)
+
+Baselines are generated against **Postgres** (the production backend). Start a
+throwaway Postgres with the dev compose file:
+
+    docker compose -f docker-compose-dev-postgres.yml up -d postgres
+
+The Postgres version is controlled by `POSTGRES_VERSION` (default `15`),
+so a baseline can be captured against a specific major version:
+
+    POSTGRES_VERSION=14 docker compose -f docker-compose-dev-postgres.yml up -d postgres
+
+The `pg` driver lives in an optional bundle group, so it must be installed and
+enabled explicitly — without `BUNDLE_WITH=pg` the run fails with
+`LoadError: cannot load such file -- pg`:
+
+    BUNDLE_WITH=pg bundle install
+
+Point the suite at the database and run the generator:
+
+    BUNDLE_WITH=pg \
+      PACT_BROKER_TEST_DATABASE_URL="postgres://postgres:postgres@localhost:5432/postgres" \
+      bundle exec rspec spec/benchmarks/matrix_baseline_spec.rb --tag matrix_baseline
+
+This writes `docs/matrix-optimisation/baseline-postgres.md`. Tear the container down
+with `docker compose -f docker-compose-dev-postgres.yml down -v` when done.
+
+> Postgres 18 and later relocated the data directory, which is incompatible with
+> the `/var/lib/postgresql/data` volume mount in `docker-compose-dev-postgres.yml`;
+> the container exits on startup. Use a tag of `17` or lower until that mount is
+> updated.
+
+The generator is tagged `matrix_baseline` and excluded from the default test run;
+it only executes when invoked with `--tag matrix_baseline`. Against a non-Postgres
+database it skips with a message.
+
+## What's captured
+
+For each request shape (see `spec/support/matrix_baseline/shapes.rb`), the file
+records, inside collapsible sections:
+
+- the number of SQL statements the request issued (main query + eager loads);
+- the exact SQL of each statement;
+- its `EXPLAIN` plan.
+
+Plans are captured with `EXPLAIN (ANALYZE, BUFFERS, TIMING OFF)`. That keeps the
+measures of work done — estimated cost, actual row counts, buffer hit/read
+counts, sort and hash memory usage — and drops the measures of how fast this
+particular machine did it. Wall-clock figures are excluded deliberately: they
+vary with unrelated load and would swamp the diff.
+
+## Comparing runs
+
+**Two runs against unchanged code produce a byte-identical file.** Any diff at
+all is a real difference in what the query engine did. Regenerate and diff two
+`baseline-postgres.md` files to compare:
+
+- **query count** per shape (the `N queries` in each section heading);
+- **plan shape** — sequential vs index scans, sorts, join types, UNION branch count;
+- **estimated cost, actual rows, buffers and memory usage** per plan node.
+
+Determinism depends on the generator resetting the database itself — it
+truncates with `RESTART IDENTITY` so surrogate keys in the captured SQL are
+stable, and runs `VACUUM ANALYZE` so plans are chosen against real statistics
+on an unbloated heap. That is why it is tagged `no_db_clean` and will wipe the
+database it is pointed at. **Point it at a throwaway Postgres, never at a
+database whose contents you want to keep.**
+
+## Limitations
+
+- The seed is a few hundred rows per table. Postgres will often choose a
+  sequential scan at this size regardless of index quality, so a plan-shape
+  change here does not automatically imply the same change in production. Query
+  counts and join structure transfer; scan choice on small tables may not.
+- The success filter and can-i-deploy's `--ignore` are applied in Ruby after
+  the query, so their shapes exercise no extra SQL beyond selector resolution.

data/lib/pact/doc/interaction_view_model.rb

@@ -1,6 +1,7 @@
 require "pact/shared/active_support_support"
 require "pact/reification"
 require "cgi"
+require "pact/doc"
 
 module Pact
   module Doc
@@ -149,7 +150,7 @@ module Pact
 
       def markdown_escape string
         return nil unless string
-        string.gsub("*","\\*").gsub("_","\\_")
+        string.gsub(Pact::Doc::MARKDOWN_SPECIAL_CHARS_REGEXP) { |char| "\\#{char}" }
       end
     end
   end

data/lib/pact/doc/markdown/consumer_contract_renderer.rb

@@ -1,6 +1,7 @@
 require "pact/doc/markdown/interaction_renderer"
 require "pact/doc/sort_interactions"
 require "rack/utils"
+require "pact/doc"
 
 module Pact
   module Doc
@@ -60,7 +61,8 @@ module Pact
         end
 
         def markdown_escape string
-          string.gsub("*","\\*").gsub("_","\\_")
+          return nil unless string
+          string.gsub(Pact::Doc::MARKDOWN_SPECIAL_CHARS_REGEXP) { |char| "\\#{char}" }
         end
 
         def h(text)

data/lib/pact/doc.rb

@@ -0,0 +1,5 @@
+module Pact
+  module Doc
+    MARKDOWN_SPECIAL_CHARS_REGEXP = /[\\`*_\[\](){}#+\-.!|]/
+  end
+end

data/lib/pact_broker/api/contracts/put_pact_params_contract.rb

@@ -10,6 +10,8 @@ module PactBroker
           required(:name_in_pact).maybe(:string)
         end
 
+        rule(:name).validate(:not_blank_if_present)
+
         rule(:name, :name_in_pact) do
           if name_in_pact_does_not_match_name_in_url_path?(values)
             key.failure(validation_message("pact_name_in_path_mismatch_name_in_pact", name_in_pact: values[:name_in_pact], name_in_path: values[:name]))

data/lib/pact_broker/api/decorators/provider_states_decorator.rb

@@ -26,7 +26,7 @@ module PactBroker
             end
 
             consumers_map.map do |(name, params), consumers|
-              { name: name, params: params, consumers: consumers.uniq }.transform_keys(&:to_sym)
+              { name: name, params: params, consumers: consumers.uniq.sort }
             end
           .sort_by { |provider_state| provider_state[:name] }
         }, :extend => PactBroker::Api::Decorators::ProviderStateDecorator

data/lib/pact_broker/api/decorators/version_decorator.rb

@@ -1,6 +1,7 @@
 require_relative "base_decorator"
 require_relative "embedded_tag_decorator"
 require_relative "embedded_branch_version_decorator"
+require_relative "format_date_time"
 
 module PactBroker
   module Api
@@ -85,7 +86,9 @@ module PactBroker
               title: "Version deployed to #{deployed_version.environment.display_name}",
               name: deployed_version.environment.display_name,
               href: deployed_version_url(deployed_version, context.fetch(:base_url)),
-              currently_deployed: deployed_version.currently_deployed
+              currently_deployed: deployed_version.currently_deployed,
+              deployed_at: FormatDateTime.call(deployed_version.created_at),
+              undeployed_at: FormatDateTime.call(deployed_version.undeployed_at)
             }.tap do |hash|
               hash[:application_instance] = deployed_version.application_instance unless deployed_version.application_instance.nil?
             end
@@ -104,7 +107,9 @@ module PactBroker
               title: "Version released to #{released_version.environment.display_name}",
               name: released_version.environment.display_name,
               href: released_version_url(released_version, context.fetch(:base_url)),
-              currently_supported: released_version.currently_supported
+              currently_supported: released_version.currently_supported,
+              released_at: FormatDateTime.call(released_version.created_at),
+              support_ended_at: FormatDateTime.call(released_version.support_ended_at)
             }
           end
         end

data/lib/pact_broker/api/pact_broker_urls.rb

@@ -370,6 +370,10 @@ module PactBroker
         "#{environments_url(base_url)}/#{environment.uuid}"
       end
 
+      def environment_versions_url(pacticipant, environment, base_url = "")
+        "#{pacticipant_url(base_url, pacticipant)}/environments/#{environment.uuid}/versions"
+      end
+
       def deployed_versions_for_version_and_environment_url(version, environment, base_url = "")
         "#{version_url(base_url, version)}/deployed-versions/environment/#{environment.uuid}"
       end

data/lib/pact_broker/api/resources/deployed_or_released_versions.rb

@@ -0,0 +1,78 @@
+require "pact_broker/api/resources/base_resource"
+require "pact_broker/api/decorators/versions_decorator"
+require "pact_broker/api/resources/pagination_methods"
+
+module PactBroker
+  module Api
+    module Resources
+      class DeployedOrReleasedVersions < BaseResource
+        include PaginationMethods
+
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
+
+        def allowed_methods
+          ["GET", "OPTIONS"]
+        end
+
+        def malformed_request?
+          super || request.get? && validation_errors_for_schema?(schema, request.query)
+        end
+
+        def resource_exists?
+          !!pacticipant
+        end
+
+        def to_json
+          decorator_class(:versions_decorator).new(versions).to_json(
+            **decorator_options(
+              identifier_from_path.merge(
+                resource_title: "Versions of #{pacticipant_name} that have been deployed or released",
+                deployed_versions: deployed_versions,
+                released_versions: released_versions
+              )
+            )
+          )
+        end
+
+        def policy_name
+          :'versions::versions'
+        end
+
+        private
+
+        def versions
+          @versions ||= version_service.find_by_ids_in_reverse_order(
+            version_ids,
+            pagination_options,
+            decorator_class(:versions_decorator).eager_load_associations
+          )
+        end
+
+        def version_ids
+          PactBroker::Deployments::DeployedVersion
+            .for_pacticipant_name(pacticipant_name)
+            .select(:version_id)
+            .union(
+              PactBroker::Deployments::ReleasedVersion
+                .for_pacticipant_name(pacticipant_name)
+                .select(:version_id)
+            )
+        end
+
+        def deployed_versions
+          @deployed_versions ||= deployed_version_service.find_deployed_versions_for_versions(versions)
+        end
+
+        def released_versions
+          @released_versions ||= released_version_service.find_released_versions_for_versions(versions)
+        end
+
+        def schema
+          PactBroker::Api::Contracts::PaginationQueryParamsSchema if request.get?
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/api/resources/environment_versions.rb

@@ -0,0 +1,89 @@
+require "pact_broker/api/resources/base_resource"
+require "pact_broker/api/decorators/versions_decorator"
+require "pact_broker/api/resources/pagination_methods"
+
+module PactBroker
+  module Api
+    module Resources
+      class EnvironmentVersions < BaseResource
+        include PaginationMethods
+
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
+
+        def allowed_methods
+          ["GET", "OPTIONS"]
+        end
+
+        def malformed_request?
+          super || request.get? && validation_errors_for_schema?(schema, request.query)
+        end
+
+        def resource_exists?
+          !!environment && !!pacticipant
+        end
+
+        def to_json
+          decorator_class(:versions_decorator).new(versions).to_json(
+            **decorator_options(
+              identifier_from_path.merge(
+                resource_title: resource_title,
+                deployed_versions: deployed_versions,
+                released_versions: released_versions
+              )
+            )
+          )
+        end
+
+        def policy_name
+          :'versions::versions'
+        end
+
+        private
+
+        def versions
+          @versions ||= version_service.find_by_ids_in_reverse_order(
+            version_ids,
+            pagination_options,
+            decorator_class(:versions_decorator).eager_load_associations
+          )
+        end
+
+        def version_ids
+          deployed_ids = PactBroker::Deployments::DeployedVersion
+            .for_environment(environment)
+            .for_pacticipant_name(pacticipant_name)
+            .select_map(:version_id)
+
+          released_ids = PactBroker::Deployments::ReleasedVersion
+            .for_environment(environment)
+            .for_pacticipant_name(pacticipant_name)
+            .select_map(:version_id)
+
+          (deployed_ids + released_ids).uniq
+        end
+
+        def deployed_versions
+          @deployed_versions ||= deployed_version_service.find_deployed_versions_for_versions(versions)
+        end
+
+        def released_versions
+          @released_versions ||= released_version_service.find_released_versions_for_versions(versions)
+        end
+
+        def environment
+          @environment ||= environment_service.find(identifier_from_path[:environment_uuid])
+        end
+
+        def resource_title
+          "Versions for #{pacticipant.name} in environment #{environment.display_name}"
+        end
+
+        def schema
+          PactBroker::Api::Contracts::PaginationQueryParamsSchema if request.get?
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/api/resources/tag_versions.rb

@@ -30,7 +30,7 @@ module PactBroker
 
         def to_json
           decorator_class(:versions_decorator).new(tag_versions)
-            .to_json(**decorator_options(deployed_versions: deployed_versions, released_versions: released_versions))
+            .to_json(**decorator_options(identifier_from_path.merge(deployed_versions: deployed_versions, released_versions: released_versions)))
         end
 
         private

data/lib/pact_broker/api.rb

@@ -104,7 +104,9 @@ module PactBroker
 
         # Versions
         add ["pacticipants", :pacticipant_name, "versions"], Api::Resources::Versions, {resource_name: "pacticipant_versions"}
+        add ["pacticipants", :pacticipant_name, "deployed-or-released", "versions"], Api::Resources::DeployedOrReleasedVersions, {resource_name: "pacticipant_deployed_or_released_versions"}
         add ["pacticipants", :pacticipant_name, "branches", :branch_name, "versions"], Api::Resources::BranchVersions, {resource_name: "pacticipant_branch_versions"}
+        add ["pacticipants", :pacticipant_name, "environments", :environment_uuid, "versions"], Api::Resources::EnvironmentVersions, {resource_name: "pacticipant_environment_versions"}
         add ["pacticipants", :pacticipant_name, "versions", :pacticipant_version_number], Api::Resources::Version, {resource_name: "pacticipant_version"}
         add ["pacticipants", :pacticipant_name, "latest-version", :tag], Api::Resources::LatestVersion, {resource_name: "latest_tagged_pacticipant_version"}
         add ["pacticipants", :pacticipant_name, "latest-version", :tag, "can-i-deploy", "to", :to], Api::Resources::CanIDeployPacticipantVersionByTagToTag, { resource_name: "can_i_deploy_latest_tagged_version_to_tag" }

data/lib/pact_broker/app.rb

@@ -148,7 +148,6 @@ module PactBroker
       configuration.database_connection ||= PactBroker.create_database_connection(configuration.database_configuration, configuration.logger)
       PactBroker::DB.connection = configuration.database_connection
       PactBroker::DB.validate_connection_config if configuration.validate_database_connection_config
-      PactBroker::DB.set_mysql_strict_mode_if_mysql
       PactBroker::DB.connection.extension(:pagination)
       PactBroker::DB.connection.extension(:statement_timeout)
       PactBroker::DB.connection.extension(:any_not_empty)

data/lib/pact_broker/config/runtime_configuration.rb

@@ -40,6 +40,7 @@ module PactBroker
         log_stream: :file,
         log_level: :info,
         log_format: nil,
+        log_otel_enabled: :auto,
         warning_error_class_names: ["Sequel::ForeignKeyConstraintViolation"],
         hide_pactflow_messages: false,
         log_configuration_on_startup: true,
@@ -129,6 +130,10 @@ module PactBroker
         super(log_format&.to_sym)
       end
 
+      def log_otel_enabled= value
+        super(coerce_log_otel_enabled(value))
+      end
+
       def custom_log_formatters= custom_log_formatters
         super(custom_log_formatters&.symbolize_keys)
       end
@@ -215,12 +220,26 @@ module PactBroker
         if log_stream == :file && log_dir.blank?
           raise_validation_error("Must specify log_dir if log_stream is set to file")
         end
+
+        unless [:auto, true, false].include?(log_otel_enabled)
+          raise_validation_error("log_otel_enabled must be one of: auto, true, false")
+        end
       end
 
       def raise_validation_error(msg)
         raise PactBroker::ConfigurationError, msg
       end
 
+      def coerce_log_otel_enabled(value)
+        case value
+        when nil, "", "auto", :auto then :auto
+        when true, "true", "1", 1 then true
+        when false, "false", "0", 0 then false
+        else value
+        end
+      end
+      private :coerce_log_otel_enabled
+
       def set_webhook_attribute_defaults
         # can't set a default on this, or anyway config blows up when trying to merge the
         # hash from the env vars into an array/nil.

data/lib/pact_broker/configuration.rb

@@ -3,6 +3,8 @@ require "pact_broker/error"
 require "semantic_logger"
 require "forwardable"
 require "pact_broker/config/runtime_configuration"
+require "pact_broker/logging/open_telemetry_appender_setup"
+require "pact_broker/logging/trace_aware_json_formatter"
 require "anyway/auto_cast"
 require "request_store"
 
@@ -98,17 +100,28 @@ module PactBroker
     def logger_from_runtime_configuration
       @logger_from_runtime_configuration ||= begin
         SemanticLogger.default_level = runtime_configuration.log_level
+        formatter = resolve_log_formatter(runtime_configuration.log_format)
         if runtime_configuration.log_stream == :file
           path = runtime_configuration.log_dir + "/pact_broker.log"
           FileUtils.mkdir_p(runtime_configuration.log_dir)
-          @default_appender = SemanticLogger.add_appender(file_name: path, formatter: runtime_configuration.log_format)
+          @default_appender = SemanticLogger.add_appender(file_name: path, formatter: formatter)
         else
-          @default_appender = SemanticLogger.add_appender(io: $stdout, formatter: runtime_configuration.log_format)
+          @default_appender = SemanticLogger.add_appender(io: $stdout, formatter: formatter)
         end
+        PactBroker::Logging::OpenTelemetryAppenderSetup.call(runtime_configuration)
         @logger_from_runtime_configuration = SemanticLogger["pact-broker"]
       end
     end
 
+    def resolve_log_formatter(log_format)
+      if log_format == :json
+        PactBroker::Logging::TraceAwareJsonFormatter.new
+      else
+        log_format
+      end
+    end
+    private :resolve_log_formatter
+
     def logger
       custom_logger || logger_from_runtime_configuration
     end

data/lib/pact_broker/dataset.rb

@@ -8,10 +8,6 @@ module PactBroker
     module Helpers
       extend self
 
-      def mysql?
-        Sequel::Model.db.adapter_scheme.to_s =~ /mysql/
-      end
-
       def postgres?
         Sequel::Model.db.adapter_scheme.to_s =~ /postgres/
       end
@@ -32,14 +28,9 @@ module PactBroker
 
     def name_like column_name, value
       if PactBroker.configuration.use_case_sensitive_resource_names
-        if mysql?
-          # sigh, mysql, this is the only way to perform a case sensitive search
-          Sequel.like(column_name, value.gsub("_", "\\_"), { case_insensitive: false })
-        else
-          { column_name => value }
-        end
+        { column_name => value }
       else
-        Sequel.like(column_name, value.gsub("_", "\\_"), { case_insensitive: true })
+        Sequel.like(column_name, escape_wildcards(value), { case_insensitive: true })
       end
     end
 
@@ -82,12 +73,7 @@ module PactBroker
     end
 
     def select_for_subquery column
-      if mysql? #stoopid mysql doesn't allow you to modify datasets with subqueries
-        column_name = column.respond_to?(:alias) ? column.alias : column
-        select(column).collect{ | it | it[column_name] }
-      else
-        select(column)
-      end
+      select(column)
     end
 
     def no_columns_selected?
@@ -109,12 +95,7 @@ module Sequel
   # This has been used inconsistently, and in the next major version, support for case insensitive names will be dropped.
   def self.name_like(column_name, value)
     if PactBroker.configuration.use_case_sensitive_resource_names
-      if PactBroker::Dataset::Helpers.mysql?
-        # sigh, mysql, this is the only way to perform a case sensitive search
-        Sequel.like(column_name, PactBroker::Dataset::Helpers.escape_wildcards(value), { case_insensitive: false })
-      else
-        { column_name => value }
-      end
+      { column_name => value }
     else
       Sequel.like(column_name, PactBroker::Dataset::Helpers.escape_wildcards(value), { case_insensitive: true })
     end

data/lib/pact_broker/db/clean_incremental.rb

@@ -46,9 +46,9 @@ module PactBroker
       def execute_clean
         db.transaction do
           before_counts = current_counts
+          delete_stale_branches
           PactBroker::Domain::Version.where(id: versions_to_delete.from_self.select_map(:id)).delete
           delete_orphan_pact_versions
-          delete_stale_branches
           after_counts = current_counts
 
           TABLES.each_with_object({}) do | table_name, comparison_counts |
@@ -116,8 +116,9 @@ module PactBroker
       def delete_stale_branches
         return unless keep_branches && !keep_branches.empty?
 
-        # A direct subquery here fails in MySQL, so wrap the dataset in a
-        # derived table with `from_self` before selecting the ids for deletion.
+        # Wrap the dataset in a derived table with `from_self` before selecting
+        # the ids for deletion, to avoid referencing the target table directly
+        # in the subquery.
         PactBroker::Versions::Branch.where(id: stale_branch_ids_to_delete.from_self.select(:id)).delete
       end
 
@@ -156,11 +157,6 @@ module PactBroker
 
       def delete_orphan_pact_versions
         db[:pact_versions].where(id: orphan_pact_versions).delete
-      rescue Sequel::DatabaseError => e
-        raise unless e.cause.class.name == "Mysql2::Error"
-
-        ids = orphan_pact_versions.map { |row| row[:id] }
-        db[:pact_versions].where(id: ids).delete
       end
 
       def orphan_pact_versions

data/lib/pact_broker/db.rb

@@ -57,12 +57,5 @@ module PactBroker
       PactBroker::DB::ValidateEncoding.(connection)
     end
 
-    def self.set_mysql_strict_mode_if_mysql
-      connection.run("SET sql_mode='STRICT_TRANS_TABLES';") if mysql?
-    end
-
-    def self.mysql?
-      connection.adapter_scheme =~ /mysql/
-    end
   end
 end