Merge branch 'main' of github.com:next-l/enju_leaf

nabeta · nabeta · commit 9a33739c0cdc · 2025-05-05T02:03:56.000+09:00
diff --git a/config/database.yml b/config/database.yml
@@ -83,7 +83,12 @@ test:
 # for a full overview on how database connection configuration can be specified.
 #
 production:
-  <<: *default
-  database: enju_leaf_production
-  username: enju_leaf
-  password: <%= ENV['ENJU_LEAF_DATABASE_PASSWORD'] %>
+  primary: &primary_production
+    <<: *default
+    database: enju_leaf_production
+    # username: enju_leaf
+    # password: <%= ENV['ENJU_LEAF_DATABASE_PASSWORD'] %>
+  queue:
+    <<: *primary_production
+    database: enju_rdm_production_queue
+    migrations_paths: db/queue_migrate
diff --git a/db/migrate/20081028083142_create_agent_import_files.rb b/db/migrate/20081028083142_create_agent_import_files.rb
@@ -2,9 +2,15 @@ class CreateAgentImportFiles < ActiveRecord::Migration[4.2]
   def change
     create_table :agent_import_files do |t|
       t.integer :parent_id
+      t.string :content_type
+      t.integer :size
       t.integer :user_id
       t.text :note
       t.datetime :executed_at
+      t.string :agent_import_file_name
+      t.string :agent_import_content_type
+      t.integer :agent_import_file_size
+      t.datetime :agent_import_updated_at
 
       t.timestamps
     end
diff --git a/db/migrate/20081028083208_create_resource_import_files.rb b/db/migrate/20081028083208_create_resource_import_files.rb
@@ -2,9 +2,15 @@ class CreateResourceImportFiles < ActiveRecord::Migration[4.2]
   def change
     create_table :resource_import_files do |t|
       t.integer :parent_id
+      t.string :content_type
+      t.integer :size
       t.integer :user_id
       t.text :note
       t.datetime :executed_at
+      t.string :resource_import_file_name
+      t.string :resource_import_content_type
+      t.integer :resource_import_file_size
+      t.datetime :resource_import_updated_at
 
       t.timestamps
     end
diff --git a/db/migrate/20081028093607_create_event_import_files.rb b/db/migrate/20081028093607_create_event_import_files.rb
@@ -2,9 +2,15 @@ class CreateEventImportFiles < ActiveRecord::Migration[4.2]
   def up
     create_table :event_import_files do |t|
       t.references :parent, index: true
+      t.string :content_type
+      t.integer :size
       t.references :user, index: true
       t.text :note
       t.datetime :imported_at
+      t.string :event_import_file_name
+      t.string :event_import_content_type
+      t.integer :event_import_file_size
+      t.datetime :event_import_updated_at
       t.string :edit_mode
 
       t.timestamps
diff --git a/db/migrate/20140110122216_create_user_import_files.rb b/db/migrate/20140110122216_create_user_import_files.rb
@@ -4,6 +4,10 @@ def change
       t.references :user, index: true
       t.text :note
       t.datetime :executed_at
+      t.string :user_import_file_name
+      t.string :user_import_content_type
+      t.integer :user_import_file_size
+      t.datetime :user_import_updated_at
       t.string :user_import_fingerprint
       t.string :edit_mode
       t.text :error_message
diff --git a/lib/tasks/enju_library_tasks.rake b/lib/tasks/enju_library_tasks.rake
@@ -13,8 +13,11 @@ namespace :enju_library do
       next if basename == "library_groups"
       ActiveRecord::FixtureSet.create_fixtures("db/fixtures/enju_library", basename)
     end
-    Shelf.create!(name: "web", library: Library.find_by(name: "web"))
-    Shelf.create!(name: "first_shelf", library: Library.find_by(name: "yours"))
+
+    if Shelf.count.zero?
+      Shelf.create!(name: "web", library: Library.find_by(name: "web"))
+      Shelf.create!(name: "first_shelf", library: Library.find_by(name: "yours"))
+    end
   end
 
   desc "upgrade enju_library"
