Imbus/CrustyCookiesAPI
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: Imbus:d52e1507d7fd01e750fd33237a40854d24e2a73d
Branches Tags
Imbus:master
Imbus:base
Imbus:passing
..
compare: Imbus:926c8cb06f3d15fc10acc3ac81314ea41f26c6be
Branches Tags
Imbus:master
Imbus:base
Imbus:passing

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

2 changed files with 3 additions and 3 deletions
Show stats Expand all files Collapse all files

4
app/Migrations/initial-data.sql
View file

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

2
app/src/main/java/krusty/Database.java
View file

@ -40,7 +40,7 @@ public class Database {
} }
public String getCookies(Request req, Response res) { 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"); result = result.replaceAll("recipe_name", "name");
return result; return result;
} }