pact_broker 2.15.0 → 2.16.0

data/db/migrations/20180202_create_materialized_head_matrix.rb

@@ -0,0 +1,34 @@
+Sequel.migration do
+  up do
+    create_table(:materialized_head_matrix, charset: 'utf8') do
+      Integer :consumer_id, null: false
+      String :consumer_name, null: false
+      Integer :consumer_version_id, null: false
+      String :consumer_version_number, null: false
+      Integer :consumer_version_order, null: false
+      Integer :pact_publication_id, null: false
+      Integer :pact_version_id, null: false
+      String :pact_version_sha, null: false
+      Integer :pact_revision_number, null: false
+      DateTime :pact_created_at, null: false
+      Integer :provider_id, null: false
+      String :provider_name, null: false
+      Integer :provider_version_id
+      String :provider_version_number
+      Integer :provider_version_order
+      Integer :verification_id
+      Boolean :success
+      Integer :verification_number
+      DateTime :verification_executed_at
+      String :verification_build_url
+      String :consumer_tag_name
+      index [:consumer_id], name: 'ndx_mhm_consumer_id'
+      index [:provider_id], name: 'ndx_mhm_provider_id'
+      index [:consumer_version_order], name: 'ndx_mhm_cv_ord'
+    end
+  end
+
+  down do
+    drop_table(:materialized_head_matrix)
+  end
+end

data/db/migrations/20180203_fix_head_matrix.rb

@@ -0,0 +1,36 @@
+Sequel.migration do
+  up do
+    # A row for each of the latest pact publications,
+    # and a row for each of the latest tagged pact publications.
+    # This definition fixes the missing revision number join in
+    # 20180201_create_head_matrix.rb
+    create_or_replace_view(:head_matrix,
+      "SELECT matrix.*, hpp.tag_name as consumer_tag_name
+      FROM latest_matrix_for_consumer_version_and_provider_version matrix
+      INNER JOIN head_pact_publications hpp
+      ON matrix.consumer_id = hpp.consumer_id
+      AND matrix.provider_id = hpp.provider_id
+      AND matrix.consumer_version_order = hpp.consumer_version_order
+      AND matrix.pact_revision_number = hpp.revision_number
+      INNER JOIN latest_verification_id_for_consumer_version_and_provider AS lv
+      ON matrix.consumer_version_id = lv.consumer_version_id
+      AND matrix.provider_id = lv.provider_id
+      AND matrix.verification_id = lv.latest_verification_id
+
+      UNION
+
+      SELECT matrix.*, hpp.tag_name as consumer_tag_name
+      FROM latest_matrix_for_consumer_version_and_provider_version matrix
+      INNER JOIN head_pact_publications hpp
+      ON matrix.consumer_id = hpp.consumer_id
+      AND matrix.provider_id = hpp.provider_id
+      AND matrix.consumer_version_order = hpp.consumer_version_order
+      AND matrix.pact_revision_number = hpp.revision_number
+      where verification_id is null
+      "
+    )
+  end
+
+  down do
+  end
+end

data/db/migrations/20180204_fix_latest_matrix_for_cv_and_pv.rb

@@ -0,0 +1,57 @@
+Sequel.migration do
+  up do
+    # Removes 'overwritten' pacts and verifications from the matrix
+    # (ie. only show latest pact revision for each consumer version and
+    # latest verification for each provider version)
+    # Must include lines where verification_id is null so that we don't
+    # lose the unverified pacts.
+    # In this view there will be one row for each consumer version/provider version
+    # This view used to be (stupidly) called latest_matrix
+    create_or_replace_view(:latest_matrix_for_consumer_version_and_provider_version,
+      "
+      SELECT matrix.* FROM matrix
+      inner join latest_pact_publication_revision_numbers lr
+      on matrix.consumer_id = lr.consumer_id
+      and matrix.provider_id = lr.provider_id
+      and matrix.consumer_version_order = lr.consumer_version_order
+      and matrix.pact_revision_number = lr.latest_revision_number
+      INNER JOIN latest_verification_id_for_consumer_version_and_provider_version AS lv
+      ON ((matrix.consumer_version_id = lv.consumer_version_id)
+      AND (matrix.provider_version_id = lv.provider_version_id)
+      AND ((matrix.verification_id = lv.latest_verification_id)))
+
+      UNION
+
+      select matrix.* from matrix
+      inner join latest_pact_publication_revision_numbers lr
+      on matrix.consumer_id = lr.consumer_id
+      and matrix.provider_id = lr.provider_id
+      and matrix.consumer_version_order = lr.consumer_version_order
+      and matrix.pact_revision_number = lr.latest_revision_number
+      where verification_id is null
+      "
+    )
+  end
+
+  down do
+    # revert to dodgey definition
+    create_or_replace_view(:latest_matrix_for_consumer_version_and_provider_version,
+      "SELECT matrix.* FROM matrix
+      INNER JOIN latest_verification_id_for_consumer_version_and_provider_version AS lv
+      ON ((matrix.consumer_version_id = lv.consumer_version_id)
+      AND (matrix.provider_version_id = lv.provider_version_id)
+      AND ((matrix.verification_id = lv.latest_verification_id)))
+
+      UNION
+
+      select matrix.* from matrix
+      inner join latest_pact_publication_revision_numbers lr
+      on matrix.consumer_id = lr.consumer_id
+      and matrix.provider_id = lr.provider_id
+      and matrix.consumer_version_order = lr.consumer_version_order
+      and matrix.pact_revision_number = lr.latest_revision_number
+      where verification_id is null
+      "
+    )
+  end
+end

