Database refactoring/simplification

Author: jayaddison

dbs/autochef/build.xml

@@ -1,7 +1,7 @@
 <project default="create">
 
   <property file="../../www/autochef/src/main/resources/autochef.properties" />
-  <property name="jdbc.classpath" value="/usr/share/java/postgresql.jar" />
+  <property name="jdbc.classpath" value="/usr/share/java/postgresql.jar; /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar" />
 
   <target name="clean">
     <sql
@@ -56,13 +56,9 @@
         classpath="${jdbc.classpath}"
         url="jdbc:postgresql://${database.hostname}/${database.catalog}"
         userid="${database.username}"
-        password="${database.password}">
-      <path>
-        <fileset dir="scripts/data/base-recipes">
-          <include name="*.sql" />
-        </fileset>
-      </path>
-    </sql>
+        password="${database.password}"
+        src="scripts/data/custom-ingredients.sql"
+    />
     <sql
         driver="org.postgresql.Driver"
         classpath="${jdbc.classpath}"

dbs/autochef/functions/recipes/fn_randomrecipes.sql

@@ -5,9 +5,10 @@ create or replace function fn_randomrecipes
 returns setof tpingredientlink as
 '
     select m.ingredientid, t.name as ingredientname
-    from tbmeals as m
+    from tbingredients as m
     join tbingredienttranslations as t on t.ingredientid = m.ingredientid
-    where t.languageid = languageid
+    where m.meal
+    and t.languageid = languageid
     order by random()
     limit 9;
 '

dbs/autochef/functions/recipes/fn_userrecipeingredients.sql

@@ -57,8 +57,9 @@ begin
         insert into _choseningredients (treenodeid, treeparentid, ingredientid, starttime, available)
         select r.treenodeid, r.treeparentid, r.ingredientid, r.starttime, 0::bit
         from _requiredingredients as r
-        join tbproducts as p on p.ingredientid = r.ingredientid
-        where not exists
+        join tbingredients as p on p.ingredientid = r.ingredientid
+        where p.product
+        and not exists
         (
             select *
             from _possibleuseringredients as p

dbs/autochef/functions/recipes/fn_userrecipes.sql

@@ -9,9 +9,10 @@ begin
     return query
         select t.ingredientid, t.name
         from fn_userpossibleingredients(username) as i
-        join tbmeals as m on m.ingredientid = i.ingredientid
+        join tbingredients as m on m.ingredientid = i.ingredientid
         join tbingredienttranslations as t on t.ingredientid = i.ingredientid
-        where t.languageid = ''en'';
+        where m.meal
+        and t.languageid = ''en'';
 end;
 '
 language plpgsql;

dbs/autochef/functions/search/fn_searchingredients.sql

@@ -9,8 +9,9 @@ begin
     return query
         select p.ingredientid, t.name as ingredientname
         from tbingredienttranslations as t
-        join tbproducts as p on p.ingredientid = t.ingredientid
-        where t.languageid = languageid
+        join tbingredients as p on p.ingredientid = t.ingredientid
+        where p.product
+        and t.languageid = languageid
         and t.name ilike textcat(''%'', textcat(searchtext, ''%''))
         limit 9;
 end

dbs/autochef/functions/search/fn_searchrecipes.sql

@@ -9,8 +9,9 @@ begin
     return query
         select m.ingredientid, t.name as ingredientname
         from tbingredienttranslations as t
-        join tbmeals as m on m.ingredientid = t.ingredientid
-        where t.languageid = languageid
+        join tbingredients as m on m.ingredientid = t.ingredientid
+        where m.meal
+        and t.languageid = languageid
         and t.name ilike textcat(''%'', textcat(searchtext, ''%''))
         limit 9;
 end

dbs/autochef/scripts/create.sql

@@ -4,11 +4,15 @@ create table tbingredients
 (
     ingredientid serial,
 
+    product boolean not null default ('false'::boolean),
+    meal boolean not null default ('false'::boolean),
+
     duration interval not null,
 
     primary key (ingredientid)
 );
 
+-- Deprecated
 create table tbingredientdependencies
 (
     parentid int references tbingredients (ingredientid),
@@ -18,29 +22,17 @@ create table tbingredientdependencies
 );
 create index ixingredientparents on tbingredientdependencies (childid, parentid);
 
-create table tblanguages
-(
-    languageid char(2),
-
-    primary key (languageid)
-);
-
+-- Deprecated
 create table tbingredienttranslations
 (
     ingredientid int references tbingredients (ingredientid),
-    languageid char(2) references tblanguages (languageid),
+    languageid char(2),
 
     name text not null,
     instructions text not null,
 
-    primary key (ingredientid, languageid)
-);
-
-create table tbmeals
-(
-    ingredientid int references tbingredients (ingredientid),
-
-    primary key (ingredientid)
+    primary key (ingredientid, languageid),
+    unique (languageid, name)
 );
 
 create table tbsuppliers
@@ -50,14 +42,6 @@ create table tbsuppliers
     primary key (supplierid)
 );
 
-create table tbproducts
-(
-    ingredientid int references tbingredients (ingredientid),
-    supplierid char(4) references tbsuppliers (supplierid),
-
-    primary key (ingredientid, supplierid)
-);
-
 create table tbusers
 (
     username text,
@@ -118,6 +102,3 @@ create type tprecipeingredient as
     starttime interval,
     available bit
 );
-
--- Languages
-insert into tblanguages (languageid) values ('en');

dbs/autochef/scripts/data/base-recipes/beef-burritos.sql

@@ -0,0 +1,24 @@
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Fresh Parsley', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Fresh Coriander', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Ground Black Pepper', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Extra Virgin Olive Oil', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Smoked Paprika', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Thai Sweet Chilli Sauce', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Soy Sauce', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Fresh Ginger', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Marmite', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Dijon Mustard', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Tomato Paste', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Tin of Tomatoes', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Basmati Rice', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Can of Tuna', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Curry Sauce', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Curry Paste', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Tabasco Sauce', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Plain Yoghurt', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Instant Mashed Potato', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Instant Noodles', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Plain Flour', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Red Wine', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'White Wine', '';
+insert into tbingredients (duration) select '0'::interval; insert into tbingredienttranslations (ingredientid, languageid, name, instructions) select currval('tbingredients_ingredientid_seq'), 'en', 'Fine Sea Salt', '';