[neelix-devel] neelix/db hans.sql,NONE,1.1 Makefile,1.1,1.2 pbj.sql,1.1,1.2

[<fu...@us...>]

Update of /cvsroot/neelix/neelix/db
In directory sc8-pr-cvs1:/tmp/cvs-serv21770

Modified Files:
	Makefile pbj.sql 
Added Files:
	hans.sql 
Log Message:
PBJ still broken. Use the hans database. Just run make in db/ and then run 
./neelix db/hans.db


--- NEW FILE: hans.sql ---
BEGIN TRANSACTION;
-- CREATE TABLE category (
--   category_id INTEGER NOT NULL PRIMARY KEY,
--   cookbook_id INTEGER NOT NULL,
--   name varchar(80)
-- );
INSERT INTO category VALUES(1,1,'Bread');
INSERT INTO category VALUES(2,1,'Sourdough Bread');
-- CREATE TABLE cookbook (
--   cookbook_id INTEGER NOT NULL PRIMARY KEY,
--   name varchar(80)
-- );
INSERT INTO cookbook VALUES(1,'Hans'' Cookbook');
-- CREATE TABLE food (
--   food_id INTEGER NOT NULL PRIMARY KEY,
--   name varchar(80)
-- );
INSERT INTO food VALUES(1,'Whole Wheat Flour');
INSERT INTO food VALUES(2,'Water');
INSERT INTO food VALUES(3,'Instant Yeast');
INSERT INTO food VALUES(4,'Salt');
INSERT INTO food VALUES(5,'Sourdough Start');
INSERT INTO food VALUES(6,'Honey');
-- CREATE TABLE food_measures (
--   food_id INTEGER NOT NULL,
--   measure_id INTEGER NOT NULL,
--   grams float,
--   ccs float
-- );
-- CREATE TABLE ingredient (
--   ingredient_id INTEGER NOT NULL PRIMARY KEY,
--   recipe_id INTEGER NOT NULL,
--   measure_id INTEGER NOT NULL,
--   food_id INTEGER NOT NULL,
--   quantity float,
--   modifier varchar(80)
-- );
INSERT INTO ingredient VALUES(1,1,1,5,720,'Active, 100% Hydration');
INSERT INTO ingredient VALUES(2,1,1,1,540,'');
INSERT INTO ingredient VALUES(3,1,1,2,295,NULL);
INSERT INTO ingredient VALUES(4,1,2,4,2,NULL);
-- CREATE TABLE measure (
--   measure_id INTEGER NOT NULL PRIMARY KEY,
--   name varchar(80)
-- );
INSERT INTO measure VALUES(1,'grams');
INSERT INTO measure VALUES(2,'teaspoons');
-- CREATE TABLE recipe (
--   recipe_id INTEGER NOT NULL PRIMARY KEY,
--   name varchar(80),
--   author varchar(80),
--   serves varchar(80),
--   yields varchar(80),
--   preptime varchar(80),
--   tottime varchar(80),
--   temp varchar(80),
--   directions text,
--   note text
-- );
INSERT INTO recipe VALUES(1,'Basic Whole Wheat Sourdough Bread','Hans Fugal',NULL,'2 loaves',NULL,NULL,NULL,'Knead, let rise, shape and let rise, bake.','Based off the basic whole wheat bread recipe in Laurel''s Kitchen Bread Book.');
-- CREATE TABLE recipe_category (
--   recipe_id INTEGER NOT NULL,
--   category_id INTEGER NOT NULL
-- );
INSERT INTO recipe_category VALUES(1,2);
COMMIT;

Index: Makefile
===================================================================
RCS file: /cvsroot/neelix/neelix/db/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	12 Dec 2003 22:47:05 -0000	1.1
--- Makefile	13 Dec 2003 17:55:41 -0000	1.2
***************
*** 2,6 ****
  XSL=db.xsl
  
! all: pbj.db
  
  empty.db: db.xml
--- 2,6 ----
  XSL=db.xsl
  
! all: hans.db
  
  empty.db: db.xml

Index: pbj.sql
===================================================================
RCS file: /cvsroot/neelix/neelix/db/pbj.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pbj.sql	12 Dec 2003 22:47:05 -0000	1.1
--- pbj.sql	13 Dec 2003 17:55:41 -0000	1.2
***************
*** 1,2 ****
--- 1,4 ----
+ -- NOTE this is broken. use hans.sql...
+ 
  --
  -- Dumping data for table 'food'