diff --git a/app/models/news_feed.rb b/app/models/news_feed.rb index ea0111e..722d9e0 100644 --- a/app/models/news_feed.rb +++ b/app/models/news_feed.rb @@ -57,7 +57,7 @@ def self.fetch_feeds # # Table name: news_feeds # -# id :uuid not null, primary key +# id :bigint not null, primary key # library_group_id :integer default(1), not null # title :string # url :string diff --git a/app/models/news_post.rb b/app/models/news_post.rb index 8d99ceb..4d11a59 100644 --- a/app/models/news_post.rb +++ b/app/models/news_post.rb @@ -35,10 +35,10 @@ def check_date # # Table name: news_posts # -# id :uuid not null, primary key +# id :bigint not null, primary key # title :text # body :text -# user_id :bigint(8) not null +# user_id :bigint not null # start_date :datetime # end_date :datetime # required_role_id :integer default(1), not null diff --git a/db/migrate/20081031033632_create_news_feeds.rb b/db/migrate/20081031033632_create_news_feeds.rb index 6350066..a48ac04 100644 --- a/db/migrate/20081031033632_create_news_feeds.rb +++ b/db/migrate/20081031033632_create_news_feeds.rb @@ -1,6 +1,6 @@ class CreateNewsFeeds < ActiveRecord::Migration[5.2] def change - create_table :news_feeds, id: :uuid do |t| + create_table :news_feeds do |t| t.integer :library_group_id, default: 1, null: false t.string :title t.string :url diff --git a/db/migrate/20090126071155_create_news_posts.rb b/db/migrate/20090126071155_create_news_posts.rb index 6457512..164987b 100644 --- a/db/migrate/20090126071155_create_news_posts.rb +++ b/db/migrate/20090126071155_create_news_posts.rb @@ -1,6 +1,6 @@ class CreateNewsPosts < ActiveRecord::Migration[5.2] def change - create_table :news_posts, id: :uuid do |t| + create_table :news_posts do |t| t.text :title t.text :body t.references :user, foreign_key: true, null: false diff --git a/spec/dummy/db/migrate/001_create_agents.rb b/spec/dummy/db/migrate/001_create_agents.rb index ef012e7..952641a 100644 --- a/spec/dummy/db/migrate/001_create_agents.rb +++ b/spec/dummy/db/migrate/001_create_agents.rb @@ -1,6 +1,6 @@ class CreateAgents < ActiveRecord::Migration[5.2] def change - create_table :agents, id: :uuid do |t| + create_table :agents do |t| t.string :last_name t.string :middle_name t.string :first_name diff --git a/spec/dummy/db/migrate/005_create_manifestations.rb b/spec/dummy/db/migrate/005_create_manifestations.rb index 87f4db5..ef45130 100644 --- a/spec/dummy/db/migrate/005_create_manifestations.rb +++ b/spec/dummy/db/migrate/005_create_manifestations.rb @@ -1,6 +1,6 @@ class CreateManifestations < ActiveRecord::Migration[5.2] def change - create_table :manifestations, id: :uuid do |t| + create_table :manifestations do |t| t.text :original_title, null: false t.text :title_alternative t.text :title_transcription diff --git a/spec/dummy/db/migrate/006_create_items.rb b/spec/dummy/db/migrate/006_create_items.rb index 08102a2..d0334d1 100644 --- a/spec/dummy/db/migrate/006_create_items.rb +++ b/spec/dummy/db/migrate/006_create_items.rb @@ -1,10 +1,10 @@ class CreateItems < ActiveRecord::Migration[5.2] def change - create_table :items, id: :uuid do |t| + create_table :items do |t| t.string :call_number t.string :item_identifier, index: {unique: true} t.timestamps - t.references :shelf, type: :uuid + t.references :shelf t.boolean :include_supplements, default: false, null: false t.text :note t.string :url diff --git a/spec/dummy/db/migrate/012_create_owns.rb b/spec/dummy/db/migrate/012_create_owns.rb index 4525a9a..b71cdfc 100644 --- a/spec/dummy/db/migrate/012_create_owns.rb +++ b/spec/dummy/db/migrate/012_create_owns.rb @@ -1,8 +1,8 @@ class CreateOwns < ActiveRecord::Migration[5.2] def change create_table :owns do |t| - t.references :agent, null: false, type: :uuid - t.references :item, null: false, type: :uuid + t.references :agent, null: false + t.references :item, null: false t.integer :position t.timestamps end diff --git a/spec/dummy/db/migrate/015_create_creates.rb b/spec/dummy/db/migrate/015_create_creates.rb index e373382..1091383 100644 --- a/spec/dummy/db/migrate/015_create_creates.rb +++ b/spec/dummy/db/migrate/015_create_creates.rb @@ -1,8 +1,8 @@ class CreateCreates < ActiveRecord::Migration[5.2] def change create_table :creates do |t| - t.references :agent, foreign_key: true, null: false, type: :uuid - t.references :work, null: false, type: :uuid, foreign_key: {to_table: :manifestations} + t.references :agent, foreign_key: true, null: false + t.references :work, null: false, foreign_key: {to_table: :manifestations} t.integer :position t.timestamps end diff --git a/spec/dummy/db/migrate/047_create_produces.rb b/spec/dummy/db/migrate/047_create_produces.rb index e9eefc8..3bf3e33 100644 --- a/spec/dummy/db/migrate/047_create_produces.rb +++ b/spec/dummy/db/migrate/047_create_produces.rb @@ -1,8 +1,8 @@ class CreateProduces < ActiveRecord::Migration[5.2] def change create_table :produces do |t| - t.references :agent, foreign_key: true, null: false, type: :uuid - t.references :manifestation, foreign_key: true, null: false, type: :uuid + t.references :agent, foreign_key: true, null: false + t.references :manifestation, foreign_key: true, null: false t.integer :position t.timestamps end diff --git a/spec/dummy/db/migrate/059_create_libraries.rb b/spec/dummy/db/migrate/059_create_libraries.rb index d05fac2..4e6d6b2 100644 --- a/spec/dummy/db/migrate/059_create_libraries.rb +++ b/spec/dummy/db/migrate/059_create_libraries.rb @@ -1,6 +1,6 @@ class CreateLibraries < ActiveRecord::Migration[5.2] def change - create_table :libraries, id: :uuid do |t| + create_table :libraries do |t| t.string :name, index: {unique: true}, null: false t.jsonb :display_name_translations, default: {}, null: false t.string :short_display_name, null: false diff --git a/spec/dummy/db/migrate/069_create_shelves.rb b/spec/dummy/db/migrate/069_create_shelves.rb index dc3090f..641efbf 100644 --- a/spec/dummy/db/migrate/069_create_shelves.rb +++ b/spec/dummy/db/migrate/069_create_shelves.rb @@ -1,10 +1,10 @@ class CreateShelves < ActiveRecord::Migration[5.2] def change - create_table :shelves, id: :uuid do |t| + create_table :shelves do |t| t.string :name, null: false t.jsonb :display_name_translations, default: {}, null: false t.text :note - t.references :library, foreign_key: true, null: false, type: :uuid + t.references :library, foreign_key: true, null: false t.integer :items_count, default: 0, null: false t.integer :position t.timestamps diff --git a/spec/dummy/db/migrate/073_create_carrier_types.rb b/spec/dummy/db/migrate/073_create_carrier_types.rb index 3e3d990..75754d6 100644 --- a/spec/dummy/db/migrate/073_create_carrier_types.rb +++ b/spec/dummy/db/migrate/073_create_carrier_types.rb @@ -1,12 +1,12 @@ class CreateCarrierTypes < ActiveRecord::Migration[5.2] def change - create_table :carrier_types, id: :uuid do |t| + create_table :carrier_types do |t| t.string :name, null: false, index: {unique: true} t.jsonb :display_name_translations, default: {}, null: false t.text :note t.integer :position t.timestamps end - add_reference :manifestations, :carrier_type, foreign_key: true, type: :uuid, null: false + add_reference :manifestations, :carrier_type, foreign_key: true, null: false end end diff --git a/spec/dummy/db/migrate/077_create_user_groups.rb b/spec/dummy/db/migrate/077_create_user_groups.rb index 8d62140..9e81f6c 100644 --- a/spec/dummy/db/migrate/077_create_user_groups.rb +++ b/spec/dummy/db/migrate/077_create_user_groups.rb @@ -1,6 +1,6 @@ class CreateUserGroups < ActiveRecord::Migration[5.2] def change - create_table :user_groups, id: :uuid do |t| + create_table :user_groups do |t| t.string :name, index: {unique: true}, null: false t.jsonb :display_name_translations, default: {}, null: false t.text :note diff --git a/spec/dummy/db/migrate/120_create_baskets.rb b/spec/dummy/db/migrate/120_create_baskets.rb index 7227671..e9c4b98 100644 --- a/spec/dummy/db/migrate/120_create_baskets.rb +++ b/spec/dummy/db/migrate/120_create_baskets.rb @@ -1,6 +1,6 @@ class CreateBaskets < ActiveRecord::Migration[5.2] def change - create_table :baskets, id: :uuid do |t| + create_table :baskets do |t| t.references :user, foreign_key: true t.text :note t.integer :lock_version, default: 0, null: false diff --git a/spec/dummy/db/migrate/124_create_bookstores.rb b/spec/dummy/db/migrate/124_create_bookstores.rb index 62bbce9..0fcb755 100644 --- a/spec/dummy/db/migrate/124_create_bookstores.rb +++ b/spec/dummy/db/migrate/124_create_bookstores.rb @@ -1,6 +1,6 @@ class CreateBookstores < ActiveRecord::Migration[5.2] def change - create_table :bookstores, id: :uuid do |t| + create_table :bookstores do |t| t.text :name, null: false t.string :zip_code t.text :address diff --git a/spec/dummy/db/migrate/125_create_donates.rb b/spec/dummy/db/migrate/125_create_donates.rb index e198450..be03730 100644 --- a/spec/dummy/db/migrate/125_create_donates.rb +++ b/spec/dummy/db/migrate/125_create_donates.rb @@ -1,8 +1,8 @@ class CreateDonates < ActiveRecord::Migration[5.2] def change create_table :donates do |t| - t.references :agent, foreign_key: true, null: false, type: :uuid - t.references :item, foreign_key: true, null: false, type: :uuid + t.references :agent, foreign_key: true, null: false + t.references :item, foreign_key: true, null: false t.timestamps end diff --git a/spec/dummy/db/migrate/133_create_agent_merges.rb b/spec/dummy/db/migrate/133_create_agent_merges.rb index 513f19f..f3d2147 100644 --- a/spec/dummy/db/migrate/133_create_agent_merges.rb +++ b/spec/dummy/db/migrate/133_create_agent_merges.rb @@ -1,8 +1,8 @@ class CreateAgentMerges < ActiveRecord::Migration[5.2] def change create_table :agent_merges do |t| - t.references :agent, foreign_key: true, null: false, type: :uuid - t.references :agent_merge_list, null: false, type: :uuid + t.references :agent, foreign_key: true, null: false + t.references :agent_merge_list, null: false t.timestamps end diff --git a/spec/dummy/db/migrate/134_create_agent_merge_lists.rb b/spec/dummy/db/migrate/134_create_agent_merge_lists.rb index 4955863..a79f87c 100644 --- a/spec/dummy/db/migrate/134_create_agent_merge_lists.rb +++ b/spec/dummy/db/migrate/134_create_agent_merge_lists.rb @@ -1,6 +1,6 @@ class CreateAgentMergeLists < ActiveRecord::Migration[5.2] def change - create_table :agent_merge_lists, id: :uuid do |t| + create_table :agent_merge_lists do |t| t.string :title t.timestamps diff --git a/spec/dummy/db/migrate/20080830154109_create_realizes.rb b/spec/dummy/db/migrate/20080830154109_create_realizes.rb index 59ca622..1e8f4be 100644 --- a/spec/dummy/db/migrate/20080830154109_create_realizes.rb +++ b/spec/dummy/db/migrate/20080830154109_create_realizes.rb @@ -1,8 +1,8 @@ class CreateRealizes < ActiveRecord::Migration[5.2] def change create_table :realizes do |t| - t.references :agent, foreign_key: true, null: false, type: :uuid - t.references :expression, null: false, type: :uuid, foreign_key: {to_table: :manifestations} + t.references :agent, foreign_key: true, null: false + t.references :expression, null: false, foreign_key: {to_table: :manifestations} t.integer :position t.timestamps diff --git a/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb b/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb index cb5292c..f21c35b 100644 --- a/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb +++ b/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb @@ -1,6 +1,6 @@ class CreateSubscriptions < ActiveRecord::Migration[5.2] def change - create_table :subscriptions, id: :uuid do |t| + create_table :subscriptions do |t| t.text :title, null: false t.text :note t.references :user, foreign_key: true diff --git a/spec/dummy/db/migrate/20081006093246_create_subscribes.rb b/spec/dummy/db/migrate/20081006093246_create_subscribes.rb index 12a72f6..43cd3b6 100644 --- a/spec/dummy/db/migrate/20081006093246_create_subscribes.rb +++ b/spec/dummy/db/migrate/20081006093246_create_subscribes.rb @@ -1,8 +1,8 @@ class CreateSubscribes < ActiveRecord::Migration[5.2] def change create_table :subscribes do |t| - t.references :subscription, foreign_key: true, null: false, type: :uuid - t.references :work, null: false, type: :uuid + t.references :subscription, foreign_key: true, null: false + t.references :work, null: false t.datetime :start_at, null: false t.datetime :end_at, null: false diff --git a/spec/dummy/db/migrate/20081027150907_create_picture_files.rb b/spec/dummy/db/migrate/20081027150907_create_picture_files.rb index 671b741..329c65f 100644 --- a/spec/dummy/db/migrate/20081027150907_create_picture_files.rb +++ b/spec/dummy/db/migrate/20081027150907_create_picture_files.rb @@ -1,7 +1,7 @@ class CreatePictureFiles < ActiveRecord::Migration[5.2] def change - create_table :picture_files, id: :uuid do |t| - t.references :picture_attachable, null: false, type: :uuid + create_table :picture_files do |t| + t.references :picture_attachable, null: false t.string :picture_attachable_type, null: false t.text :title t.integer :position diff --git a/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb b/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb index fe4a8b0..526040d 100644 --- a/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb +++ b/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb @@ -1,6 +1,6 @@ class CreateAgentImportFiles < ActiveRecord::Migration[5.2] def change - create_table :agent_import_files, id: :uuid do |t| + create_table :agent_import_files do |t| t.references :user, foreign_key: true t.text :note t.datetime :executed_at diff --git a/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb b/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb index 323e411..11130f0 100644 --- a/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb +++ b/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb @@ -1,6 +1,6 @@ class CreateResourceImportFiles < ActiveRecord::Migration[5.2] def change - create_table :resource_import_files, id: :uuid do |t| + create_table :resource_import_files do |t| t.references :user, foreign_key: true t.text :note t.datetime :executed_at diff --git a/spec/dummy/db/migrate/20091214131723_create_series_statements.rb b/spec/dummy/db/migrate/20091214131723_create_series_statements.rb index df768d5..a9dbd98 100644 --- a/spec/dummy/db/migrate/20091214131723_create_series_statements.rb +++ b/spec/dummy/db/migrate/20091214131723_create_series_statements.rb @@ -1,6 +1,6 @@ class CreateSeriesStatements < ActiveRecord::Migration[5.2] def change - create_table :series_statements, id: :uuid do |t| + create_table :series_statements do |t| t.text :title, null: false t.text :numbering t.text :title_subseries diff --git a/spec/dummy/db/migrate/20100129142347_create_import_requests.rb b/spec/dummy/db/migrate/20100129142347_create_import_requests.rb index 59577a0..60348ae 100644 --- a/spec/dummy/db/migrate/20100129142347_create_import_requests.rb +++ b/spec/dummy/db/migrate/20100129142347_create_import_requests.rb @@ -1,8 +1,8 @@ class CreateImportRequests < ActiveRecord::Migration[5.2] def change - create_table :import_requests, id: :uuid do |t| + create_table :import_requests do |t| t.string :isbn, index: true, null: false - t.references :manifestation, foreign_key: true, type: :uuid + t.references :manifestation, foreign_key: true t.references :user, foreign_key: true t.timestamps diff --git a/spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb b/spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb index 3743959..58dbb86 100644 --- a/spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb +++ b/spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb @@ -1,8 +1,8 @@ class CreateManifestationRelationships < ActiveRecord::Migration[5.2] def change create_table :manifestation_relationships do |t| - t.references :parent, foreign_key: {to_table: :manifestations}, null: false, type: :uuid - t.references :child, foreign_key: {to_table: :manifestations}, null: false, type: :uuid + t.references :parent, foreign_key: {to_table: :manifestations}, null: false + t.references :child, foreign_key: {to_table: :manifestations}, null: false t.references :manifestation_relationship_type, index: false t.timestamps diff --git a/spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb b/spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb index 6f2e201..2f52463 100644 --- a/spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb +++ b/spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb @@ -1,8 +1,8 @@ class CreateAgentRelationships < ActiveRecord::Migration[5.2] def change create_table :agent_relationships do |t| - t.references :parent, foreign_key: {to_table: :agents}, null: false, type: :uuid - t.references :child, foreign_key: {to_table: :agents}, null: false, type: :uuid + t.references :parent, foreign_key: {to_table: :agents}, null: false + t.references :child, foreign_key: {to_table: :agents}, null: false t.references :agent_relationship_type, index: false t.timestamps diff --git a/spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb b/spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb index 7d57743..44f593f 100644 --- a/spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb +++ b/spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb @@ -1,9 +1,9 @@ class CreateResourceImportResults < ActiveRecord::Migration[5.2] def change - create_table :resource_import_results, id: :uuid do |t| - t.references :resource_import_file, foreign_key: true, type: :uuid - t.references :manifestation, type: :uuid - t.references :item, type: :uuid + create_table :resource_import_results do |t| + t.references :resource_import_file, foreign_key: true + t.references :manifestation + t.references :item t.text :body t.timestamps diff --git a/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb b/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb index e852a33..5b2e4de 100644 --- a/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +++ b/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb @@ -1,8 +1,8 @@ class CreateAgentImportResults < ActiveRecord::Migration[5.2] def change - create_table :agent_import_results, id: :uuid do |t| - t.references :agent_import_file, foreign_key: true, null: false, type: :uuid - t.references :agent, type: :uuid + create_table :agent_import_results do |t| + t.references :agent_import_file, foreign_key: true, null: false + t.references :agent t.text :body t.timestamps diff --git a/spec/dummy/db/migrate/20110620173525_add_bookstore_id_to_item.rb b/spec/dummy/db/migrate/20110620173525_add_bookstore_id_to_item.rb index 072befa..6d77705 100644 --- a/spec/dummy/db/migrate/20110620173525_add_bookstore_id_to_item.rb +++ b/spec/dummy/db/migrate/20110620173525_add_bookstore_id_to_item.rb @@ -1,5 +1,5 @@ class AddBookstoreIdToItem < ActiveRecord::Migration[5.2] def change - add_reference :items, :bookstore, foreign_key: true, type: :uuid + add_reference :items, :bookstore, foreign_key: true end end diff --git a/spec/dummy/db/migrate/20110627034940_create_series_statement_merge_lists.rb b/spec/dummy/db/migrate/20110627034940_create_series_statement_merge_lists.rb index a908e1f..954d327 100644 --- a/spec/dummy/db/migrate/20110627034940_create_series_statement_merge_lists.rb +++ b/spec/dummy/db/migrate/20110627034940_create_series_statement_merge_lists.rb @@ -1,6 +1,6 @@ class CreateSeriesStatementMergeLists < ActiveRecord::Migration[5.2] def change - create_table :series_statement_merge_lists, id: :uuid do |t| + create_table :series_statement_merge_lists do |t| t.string :title t.timestamps diff --git a/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb b/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb index bf52a18..eee719d 100644 --- a/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb +++ b/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb @@ -1,8 +1,8 @@ class CreateSeriesStatementMerges < ActiveRecord::Migration[5.2] def change create_table :series_statement_merges do |t| - t.references :series_statement, foreign_key: true, null: false, type: :uuid - t.references :series_statement_merge_list, foreign_key: true, index: false, null: false, type: :uuid + t.references :series_statement, foreign_key: true, null: false + t.references :series_statement_merge_list, foreign_key: true, index: false, null: false t.timestamps end diff --git a/spec/dummy/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb b/spec/dummy/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb index 6be618f..a23edaa 100644 --- a/spec/dummy/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb +++ b/spec/dummy/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb @@ -1,5 +1,5 @@ class AddManifestaitonIdToSeriesStatement < ActiveRecord::Migration[5.2] def change - add_reference :series_statements, :manifestation, foreign_key: true, type: :uuid + add_reference :series_statements, :manifestation, foreign_key: true end end diff --git a/spec/dummy/db/migrate/20120319173203_create_accepts.rb b/spec/dummy/db/migrate/20120319173203_create_accepts.rb index c3ebe65..3362445 100644 --- a/spec/dummy/db/migrate/20120319173203_create_accepts.rb +++ b/spec/dummy/db/migrate/20120319173203_create_accepts.rb @@ -1,8 +1,8 @@ class CreateAccepts < ActiveRecord::Migration[5.2] def change - create_table :accepts, id: :uuid do |t| - t.references :basket, foreign_key: true, type: :uuid - t.references :item, type: :uuid + create_table :accepts do |t| + t.references :basket, foreign_key: true + t.references :item t.references :librarian, foreign_key: {to_table: :users} t.timestamps diff --git a/spec/dummy/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb b/spec/dummy/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb index 8065a0f..6903eda 100644 --- a/spec/dummy/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb +++ b/spec/dummy/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb @@ -1,5 +1,5 @@ class AddRootManifestationIdToSeriesStatement < ActiveRecord::Migration[5.2] def change - add_reference :series_statements, :root_manifestation, foreign_ley: {to_table: :manifestations}, type: :uuid + add_reference :series_statements, :root_manifestation, foreign_ley: {to_table: :manifestations} end end diff --git a/spec/dummy/db/migrate/20130506175834_create_identifiers.rb b/spec/dummy/db/migrate/20130506175834_create_identifiers.rb index 15bf3a5..feffaf1 100644 --- a/spec/dummy/db/migrate/20130506175834_create_identifiers.rb +++ b/spec/dummy/db/migrate/20130506175834_create_identifiers.rb @@ -3,7 +3,7 @@ def change create_table :identifiers do |t| t.string :body, null: false, index: true t.references :identifier_type, foreign_key: true, null: false - t.references :manifestation, foreign_key: true, null: false, type: :uuid + t.references :manifestation, foreign_key: true, null: false t.boolean :primary t.integer :position diff --git a/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb b/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb index 296603e..e85c6d7 100644 --- a/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb +++ b/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb @@ -1,6 +1,6 @@ class CreateUserImportFiles < ActiveRecord::Migration[5.2] def change - create_table :user_import_files, id: :uuid do |t| + create_table :user_import_files do |t| t.references :user, foreign_key: true t.text :note t.datetime :executed_at diff --git a/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb b/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb index 5c50a1c..38b3466 100644 --- a/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb +++ b/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb @@ -1,7 +1,7 @@ class CreateUserImportResults < ActiveRecord::Migration[5.2] def change - create_table :user_import_results, id: :uuid do |t| - t.references :user_import_file, foreign_key: true, type: :uuid + create_table :user_import_results do |t| + t.references :user_import_file, foreign_key: true t.references :user, foreign_key: true t.text :body diff --git a/spec/dummy/db/migrate/20140122054321_create_profiles.rb b/spec/dummy/db/migrate/20140122054321_create_profiles.rb index fb74be8..33bbd1e 100644 --- a/spec/dummy/db/migrate/20140122054321_create_profiles.rb +++ b/spec/dummy/db/migrate/20140122054321_create_profiles.rb @@ -1,8 +1,8 @@ class CreateProfiles < ActiveRecord::Migration[5.2] def change - create_table :profiles, id: :uuid do |t| - t.references :user_group, type: :uuid, null: false - t.references :library, type: :uuid + create_table :profiles do |t| + t.references :user_group, null: false + t.references :library t.string :locale t.string :user_number, unique: true t.text :full_name diff --git a/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb b/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb index b1cf967..2ae53bc 100644 --- a/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +++ b/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb @@ -4,7 +4,7 @@ def change t.string :to_state t.jsonb :metadata, default: {} t.integer :sort_key - t.references :resource_import_file, index: false, type: :uuid + t.references :resource_import_file, index: false t.timestamps end diff --git a/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb b/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb index 11bfed3..47f6b4f 100644 --- a/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +++ b/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb @@ -4,7 +4,7 @@ def change t.string :to_state t.jsonb :metadata, default: {} t.integer :sort_key - t.references :import_request, type: :uuid + t.references :import_request t.timestamps end diff --git a/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb b/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb index 8b1dac0..cdda417 100644 --- a/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +++ b/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb @@ -4,7 +4,7 @@ def change t.string :to_state t.jsonb :metadata, default: {} t.integer :sort_key - t.references :agent_import_file, type: :uuid + t.references :agent_import_file t.timestamps end diff --git a/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb b/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb index bc8627f..4e7a284 100644 --- a/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +++ b/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb @@ -4,7 +4,7 @@ def change t.string :to_state t.jsonb :metadata, default: {} t.integer :sort_key - t.references :user_import_file, type: :uuid + t.references :user_import_file t.timestamps end diff --git a/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb b/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb index 28cf0c4..9d17ca5 100644 --- a/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb +++ b/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb @@ -1,6 +1,6 @@ class CreateResourceExportFiles < ActiveRecord::Migration[5.2] def change - create_table :resource_export_files, id: :uuid do |t| + create_table :resource_export_files do |t| t.references :user, foreign_key: true t.datetime :executed_at diff --git a/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb b/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb index 58323ad..2bb2064 100644 --- a/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +++ b/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb @@ -4,7 +4,7 @@ def change t.string :to_state t.jsonb :metadata, default: {} t.integer :sort_key - t.references :resource_export_file, index: false, type: :uuid + t.references :resource_export_file, index: false t.timestamps end diff --git a/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb b/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb index fcabe54..2e6c8f3 100644 --- a/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb +++ b/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb @@ -1,6 +1,6 @@ class CreateUserExportFiles < ActiveRecord::Migration[5.2] def change - create_table :user_export_files, id: :uuid do |t| + create_table :user_export_files do |t| t.references :user, foreign_key: true t.datetime :executed_at diff --git a/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb b/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb index bc9ce89..168936d 100644 --- a/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +++ b/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb @@ -4,7 +4,7 @@ def change t.string :to_state t.jsonb :metadata, default: {} t.integer :sort_key - t.references :user_export_file, type: :uuid + t.references :user_export_file t.timestamps end diff --git a/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb b/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb index d67b005..e3fd954 100644 --- a/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb +++ b/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb @@ -1,5 +1,5 @@ class AddDefaultLibraryIdToUserImportFile < ActiveRecord::Migration[5.2] def change - add_reference :user_import_files, :default_library, type: :uuid + add_reference :user_import_files, :default_library end end diff --git a/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb b/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb index 248d771..383d2c8 100644 --- a/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb +++ b/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb @@ -1,5 +1,5 @@ class AddDefaultUserGroupIdToUserImportFile < ActiveRecord::Migration[5.2] def change - add_reference :user_import_files, :default_user_group, type: :uuid + add_reference :user_import_files, :default_user_group end end diff --git a/spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb b/spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb index 4a54a7b..611c94b 100644 --- a/spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb +++ b/spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb @@ -1,5 +1,5 @@ class AddDefaultShelfIdToResourceImportFile < ActiveRecord::Migration[5.2] def change - add_reference :resource_import_files, :default_shelf, type: :uuid + add_reference :resource_import_files, :default_shelf end end diff --git a/spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb b/spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb index 8986743..3754e0e 100644 --- a/spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb +++ b/spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb @@ -1,5 +1,5 @@ class AddManifestationIdToItem < ActiveRecord::Migration[5.2] def change - add_reference :items, :manifestation, type: :uuid + add_reference :items, :manifestation end end diff --git a/spec/dummy/db/migrate/20150924115059_create_withdraws.rb b/spec/dummy/db/migrate/20150924115059_create_withdraws.rb index 85dcdc9..36ac6da 100644 --- a/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +++ b/spec/dummy/db/migrate/20150924115059_create_withdraws.rb @@ -1,8 +1,8 @@ class CreateWithdraws < ActiveRecord::Migration[5.2] def change - create_table :withdraws, id: :uuid do |t| - t.references :basket, foreign_key: true, type: :uuid - t.references :item, type: :uuid + create_table :withdraws do |t| + t.references :basket, foreign_key: true + t.references :item t.references :librarian, foreign_key: {to_table: :users} t.timestamps diff --git a/spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb b/spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb index 7c068ba..55bb49a 100644 --- a/spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb +++ b/spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb @@ -1,5 +1,5 @@ class AddProfileIdToAgent < ActiveRecord::Migration[5.2] def change - add_reference :agents, :profile, foreign_key: true, type: :uuid + add_reference :agents, :profile, foreign_key: true end end diff --git a/spec/dummy/db/migrate/20170114174536_add_profile_id_to_user.rb b/spec/dummy/db/migrate/20170114174536_add_profile_id_to_user.rb index f47e353..0e67432 100644 --- a/spec/dummy/db/migrate/20170114174536_add_profile_id_to_user.rb +++ b/spec/dummy/db/migrate/20170114174536_add_profile_id_to_user.rb @@ -1,5 +1,5 @@ class AddProfileIdToUser < ActiveRecord::Migration[5.2] def change - add_reference :users, :profile, foreign_key: {on_delete: :cascade}, type: :uuid + add_reference :users, :profile, foreign_key: {on_delete: :cascade} end end diff --git a/spec/dummy/db/migrate/20170116134107_create_issn_record_and_manifestations.rb b/spec/dummy/db/migrate/20170116134107_create_issn_record_and_manifestations.rb index c09753e..1fcd1b1 100644 --- a/spec/dummy/db/migrate/20170116134107_create_issn_record_and_manifestations.rb +++ b/spec/dummy/db/migrate/20170116134107_create_issn_record_and_manifestations.rb @@ -2,7 +2,7 @@ class CreateIssnRecordAndManifestations < ActiveRecord::Migration[5.2] def change create_table :issn_record_and_manifestations do |t| t.references :issn_record, foreign_key: true, on_delete: :cascade, null: false - t.references :manifestation, foreign_key: true, on_delete: :cascade, null: false, type: :uuid + t.references :manifestation, foreign_key: true, on_delete: :cascade, null: false t.integer :position t.timestamps diff --git a/spec/dummy/db/migrate/20170116134120_create_isbn_record_and_manifestations.rb b/spec/dummy/db/migrate/20170116134120_create_isbn_record_and_manifestations.rb index b4f2375..c73490b 100644 --- a/spec/dummy/db/migrate/20170116134120_create_isbn_record_and_manifestations.rb +++ b/spec/dummy/db/migrate/20170116134120_create_isbn_record_and_manifestations.rb @@ -2,7 +2,7 @@ class CreateIsbnRecordAndManifestations < ActiveRecord::Migration[5.2] def change create_table :isbn_record_and_manifestations do |t| t.references :isbn_record, foreign_key: true, on_delete: :cascade, null: false - t.references :manifestation, foreign_key: true, null: false, on_delete: :cascade, type: :uuid + t.references :manifestation, foreign_key: true, null: false, on_delete: :cascade t.integer :position t.timestamps diff --git a/spec/dummy/db/migrate/20190102034126_create_doi_records.rb b/spec/dummy/db/migrate/20190102034126_create_doi_records.rb index 360e895..169cbbd 100644 --- a/spec/dummy/db/migrate/20190102034126_create_doi_records.rb +++ b/spec/dummy/db/migrate/20190102034126_create_doi_records.rb @@ -5,7 +5,7 @@ def change t.string :display_body, null: false t.string :source t.jsonb :response, default: {}, null: false - t.references :manifestation, foreign_key: true, null: false, type: :uuid + t.references :manifestation, foreign_key: true, null: false t.timestamps end diff --git a/spec/dummy/db/migrate/20190208135957_create_active_storage_tables.active_storage.rb b/spec/dummy/db/migrate/20190208135957_create_active_storage_tables.active_storage.rb index 227e45a..0b2ce25 100644 --- a/spec/dummy/db/migrate/20190208135957_create_active_storage_tables.active_storage.rb +++ b/spec/dummy/db/migrate/20190208135957_create_active_storage_tables.active_storage.rb @@ -15,7 +15,7 @@ def change create_table :active_storage_attachments do |t| t.string :name, null: false - t.references :record, null: false, polymorphic: true, index: false, type: :uuid + t.references :record, null: false, polymorphic: true, index: false t.references :blob, null: false t.datetime :created_at, null: false diff --git a/spec/dummy/db/migrate/20190311154610_create_periodicals.rb b/spec/dummy/db/migrate/20190311154610_create_periodicals.rb index 061f331..bf236db 100644 --- a/spec/dummy/db/migrate/20190311154610_create_periodicals.rb +++ b/spec/dummy/db/migrate/20190311154610_create_periodicals.rb @@ -1,6 +1,6 @@ class CreatePeriodicals < ActiveRecord::Migration[5.2] def change - create_table :periodicals, id: :uuid do |t| + create_table :periodicals do |t| t.text :original_title, null: false t.references :frequency, foreign_key: true, null: false diff --git a/spec/dummy/db/migrate/20190312033839_create_periodical_and_manifestations.rb b/spec/dummy/db/migrate/20190312033839_create_periodical_and_manifestations.rb index d0cd122..8480b37 100644 --- a/spec/dummy/db/migrate/20190312033839_create_periodical_and_manifestations.rb +++ b/spec/dummy/db/migrate/20190312033839_create_periodical_and_manifestations.rb @@ -1,8 +1,8 @@ class CreatePeriodicalAndManifestations < ActiveRecord::Migration[5.2] def change create_table :periodical_and_manifestations do |t| - t.references :periodical, foreign_key: true, type: :uuid, null: false - t.references :manifestation, foreign_key: true, type: :uuid, null: false + t.references :periodical, foreign_key: true, null: false + t.references :manifestation, foreign_key: true, null: false t.boolean :periodical_master, default: false, null: false, index: {where: 'periodical_master IS true', unique: true} t.timestamps diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb index 77d1f54..f3577d6 100644 --- a/spec/dummy/db/schema.rb +++ b/spec/dummy/db/schema.rb @@ -16,9 +16,9 @@ enable_extension "pgcrypto" enable_extension "plpgsql" - create_table "accepts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| - t.uuid "basket_id" - t.uuid "item_id" + create_table "accepts", force: :cascade do |t| + t.bigint "basket_id" + t.bigint "item_id" t.bigint "librarian_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -30,7 +30,7 @@ create_table "active_storage_attachments", force: :cascade do |t| t.string "name", null: false t.string "record_type", null: false - t.uuid "record_id", null: false + t.bigint "record_id", null: false t.bigint "blob_id", null: false t.datetime "created_at", null: false t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id" @@ -52,7 +52,7 @@ t.string "to_state" t.jsonb "metadata", default: {} t.integer "sort_key" - t.uuid "agent_import_file_id" + t.bigint "agent_import_file_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false t.boolean "most_recent", null: false @@ -61,7 +61,7 @@ t.index ["sort_key", "agent_import_file_id"], name: "index_agent_import_file_transitions_on_sort_key_and_file_id", unique: true end - create_table "agent_import_files", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "agent_import_files", force: :cascade do |t| t.bigint "user_id" t.text "note" t.datetime "executed_at" @@ -74,9 +74,9 @@ t.index ["user_id"], name: "index_agent_import_files_on_user_id" end - create_table "agent_import_results", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| - t.uuid "agent_import_file_id", null: false - t.uuid "agent_id" + create_table "agent_import_results", force: :cascade do |t| + t.bigint "agent_import_file_id", null: false + t.bigint "agent_id" t.text "body" t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -84,15 +84,15 @@ t.index ["agent_import_file_id"], name: "index_agent_import_results_on_agent_import_file_id" end - create_table "agent_merge_lists", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "agent_merge_lists", force: :cascade do |t| t.string "title" t.datetime "created_at", null: false t.datetime "updated_at", null: false end create_table "agent_merges", force: :cascade do |t| - t.uuid "agent_id", null: false - t.uuid "agent_merge_list_id", null: false + t.bigint "agent_id", null: false + t.bigint "agent_merge_list_id", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false t.index ["agent_id"], name: "index_agent_merges_on_agent_id" @@ -109,8 +109,8 @@ end create_table "agent_relationships", force: :cascade do |t| - t.uuid "parent_id", null: false - t.uuid "child_id", null: false + t.bigint "parent_id", null: false + t.bigint "child_id", null: false t.bigint "agent_relationship_type_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -128,7 +128,7 @@ t.datetime "updated_at", null: false end - create_table "agents", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "agents", force: :cascade do |t| t.string "last_name" t.string "middle_name" t.string "first_name" @@ -173,7 +173,7 @@ t.string "birth_date" t.string "death_date" t.string "agent_identifier" - t.uuid "profile_id" + t.bigint "profile_id" t.index ["agent_identifier"], name: "index_agents_on_agent_identifier" t.index ["country_id"], name: "index_agents_on_country_id" t.index ["full_name"], name: "index_agents_on_full_name" @@ -182,7 +182,7 @@ t.index ["required_role_id"], name: "index_agents_on_required_role_id" end - create_table "baskets", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "baskets", force: :cascade do |t| t.bigint "user_id" t.text "note" t.integer "lock_version", default: 0, null: false @@ -191,7 +191,7 @@ t.index ["user_id"], name: "index_baskets_on_user_id" end - create_table "bookstores", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "bookstores", force: :cascade do |t| t.text "name", null: false t.string "zip_code" t.text "address" @@ -214,7 +214,7 @@ t.index ["name"], name: "index_budget_types_on_name", unique: true end - create_table "carrier_types", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "carrier_types", force: :cascade do |t| t.string "name", null: false t.jsonb "display_name_translations", default: {}, null: false t.text "note" @@ -267,8 +267,8 @@ end create_table "creates", force: :cascade do |t| - t.uuid "agent_id", null: false - t.uuid "work_id", null: false + t.bigint "agent_id", null: false + t.bigint "work_id", null: false t.integer "position", default: 1, null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -283,7 +283,7 @@ t.string "display_body", null: false t.string "source" t.jsonb "response", default: {}, null: false - t.uuid "manifestation_id", null: false + t.bigint "manifestation_id", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false t.index ["body"], name: "index_doi_records_on_body", unique: true @@ -291,8 +291,8 @@ end create_table "donates", force: :cascade do |t| - t.uuid "agent_id", null: false - t.uuid "item_id", null: false + t.bigint "agent_id", null: false + t.bigint "item_id", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false t.index ["agent_id"], name: "index_donates_on_agent_id" @@ -330,7 +330,7 @@ create_table "identifiers", force: :cascade do |t| t.string "body", null: false t.bigint "identifier_type_id", null: false - t.uuid "manifestation_id", null: false + t.bigint "manifestation_id", null: false t.boolean "primary" t.integer "position" t.datetime "created_at", null: false @@ -344,7 +344,7 @@ t.string "to_state" t.jsonb "metadata", default: {} t.integer "sort_key" - t.uuid "import_request_id" + t.bigint "import_request_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false t.boolean "most_recent", null: false @@ -353,9 +353,9 @@ t.index ["sort_key", "import_request_id"], name: "index_import_request_transitions_on_sort_key_and_request_id", unique: true end - create_table "import_requests", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "import_requests", force: :cascade do |t| t.string "isbn", null: false - t.uuid "manifestation_id" + t.bigint "manifestation_id" t.bigint "user_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -366,7 +366,7 @@ create_table "isbn_record_and_manifestations", force: :cascade do |t| t.bigint "isbn_record_id", null: false - t.uuid "manifestation_id", null: false + t.bigint "manifestation_id", null: false t.integer "position" t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -385,7 +385,7 @@ create_table "issn_record_and_manifestations", force: :cascade do |t| t.bigint "issn_record_id", null: false - t.uuid "manifestation_id", null: false + t.bigint "manifestation_id", null: false t.integer "position" t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -402,12 +402,12 @@ t.index ["body"], name: "index_issn_records_on_body", unique: true end - create_table "items", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "items", force: :cascade do |t| t.string "call_number" t.string "item_identifier" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.uuid "shelf_id" + t.bigint "shelf_id" t.boolean "include_supplements", default: false, null: false t.text "note" t.string "url" @@ -415,12 +415,12 @@ t.integer "lock_version", default: 0, null: false t.integer "required_role_id", default: 1, null: false t.datetime "acquired_at" - t.uuid "bookstore_id" + t.bigint "bookstore_id" t.integer "budget_type_id" t.string "binding_item_identifier" t.string "binding_call_number" t.datetime "binded_at" - t.uuid "manifestation_id", null: false + t.bigint "manifestation_id", null: false t.index ["binding_item_identifier"], name: "index_items_on_binding_item_identifier" t.index ["bookstore_id"], name: "index_items_on_bookstore_id" t.index ["item_identifier"], name: "index_items_on_item_identifier", unique: true @@ -443,7 +443,7 @@ t.index ["name"], name: "index_languages_on_name", unique: true end - create_table "libraries", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "libraries", force: :cascade do |t| t.string "name", null: false t.jsonb "display_name_translations", default: {}, null: false t.string "short_display_name", null: false @@ -519,8 +519,8 @@ end create_table "manifestation_relationships", force: :cascade do |t| - t.uuid "parent_id", null: false - t.uuid "child_id", null: false + t.bigint "parent_id", null: false + t.bigint "child_id", null: false t.bigint "manifestation_relationship_type_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -529,7 +529,7 @@ t.index ["parent_id"], name: "index_manifestation_relationships_on_parent_id" end - create_table "manifestations", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "manifestations", force: :cascade do |t| t.text "original_title", null: false t.text "title_alternative" t.text "title_transcription" @@ -558,7 +558,7 @@ t.integer "required_role_id", default: 1, null: false t.integer "frequency_id", default: 1, null: false t.boolean "subscription_master", default: false, null: false - t.uuid "carrier_type_id", null: false + t.bigint "carrier_type_id", null: false t.string "attachment_file_name" t.string "attachment_content_type" t.integer "attachment_file_size" @@ -602,7 +602,7 @@ t.datetime "updated_at", null: false end - create_table "news_feeds", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "news_feeds", force: :cascade do |t| t.integer "library_group_id", default: 1, null: false t.string "title" t.string "url" @@ -612,7 +612,7 @@ t.datetime "updated_at", null: false end - create_table "news_posts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "news_posts", force: :cascade do |t| t.text "title" t.text "body" t.bigint "user_id", null: false @@ -629,8 +629,8 @@ end create_table "owns", force: :cascade do |t| - t.uuid "agent_id", null: false - t.uuid "item_id", null: false + t.bigint "agent_id", null: false + t.bigint "item_id", null: false t.integer "position", default: 1, null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -639,8 +639,8 @@ end create_table "periodical_and_manifestations", force: :cascade do |t| - t.uuid "periodical_id", null: false - t.uuid "manifestation_id", null: false + t.bigint "periodical_id", null: false + t.bigint "manifestation_id", null: false t.boolean "periodical_master", default: false, null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -649,7 +649,7 @@ t.index ["periodical_master"], name: "index_periodical_and_manifestations_on_periodical_master", unique: true, where: "(periodical_master IS TRUE)" end - create_table "periodicals", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "periodicals", force: :cascade do |t| t.text "original_title", null: false t.bigint "frequency_id", null: false t.datetime "created_at", null: false @@ -657,8 +657,8 @@ t.index ["frequency_id"], name: "index_periodicals_on_frequency_id" end - create_table "picture_files", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| - t.uuid "picture_attachable_id", null: false + create_table "picture_files", force: :cascade do |t| + t.bigint "picture_attachable_id", null: false t.string "picture_attachable_type", null: false t.text "title" t.integer "position" @@ -686,8 +686,8 @@ end create_table "produces", force: :cascade do |t| - t.uuid "agent_id", null: false - t.uuid "manifestation_id", null: false + t.bigint "agent_id", null: false + t.bigint "manifestation_id", null: false t.integer "position", default: 1, null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -697,9 +697,9 @@ t.index ["manifestation_id"], name: "index_produces_on_manifestation_id" end - create_table "profiles", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| - t.uuid "user_group_id", null: false - t.uuid "library_id" + create_table "profiles", force: :cascade do |t| + t.bigint "user_group_id", null: false + t.bigint "library_id" t.string "locale" t.string "user_number" t.text "full_name" @@ -725,8 +725,8 @@ end create_table "realizes", force: :cascade do |t| - t.uuid "agent_id", null: false - t.uuid "expression_id", null: false + t.bigint "agent_id", null: false + t.bigint "expression_id", null: false t.integer "position", default: 1, null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -758,7 +758,7 @@ t.string "to_state" t.jsonb "metadata", default: {} t.integer "sort_key" - t.uuid "resource_export_file_id" + t.bigint "resource_export_file_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false t.boolean "most_recent", null: false @@ -767,7 +767,7 @@ t.index ["sort_key", "resource_export_file_id"], name: "index_resource_export_file_transitions_on_sort_key_and_file_id", unique: true end - create_table "resource_export_files", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "resource_export_files", force: :cascade do |t| t.bigint "user_id" t.datetime "executed_at" t.datetime "created_at", null: false @@ -779,7 +779,7 @@ t.string "to_state" t.jsonb "metadata", default: {} t.integer "sort_key" - t.uuid "resource_import_file_id" + t.bigint "resource_import_file_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false t.boolean "most_recent", null: false @@ -788,7 +788,7 @@ t.index ["sort_key", "resource_import_file_id"], name: "index_resource_import_file_transitions_on_sort_key_and_file_id", unique: true end - create_table "resource_import_files", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "resource_import_files", force: :cascade do |t| t.bigint "user_id" t.text "note" t.datetime "executed_at" @@ -798,15 +798,15 @@ t.string "resource_import_fingerprint" t.text "error_message" t.string "user_encoding" - t.uuid "default_shelf_id" + t.bigint "default_shelf_id" t.index ["default_shelf_id"], name: "index_resource_import_files_on_default_shelf_id" t.index ["user_id"], name: "index_resource_import_files_on_user_id" end - create_table "resource_import_results", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| - t.uuid "resource_import_file_id" - t.uuid "manifestation_id" - t.uuid "item_id" + create_table "resource_import_results", force: :cascade do |t| + t.bigint "resource_import_file_id" + t.bigint "manifestation_id" + t.bigint "item_id" t.text "body" t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -840,22 +840,22 @@ t.datetime "updated_at", null: false end - create_table "series_statement_merge_lists", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "series_statement_merge_lists", force: :cascade do |t| t.string "title" t.datetime "created_at", null: false t.datetime "updated_at", null: false end create_table "series_statement_merges", force: :cascade do |t| - t.uuid "series_statement_id", null: false - t.uuid "series_statement_merge_list_id", null: false + t.bigint "series_statement_id", null: false + t.bigint "series_statement_merge_list_id", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false t.index ["series_statement_id"], name: "index_series_statement_merges_on_series_statement_id" t.index ["series_statement_merge_list_id"], name: "index_series_statement_merges_on_list_id" end - create_table "series_statements", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "series_statements", force: :cascade do |t| t.text "original_title", null: false t.text "numbering" t.text "title_subseries" @@ -866,24 +866,24 @@ t.text "title_transcription" t.text "title_alternative" t.string "series_statement_identifier" - t.uuid "manifestation_id" + t.bigint "manifestation_id" t.text "note" t.text "title_subseries_transcription" t.text "creator_string" t.text "volume_number_string" t.text "volume_number_transcription_string" t.boolean "series_master" - t.uuid "root_manifestation_id" + t.bigint "root_manifestation_id" t.index ["manifestation_id"], name: "index_series_statements_on_manifestation_id" t.index ["root_manifestation_id"], name: "index_series_statements_on_root_manifestation_id" t.index ["series_statement_identifier"], name: "index_series_statements_on_series_statement_identifier" end - create_table "shelves", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "shelves", force: :cascade do |t| t.string "name", null: false t.jsonb "display_name_translations", default: {}, null: false t.text "note" - t.uuid "library_id", null: false + t.bigint "library_id", null: false t.integer "items_count", default: 0, null: false t.integer "position", default: 1, null: false t.datetime "created_at", null: false @@ -893,8 +893,8 @@ end create_table "subscribes", force: :cascade do |t| - t.uuid "subscription_id", null: false - t.uuid "work_id", null: false + t.bigint "subscription_id", null: false + t.bigint "work_id", null: false t.datetime "start_at", null: false t.datetime "end_at", null: false t.datetime "created_at", null: false @@ -903,7 +903,7 @@ t.index ["work_id"], name: "index_subscribes_on_work_id" end - create_table "subscriptions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "subscriptions", force: :cascade do |t| t.text "title", null: false t.text "note" t.bigint "user_id" @@ -919,7 +919,7 @@ t.string "to_state" t.jsonb "metadata", default: {} t.integer "sort_key" - t.uuid "user_export_file_id" + t.bigint "user_export_file_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false t.boolean "most_recent", null: false @@ -928,7 +928,7 @@ t.index ["user_export_file_id"], name: "index_user_export_file_transitions_on_user_export_file_id" end - create_table "user_export_files", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "user_export_files", force: :cascade do |t| t.bigint "user_id" t.datetime "executed_at" t.datetime "created_at", null: false @@ -936,7 +936,7 @@ t.index ["user_id"], name: "index_user_export_files_on_user_id" end - create_table "user_groups", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "user_groups", force: :cascade do |t| t.string "name", null: false t.jsonb "display_name_translations", default: {}, null: false t.text "note" @@ -961,7 +961,7 @@ t.string "to_state" t.jsonb "metadata", default: {} t.integer "sort_key" - t.uuid "user_import_file_id" + t.bigint "user_import_file_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false t.boolean "most_recent", null: false @@ -970,7 +970,7 @@ t.index ["user_import_file_id"], name: "index_user_import_file_transitions_on_user_import_file_id" end - create_table "user_import_files", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + create_table "user_import_files", force: :cascade do |t| t.bigint "user_id" t.text "note" t.datetime "executed_at" @@ -979,15 +979,15 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.string "user_encoding" - t.uuid "default_library_id" - t.uuid "default_user_group_id" + t.bigint "default_library_id" + t.bigint "default_user_group_id" t.index ["default_library_id"], name: "index_user_import_files_on_default_library_id" t.index ["default_user_group_id"], name: "index_user_import_files_on_default_user_group_id" t.index ["user_id"], name: "index_user_import_files_on_user_id" end - create_table "user_import_results", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| - t.uuid "user_import_file_id" + create_table "user_import_results", force: :cascade do |t| + t.bigint "user_import_file_id" t.bigint "user_id" t.text "body" t.datetime "created_at", null: false @@ -1016,7 +1016,7 @@ t.string "unlock_token" t.datetime "locked_at" t.datetime "confirmed_at" - t.uuid "profile_id" + t.bigint "profile_id" t.index ["email"], name: "index_users_on_email" t.index ["profile_id"], name: "index_users_on_profile_id" t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true @@ -1024,9 +1024,9 @@ t.index ["username"], name: "index_users_on_username", unique: true end - create_table "withdraws", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| - t.uuid "basket_id" - t.uuid "item_id" + create_table "withdraws", force: :cascade do |t| + t.bigint "basket_id" + t.bigint "item_id" t.bigint "librarian_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false diff --git a/spec/fixtures/libraries.yml b/spec/fixtures/libraries.yml index b23f525..5d46b66 100644 --- a/spec/fixtures/libraries.yml +++ b/spec/fixtures/libraries.yml @@ -7,7 +7,7 @@ library_00001: updated_at: 2007-08-31 00:18:06.662349 +09:00 telephone_number_1: telephone_number_2: - id: e1008b98-d49c-4145-a763-4ca6083fbc41 + id: 1 zip_code: region: locality: @@ -24,7 +24,7 @@ library_00002: updated_at: 2007-08-31 00:18:06.662349 +09:00 telephone_number_1: 81-3-3732-5111 telephone_number_2: "" - id: f6ba26aa-9481-4804-b30f-04692c0189ac + id: 2 zip_code: 144-8535 region: Tokyo locality: @@ -42,7 +42,7 @@ library_00003: updated_at: 2007-08-31 00:18:16.188285 +09:00 telephone_number_1: 042-637-2033 telephone_number_2: "" - id: 2ee21d56-b6ca-4518-85e0-50300957f31f + id: 3 zip_code: 192-0982 region: Tokyo locality: Hachioji @@ -59,7 +59,7 @@ library_00004: updated_at: 2007-08-31 00:18:20.043951 +09:00 telephone_number_1: "" telephone_number_2: "" - id: 89dbfc29-9c99-4f90-b240-2cf09520916f + id: 4 zip_code: 108-8345 region: Tokyo locality: Minato diff --git a/spec/fixtures/news_feeds.yml b/spec/fixtures/news_feeds.yml index 3728177..2d9e0c2 100644 --- a/spec/fixtures/news_feeds.yml +++ b/spec/fixtures/news_feeds.yml @@ -1,11 +1,11 @@ news_feed_00001: - id: 2c2c2c68-7214-43b0-a978-15a5c0bcdce6 + id: 1 title: NDL url: http://iss.ndl.go.jp/information/feed/ position: 1 news_feed_00002: - id: 09ab79aa-4be7-4daf-8449-18341051a608 + id: 2 title: invalid feed url: http://example.com/invalid_feed position: 2 @@ -14,7 +14,7 @@ news_feed_00002: # # Table name: news_feeds # -# id :uuid not null, primary key +# id :bigint not null, primary key # library_group_id :integer default(1), not null # title :string # url :string diff --git a/spec/fixtures/news_posts.yml b/spec/fixtures/news_posts.yml index 167ed43..7ac33bd 100644 --- a/spec/fixtures/news_posts.yml +++ b/spec/fixtures/news_posts.yml @@ -1,12 +1,12 @@ news_post_00001: - id: a1d0d5ab-e277-4a77-b79a-4e4a97370428 + id: 1 title: お知らせ body: お知らせの内容 user_id: 1 position: 1 news_post_00002: - id: 2865efc0-e79c-402c-ad09-970ff6e0a934 + id: 2 title: お知らせ body: お知らせの内容 user_id: 1 @@ -16,10 +16,10 @@ news_post_00002: # # Table name: news_posts # -# id :uuid not null, primary key +# id :bigint not null, primary key # title :text # body :text -# user_id :bigint(8) not null +# user_id :bigint not null # start_date :datetime # end_date :datetime # required_role_id :integer default(1), not null diff --git a/spec/fixtures/user_groups.yml b/spec/fixtures/user_groups.yml index 8f7e77b..81f5673 100644 --- a/spec/fixtures/user_groups.yml +++ b/spec/fixtures/user_groups.yml @@ -3,7 +3,7 @@ user_group_00001: name: not_specified display_name_translations: {"en": "(not specified)", "ja": "不明"} updated_at: 2007-12-13 21:00:51.564542 +09:00 - id: 2d387a28-f738-4afb-93d4-c42e0b593435 + id: 1 note: "" created_at: 2007-12-13 21:00:01.674976 +09:00 position: 1 @@ -12,7 +12,7 @@ user_group_00002: name: user display_name_translations: {"en": "User", "ja": "一般利用者"} updated_at: 2007-12-23 03:14:56.836548 +09:00 - id: ded8b35c-5fa4-426a-92b8-da7a44cb6fec + id: 2 note: "" created_at: 2007-12-23 03:14:40.173954 +09:00 position: 2 @@ -21,7 +21,7 @@ user_group_00003: name: faculty display_name_translations: {"en": "Faculty", "ja": "教職員"} updated_at: 2007-12-23 03:15:05.134351 +09:00 - id: ff963b6d-918f-43bb-b9a0-e9be7127c55a + id: 3 note: "" created_at: 2007-12-23 03:15:05.126457 +09:00 position: 3 diff --git a/spec/models/news_feed_spec.rb b/spec/models/news_feed_spec.rb index cbb0152..8b20266 100644 --- a/spec/models/news_feed_spec.rb +++ b/spec/models/news_feed_spec.rb @@ -29,7 +29,7 @@ # # Table name: news_feeds # -# id :uuid not null, primary key +# id :bigint not null, primary key # library_group_id :integer default(1), not null # title :string # url :string diff --git a/spec/models/news_post_spec.rb b/spec/models/news_post_spec.rb index a24c812..6a54a05 100644 --- a/spec/models/news_post_spec.rb +++ b/spec/models/news_post_spec.rb @@ -8,10 +8,10 @@ # # Table name: news_posts # -# id :uuid not null, primary key +# id :bigint not null, primary key # title :text # body :text -# user_id :bigint(8) not null +# user_id :bigint not null # start_date :datetime # end_date :datetime # required_role_id :integer default(1), not null