diff --git a/db/migrate/20160528065150_remove_rubygems_downloads.rb b/db/migrate/20160528065150_remove_rubygems_downloads.rb new file mode 100644 index 00000000000..977dbf51085 --- /dev/null +++ b/db/migrate/20160528065150_remove_rubygems_downloads.rb @@ -0,0 +1,5 @@ +class RemoveRubygemsDownloads < ActiveRecord::Migration + def change + remove_column :rubygems, :downloads, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index a9de7c010dd..996caef113f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160527190738) do +ActiveRecord::Schema.define(version: 20160528065150) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -152,7 +152,6 @@ t.string "name" t.datetime "created_at" t.datetime "updated_at" - t.integer "downloads", default: 0 t.string "slug" end @@ -192,14 +191,6 @@ add_index "users", ["remember_token"], name: "index_users_on_remember_token", using: :btree add_index "users", ["token"], name: "index_users_on_token", using: :btree - create_table "version_histories", force: :cascade do |t| - t.integer "version_id" - t.date "day" - t.integer "count" - end - - add_index "version_histories", ["version_id", "day"], name: "index_version_histories_on_version_id_and_day", unique: true, using: :btree - create_table "versions", force: :cascade do |t| t.text "authors" t.text "description" diff --git a/doc/erd.svg b/doc/erd.svg index e8794197556..3c8c91da427 100644 --- a/doc/erd.svg +++ b/doc/erd.svg @@ -177,28 +177,26 @@ m_Rubygem - -Rubygem - -downloads -integer -name -string ∗ U -slug -string + +Rubygem + +name +string ∗ U +slug +string m_Rubygem->m_Dependency - + m_Rubygem->m_GemDownload - + m_Rubygem->m_Linkset - + m_Rubygem->m_Ownership @@ -247,13 +245,13 @@ m_Rubygem->m_User - - + + m_Rubygem->m_User - - + + m_Version @@ -299,8 +297,8 @@ m_Rubygem->m_Version - - + + m_WebHook @@ -314,8 +312,8 @@ m_Rubygem->m_WebHook - - + + m_User->m_Deletion diff --git a/test/factories.rb b/test/factories.rb index 2c74f58e276..6c2702792aa 100644 --- a/test/factories.rb +++ b/test/factories.rb @@ -58,6 +58,7 @@ transient do owners [] number nil + downloads 0 end linkset diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 37e3afec01e..f72a522ff58 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -175,9 +175,8 @@ class UserTest < ActiveSupport::TestCase context "rubygems" do setup do @user = create(:user) - @rubygems = [[100, 2000], [200, 1000], [300, 3000]].map do |downloads, real_downloads| - create(:rubygem, downloads: downloads).tap do |rubygem| - GemDownload.find_by(rubygem_id: rubygem.id, version_id: 0).update(count: real_downloads) + @rubygems = [2000, 1000, 3000].map do |download| + create(:rubygem, downloads: download).tap do |rubygem| create(:ownership, rubygem: rubygem, user: @user) create(:version, rubygem: rubygem) end