Compare commits

..

No commits in common. "d52e1507d7fd01e750fd33237a40854d24e2a73d" and "926c8cb06f3d15fc10acc3ac81314ea41f26c6be" have entirely different histories.

2 changed files with 3 additions and 3 deletions

View file

@ -12,7 +12,7 @@ VALUES
(8, 'Småbröd AB', 'Malmö');
INSERT
OR IGNORE INTO cookies (cookie_name)
OR IGNORE INTO recipes (recipe_name)
VALUES
('Nut ring'),
('Nut cookie'),
@ -22,7 +22,7 @@ VALUES
('Berliner');
INSERT
OR IGNORE INTO raw_materials(ingredient_name, ingredient_quantity, unit)
OR IGNORE INTO ingredients (ingredient_name, amount, unit)
VALUES
('Bread crumbs', 500000, 'g'),
('Butter', 500000, 'g'),

View file

@ -40,7 +40,7 @@ public class Database {
}
public String getCookies(Request req, Response res) {
String result = selectQuery("cookies", "cookies", "recipe_name");
String result = selectQuery("recipes", "cookies", "recipe_name");
result = result.replaceAll("recipe_name", "name");
return result;
}