data/db/migrations/20180205_drop_materialized_latest_matrix.rb

@@ -0,0 +1,36 @@
+Sequel.migration do
+  up do
+    # removing this as it has been replaced by materialized_head_matrix
+    drop_table(:materialized_latest_matrix)
+  end
+
+  down do
+    create_table(:materialized_latest_matrix, charset: 'utf8') do
+      Integer :consumer_id, null: false
+      String :consumer_name, null: false
+      Integer :consumer_version_id, null: false
+      String :consumer_version_number, null: false
+      Integer :consumer_version_order, null: false
+      Integer :pact_publication_id, null: false
+      Integer :pact_version_id, null: false
+      String :pact_version_sha, null: false
+      Integer :pact_revision_number, null: false
+      DateTime :pact_created_at, null: false
+      Integer :provider_id, null: false
+      String :provider_name, null: false
+      Integer :provider_version_id
+      String :provider_version_number
+      Integer :provider_version_order
+      Integer :verification_id
+      Boolean :success
+      Integer :verification_number
+      DateTime :verification_executed_at
+      String :verification_build_url
+      index [:consumer_id], name: 'ndx_mlm_consumer_id'
+      index [:provider_id], name: 'ndx_mlm_provider_id'
+      index [:consumer_version_order], name: 'ndx_mlm_cv_ord'
+    end
+
+    from(:materialized_latest_matrix).insert(from(:latest_matrix).select_all)
+  end
+end

data/db/migrations/20180206_recreate_head_matrix_rename_consumer_tag_name.rb

@@ -0,0 +1,68 @@
+Sequel.migration do
+  up do
+    # a row for each of the latest pact publications,
+    # and a row for each of the latest tagged pact publications
+    drop_view(:head_matrix)
+    create_view(:head_matrix,
+      "SELECT matrix.*, hpp.tag_name as consumer_version_tag_name
+      FROM latest_matrix_for_consumer_version_and_provider_version matrix
+      INNER JOIN head_pact_publications hpp
+      ON matrix.consumer_id = hpp.consumer_id
+      AND matrix.provider_id = hpp.provider_id
+      AND matrix.consumer_version_order = hpp.consumer_version_order
+      INNER JOIN latest_verification_id_for_consumer_version_and_provider AS lv
+      ON matrix.consumer_version_id = lv.consumer_version_id
+      AND matrix.provider_id = lv.provider_id
+      AND matrix.verification_id = lv.latest_verification_id
+
+      UNION
+
+      SELECT matrix.*, hpp.tag_name as consumer_version_tag_name
+      FROM latest_matrix_for_consumer_version_and_provider_version matrix
+      INNER JOIN head_pact_publications hpp
+      ON matrix.consumer_id = hpp.consumer_id
+      AND matrix.provider_id = hpp.provider_id
+      AND matrix.consumer_version_order = hpp.consumer_version_order
+      where verification_id is null
+      "
+    )
+
+    alter_table(:materialized_head_matrix) do
+      rename_column(:consumer_tag_name, :consumer_version_tag_name)
+    end
+  end
+
+  down do
+    alter_table(:materialized_head_matrix) do
+      rename_column(:consumer_version_tag_name, :consumer_tag_name)
+    end
+
+    drop_view(:head_matrix)
+    create_view(:head_matrix,
+      "SELECT matrix.*, hpp.tag_name as consumer_tag_name
+      FROM latest_matrix_for_consumer_version_and_provider_version matrix
+      INNER JOIN head_pact_publications hpp
+      ON matrix.consumer_id = hpp.consumer_id
+      AND matrix.provider_id = hpp.provider_id
+      AND matrix.consumer_version_order = hpp.consumer_version_order
+      INNER JOIN latest_verification_id_for_consumer_version_and_provider AS lv
+      ON matrix.consumer_version_id = lv.consumer_version_id
+      AND matrix.provider_id = lv.provider_id
+      AND matrix.verification_id = lv.latest_verification_id
+
+      UNION
+
+      SELECT matrix.*, hpp.tag_name as consumer_tag_name
+      FROM latest_matrix_for_consumer_version_and_provider_version matrix
+      INNER JOIN head_pact_publications hpp
+      ON matrix.consumer_id = hpp.consumer_id
+      AND matrix.provider_id = hpp.provider_id
+      AND matrix.consumer_version_order = hpp.consumer_version_order
+      where verification_id is null
+      "
+    )
+
+    from(:materialized_head_matrix).delete
+    from(:materialized_head_matrix).insert(from(:head_matrix).select_all)
+  end
+end

