Dropped redundant 'location' column

Looks like I messed up later on and kept two columns which were basically referring to the same thing. Signed-off-by: Miquel Sabaté Solà <[email protected]>
mssola · Mar 14, 2024 · 8818aa6 · 8818aa6
1 parent c232356
commit 8818aa6
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 14 deletions.
diff --git a/app/controllers/things_controller.rb b/app/controllers/things_controller.rb
@@ -63,7 +63,7 @@ def set_thing
 
   def thing_params
     params.require(:thing).permit(:target, :title, :publisher, :address, :year, :url, :access,
-                                  :authors, :location, :insideof, :pages, :rate, :status, :kind,
-                                  :bought_at, :editors, :note, :where_is_it, tag_ids: [])
+                                  :authors, :insideof, :pages, :rate, :status, :kind, :bought_at,
+                                  :editors, :note, :where_is_it, tag_ids: [])
   end
 end
diff --git a/app/models/thing.rb b/app/models/thing.rb
@@ -23,7 +23,6 @@ def self.like(text:)
          .or(where('publisher LIKE ?', "%#{text}%"))
          .or(where('address LIKE ?', "%#{text}%"))
          .or(where('url LIKE ?', "%#{text}%"))
-         .or(where('location LIKE ?', "%#{text}%"))
          .or(where('insideof LIKE ?', "%#{text}%"))
          .or(where('pages LIKE ?', "%#{text}%"))
          .or(where('note LIKE ?', "%#{text}%"))

diff --git a/app/views/things/_form.html.erb b/app/views/things/_form.html.erb
@@ -49,11 +49,6 @@
       <%= form.date_field :access %>
     </div>
 
-    <div>
-      <%= form.label :location %>
-      <%= form.text_field :location %>
-    </div>
-
     <div>
       <%= form.label :insideof %>
       <%= form.text_field :insideof %>

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
@@ -20,7 +20,6 @@ ca:
         year: Any
         url: Enllaç
         access: Última data de consulta
-        location: Lloc
         insideof: Dins de
         pages: Pàgines
         rate: Qualificació

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -20,7 +20,6 @@ en:
         year: Year
         url: URL
         access: Last consulted at
-        location: Place
         insideof: Inside of
         pages: Pages
         rate: Rate

diff --git a/db/migrate/20240314211609_drop_location_column.rb b/db/migrate/20240314211609_drop_location_column.rb
@@ -0,0 +1,5 @@
+class DropLocationColumn < ActiveRecord::Migration[7.1]
+  def change
+    remove_column :things, :location
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/test/fixtures/things.yml b/test/fixtures/things.yml
@@ -7,7 +7,6 @@ thing1:
   address:
   year: 2024
   url: 'http://example.com'
-  location: 'Somewhere'
   insideof: 'Some other thing'
   pages: '22-24'
   note: 'This is a note 1'
@@ -27,7 +26,6 @@ thing2:
   address: 'Address 2'
   year: 2024
   url: 'http://example.com'
-  location: 'Somewhere'
   insideof: 'Some other thing'
   pages: '22-24'
   note: 'This is a note 2'