Add latest changes from gitlab-org/gitlab@master

3 files changed, 42 insertions, 0 deletions

diff --git a/db/migrate/20190828170945_create_package_metadatum.rb b/db/migrate/20190828170945_create_package_metadatum.rb
new file mode 100644
index 00000000000..3047b812e0e
--- /dev/null
+++ b/db/migrate/20190828170945_create_package_metadatum.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreatePackageMetadatum < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    create_table :packages_package_metadata do |t|
+      t.references :package, index: { unique: true }, null: false, foreign_key: { to_table: :packages_packages, on_delete: :cascade }, type: :integer
+      t.binary :metadata, null: false
+    end
+  end
+end
diff --git a/db/migrate/20190828172831_create_package_tag.rb b/db/migrate/20190828172831_create_package_tag.rb
new file mode 100644
index 00000000000..baf0a5cf11b
--- /dev/null
+++ b/db/migrate/20190828172831_create_package_tag.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true .
+
+class CreatePackageTag < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    create_table :packages_package_tags do |t|
+      t.references :package, index: true, null: false, foreign_key: { to_table: :packages_packages, on_delete: :cascade }, type: :integer
+      t.string :name, limit: 255, null: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1460a8b11e8..8310d15fa9a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2498,6 +2498,18 @@ ActiveRecord::Schema.define(version: 2019_09_12_061145) do
     t.index ["package_id", "file_name"], name: "index_packages_package_files_on_package_id_and_file_name"
   end
 
+  create_table "packages_package_metadata", force: :cascade do |t|
+    t.integer "package_id", null: false
+    t.binary "metadata", null: false
+    t.index ["package_id"], name: "index_packages_package_metadata_on_package_id", unique: true
+  end
+
+  create_table "packages_package_tags", force: :cascade do |t|
+    t.integer "package_id", null: false
+    t.string "name", limit: 255, null: false
+    t.index ["package_id"], name: "index_packages_package_tags_on_package_id"
+  end
+
   create_table "packages_packages", force: :cascade do |t|
     t.integer "project_id", null: false
     t.datetime_with_timezone "created_at", null: false
@@ -4023,6 +4035,8 @@ ActiveRecord::Schema.define(version: 2019_09_12_061145) do
   add_foreign_key "operations_feature_flags_clients", "projects", on_delete: :cascade
   add_foreign_key "packages_maven_metadata", "packages_packages", column: "package_id", name: "fk_be88aed360", on_delete: :cascade
   add_foreign_key "packages_package_files", "packages_packages", column: "package_id", name: "fk_86f0f182f8", on_delete: :cascade
+  add_foreign_key "packages_package_metadata", "packages_packages", column: "package_id", on_delete: :cascade
+  add_foreign_key "packages_package_tags", "packages_packages", column: "package_id", on_delete: :cascade
   add_foreign_key "packages_packages", "projects", on_delete: :cascade
   add_foreign_key "pages_domain_acme_orders", "pages_domains", on_delete: :cascade
   add_foreign_key "pages_domains", "projects", name: "fk_ea2f6dfc6f", on_delete: :cascade