data/db/migrations/20180207_recreate_head_matrix_union_all.rb

@@ -0,0 +1,60 @@
+Sequel.migration do
+  up do
+    # a row for each of the latest pact publications,
+    # and a row for each of the latest tagged pact publications
+    drop_view(:head_matrix)
+    create_view(:head_matrix,
+      "SELECT matrix.*, hpp.tag_name as consumer_version_tag_name
+      FROM latest_matrix_for_consumer_version_and_provider_version matrix
+      INNER JOIN head_pact_publications hpp
+      ON matrix.consumer_id = hpp.consumer_id
+      AND matrix.provider_id = hpp.provider_id
+      AND matrix.consumer_version_order = hpp.consumer_version_order
+      INNER JOIN latest_verification_id_for_consumer_version_and_provider AS lv
+      ON matrix.consumer_version_id = lv.consumer_version_id
+      AND matrix.provider_id = lv.provider_id
+      AND matrix.verification_id = lv.latest_verification_id
+
+      UNION ALL
+
+      SELECT matrix.*, hpp.tag_name as consumer_version_tag_name
+      FROM latest_matrix_for_consumer_version_and_provider_version matrix
+      INNER JOIN head_pact_publications hpp
+      ON matrix.consumer_id = hpp.consumer_id
+      AND matrix.provider_id = hpp.provider_id
+      AND matrix.consumer_version_order = hpp.consumer_version_order
+      where verification_id is null
+      "
+    )
+  end
+
+  down do
+    drop_view(:head_matrix)
+    create_view(:head_matrix,
+      "SELECT matrix.*, hpp.tag_name as consumer_version_tag_name
+      FROM latest_matrix_for_consumer_version_and_provider_version matrix
+      INNER JOIN head_pact_publications hpp
+      ON matrix.consumer_id = hpp.consumer_id
+      AND matrix.provider_id = hpp.provider_id
+      AND matrix.consumer_version_order = hpp.consumer_version_order
+      INNER JOIN latest_verification_id_for_consumer_version_and_provider AS lv
+      ON matrix.consumer_version_id = lv.consumer_version_id
+      AND matrix.provider_id = lv.provider_id
+      AND matrix.verification_id = lv.latest_verification_id
+
+      UNION
+
+      SELECT matrix.*, hpp.tag_name as consumer_version_tag_name
+      FROM latest_matrix_for_consumer_version_and_provider_version matrix
+      INNER JOIN head_pact_publications hpp
+      ON matrix.consumer_id = hpp.consumer_id
+      AND matrix.provider_id = hpp.provider_id
+      AND matrix.consumer_version_order = hpp.consumer_version_order
+      where verification_id is null
+      "
+    )
+
+    from(:materialized_head_matrix).delete
+    from(:materialized_head_matrix).insert(from(:head_matrix).select_all)
+  end
+end

data/db/migrations/20180208_add_cv_tag_name_index_to_mat_head_matrix.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table(:materialized_head_matrix) do
+      add_index(:consumer_version_tag_name)
+    end
+  end
+end

data/db/migrations/20180209_recreate_latest_matrix_for_cv_and_pv_union_all.rb

