From 76fec09c4b869a2983f977bb0487713866479a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?King=20K=C3=A9vin?= <kingkevin@cuvoodoo.info>
Date: Tue, 31 Jan 2023 21:54:27 +0100
Subject: [PATCH] rename properties table

---
 populate.sql |  8 ++++----
 schema.sql   |  2 +-
 server.rb    | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/populate.sql b/populate.sql
index 43583fd..8eac593 100644
--- a/populate.sql
+++ b/populate.sql
@@ -36,7 +36,7 @@ INSERT INTO property (name) VALUES ("kicad_footprint");
 INSERT INTO property (name) VALUES ("JLCPCB_CORRECTION");
 
 -- set properties
-INSERT INTO property_value (part, property, value) VALUES ((SELECT id FROM part WHERE name = "ESP32-S3-WROOM-1"), (SELECT id FROM property WHERE name = "category"), "MCU");
-INSERT INTO property_value (part, property, value) VALUES ((SELECT id FROM part WHERE name = "ESP32-S3-WROOM-1"), (SELECT id FROM property WHERE name = "category"), "RF");
-INSERT INTO property_value (part, property, value) VALUES ((SELECT id FROM part WHERE name = "ESP32-S3-WROOM-1"), (SELECT id FROM property WHERE name = "category"), "WiFi");
-INSERT INTO property_value (part, property, value) VALUES ((SELECT id FROM part WHERE name = "ESP32-S3-WROOM-1"), (SELECT id FROM property WHERE name = "category"), "Bluetooth");
+INSERT INTO properties (part, property, value) VALUES ((SELECT id FROM part WHERE name = "ESP32-S3-WROOM-1"), (SELECT id FROM property WHERE name = "category"), "MCU");
+INSERT INTO properties (part, property, value) VALUES ((SELECT id FROM part WHERE name = "ESP32-S3-WROOM-1"), (SELECT id FROM property WHERE name = "category"), "RF");
+INSERT INTO properties (part, property, value) VALUES ((SELECT id FROM part WHERE name = "ESP32-S3-WROOM-1"), (SELECT id FROM property WHERE name = "category"), "WiFi");
+INSERT INTO properties (part, property, value) VALUES ((SELECT id FROM part WHERE name = "ESP32-S3-WROOM-1"), (SELECT id FROM property WHERE name = "category"), "Bluetooth");
diff --git a/schema.sql b/schema.sql
index 684c783..df2aad4 100644
--- a/schema.sql
+++ b/schema.sql
@@ -63,7 +63,7 @@ CREATE TABLE IF NOT EXISTS property (
 );
 
 -- property value
-CREATE TABLE IF NOT EXISTS property_value (
+CREATE TABLE IF NOT EXISTS properties (
 	id INTEGER AUTO_INCREMENT PRIMARY KEY, -- index
 	part INTEGER NOT NULL, -- the part
 	property INTEGER NOT NULL,
diff --git a/server.rb b/server.rb
index a1ee889..4a4110c 100755
--- a/server.rb
+++ b/server.rb
@@ -107,7 +107,7 @@ def get_part_by_id(id)
   end
   # add properties
   part["properties"] = []
-  statement = @db.prepare("SELECT property.name AS name, property_value.value AS value FROM property_value JOIN property ON property.id = property_value.property WHERE property_value.part = ?")
+  statement = @db.prepare("SELECT property.name AS name, properties.value AS value FROM properties JOIN property ON property.id = properties.property WHERE properties.part = ?")
   statement.execute(id).each do |row|
     part["properties"] << row
   end
@@ -168,7 +168,7 @@ def search(terms)
   statements << @db.prepare("SELECT id FROM part WHERE name LIKE ?")
   statements << @db.prepare("SELECT id FROM part WHERE mpn LIKE ?")
   statements << @db.prepare("SELECT id FROM part WHERE description LIKE ?")
-  statements << @db.prepare("SELECT property_value.part AS id FROM property_value JOIN property ON property.id = property_value.property WHERE property.name = 'category' AND property_value.value LIKE ?")
+  statements << @db.prepare("SELECT properties.part AS id FROM properties JOIN property ON property.id = properties.property WHERE property.name = 'category' AND properties.value LIKE ?")
   children = @db.prepare("SELECT id FROM part WHERE family = ?")
   term_ids = []
   terms.each do |term|
@@ -228,11 +228,11 @@ def delete_part(id)
   end
   # delete all fields
   statements = []
-  statements << @db.prepare("DELETE FROM property_value WHERE part = ?")
+  statements << @db.prepare("DELETE FROM properties WHERE part = ?")
   statements << @db.prepare("DELETE FROM assembly WHERE assembled = ?")
   statements << @db.prepare("DELETE FROM assembly WHERE component = ?")
   statements << @db.prepare("DELETE FROM distribution WHERE part = ?")
-  statements << @db.prepare("DELETE FROM property_value WHERE part = ?")
+  statements << @db.prepare("DELETE FROM properties WHERE part = ?")
   statements << @db.prepare("DELETE FROM inventory WHERE part = ?")
   statements << @db.prepare("DELETE FROM part WHERE id = ?")
   statements.each do |statement|
@@ -357,7 +357,7 @@ def add_part(part)
   # update properties
   field = "properties"
   if part[field] then
-    delete = @db.prepare("DELETE FROM property_value WHERE part = ?")
+    delete = @db.prepare("DELETE FROM properties WHERE part = ?")
     delete.execute(part["id"])
     part[field].each do |row|
       next unless row["name"] and !row["name"].empty?
@@ -370,7 +370,7 @@ def add_part(part)
         insert.execute(row["name"])
         ref = statement.execute(row["name"].downcase).to_a[0]
       end
-      insert = @db.prepare("INSERT INTO property_value (property,part,value) VALUES (?,?,?)")
+      insert = @db.prepare("INSERT INTO properties (property,part,value) VALUES (?,?,?)")
       insert.execute(ref["id"], part["id"], row["value"])
     end
   end