@@ -0,0 +1,54 @@
+Sequel.migration do
+  up do
+    # Removes 'overwritten' pacts and verifications from the matrix
+    # (ie. only show latest pact revision for each consumer version and
+    # latest verification for each provider version)
+    # Must include lines where verification_id is null so that we don't
+    # lose the unverified pacts.
+    # In this view there will be one row for each consumer version/provider version
+    # This view used to be (stupidly) called latest_matrix
+
+    # Copied the wrong definition here, forgot about the join to latest_pact_publication_revision_numbers
+    # fixed in 20180210_fix_latest_matrix_for_cv_and_pv_again.rb
+    create_or_replace_view(:latest_matrix_for_consumer_version_and_provider_version,
+      "SELECT matrix.* FROM matrix
+      INNER JOIN latest_verification_id_for_consumer_version_and_provider_version AS lv
+      ON ((matrix.consumer_version_id = lv.consumer_version_id)
+      AND (matrix.provider_version_id = lv.provider_version_id)
+      AND ((matrix.verification_id = lv.latest_verification_id)))
+
+      UNION ALL
+
+      select matrix.* from matrix
+      inner join latest_pact_publication_revision_numbers lr
+      on matrix.consumer_id = lr.consumer_id
+      and matrix.provider_id = lr.provider_id
+      and matrix.consumer_version_order = lr.consumer_version_order
+      and matrix.pact_revision_number = lr.latest_revision_number
+      where verification_id is null
+      "
+    )
+  end
+
+  down do
+    # revert to previous crappy definition
+    create_or_replace_view(:latest_matrix_for_consumer_version_and_provider_version,
+      "SELECT matrix.* FROM matrix
+      INNER JOIN latest_verification_id_for_consumer_version_and_provider_version AS lv
+      ON ((matrix.consumer_version_id = lv.consumer_version_id)
+      AND (matrix.provider_version_id = lv.provider_version_id)
+      AND ((matrix.verification_id = lv.latest_verification_id)))
+
+      UNION
+
+      select matrix.* from matrix
+      inner join latest_pact_publication_revision_numbers lr
+      on matrix.consumer_id = lr.consumer_id
+      and matrix.provider_id = lr.provider_id
+      and matrix.consumer_version_order = lr.consumer_version_order
+      and matrix.pact_revision_number = lr.latest_revision_number
+      where verification_id is null
+      "
+    )
+  end
+end

data/db/migrations/20180210_fix_latest_matrix_for_cv_and_pv_again.rb

@@ -0,0 +1,53 @@
+Sequel.migration do
+  up do
+    # In this view there will be one row for each consumer version/provider version
+    # Removes 'overwritten' pacts and verifications from the full matrix
+    # (ie. only show latest pact revision for each consumer version and
+    # latest verification for each provider version)
+    # Must include lines where verification_id is null so that we don't
+    # lose the unverified pacts.
+    # This view used to be (stupidly) called latest_matrix
+
+    # Fix mistakenly copied definition in 20180209_recreate_latest_matrix_for_cv_and_pv_union_all.rb
+    # which missed the join to latest_pact_publication_revision_numbers.
+
+    # Change this view to be based on materialized_matrix instead of matrix
+    # to speed it up.
+    # Note! This does mean there is a dependency on having updated
+    # materialized_matrix FIRST that may cause problems. Will see how it goes.
+
+    alter_table(:materialized_matrix) do
+      add_index [:verification_id], name: 'ndx_mm_verif_id'
+      add_index [:pact_revision_number], name: 'ndx_mm_pact_rev_num'
+    end
+
+    create_or_replace_view(:latest_matrix_for_consumer_version_and_provider_version,
+      "SELECT matrix.* FROM materialized_matrix matrix
+      inner join latest_pact_publication_revision_numbers lr
+      on matrix.consumer_id = lr.consumer_id
+      and matrix.provider_id = lr.provider_id
+      and matrix.consumer_version_order = lr.consumer_version_order
+      and matrix.pact_revision_number = lr.latest_revision_number
+      INNER JOIN latest_verification_id_for_consumer_version_and_provider_version AS lv
+      ON ((matrix.consumer_version_id = lv.consumer_version_id)
+      AND (matrix.provider_version_id = lv.provider_version_id)
+      AND ((matrix.verification_id = lv.latest_verification_id)))
+
+      UNION ALL
+
+      select matrix.* from materialized_matrix matrix
+      inner join latest_pact_publication_revision_numbers lr
+      on matrix.consumer_id = lr.consumer_id
+      and matrix.provider_id = lr.provider_id
+      and matrix.consumer_version_order = lr.consumer_version_order
+      and matrix.pact_revision_number = lr.latest_revision_number
+      where verification_id is null
+      "
+    )
+    from(:materialized_head_matrix).delete
+    from(:materialized_head_matrix).insert(from(:head_matrix).select_all)
+  end
+
+  down do
+  end
+end

data/db/migrations/migration_helper.rb

@@ -21,5 +21,13 @@ module PactBroker
     def adapter
       Sequel::Model.db.adapter_scheme.to_s
     end
+
+    def sqlite_safe string
+      if adapter == 'sqlite'
+        string.gsub(/\border\b/, '`order`')
+      else
+        string
+      end
+    end
   end
 end

data/db/test/backwards_compatibility/Rakefile

@@ -20,7 +20,7 @@ def start_pact_broker code_version, port
     puts command
     IO.popen(command)
   end
-  sleep 2
+  sleep 4
 end
 
 def kill_servers