From 223f2f1d7f96ccba6ea6e7eecd8f478910107169 Mon Sep 17 00:00:00 2001 From: "osgonzalez@esei.uvigo.es" Date: Tue, 13 Mar 2018 16:18:39 +0100 Subject: [PATCH] Add "pet" table to mysql.sql and mysql-with-inserts.sql -This adds the "pet" table whith example insets. --- .gitignore | 17 +++++++++++++++++ db/mysql-with-inserts.sql | 19 +++++++++++++++++++ db/mysql.sql | 10 ++++++++++ 3 files changed, 46 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..88063ce --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# General +/bak + +# Eclipse +.project +.classpath +.settings +WebContent + +# Maven +/bin +/target +/assembly + +# Testing +/servers +C:\\nppdf32Log\\debuglog.txt diff --git a/db/mysql-with-inserts.sql b/db/mysql-with-inserts.sql index d420e40..29e70f4 100644 --- a/db/mysql-with-inserts.sql +++ b/db/mysql-with-inserts.sql @@ -7,12 +7,22 @@ CREATE TABLE `daaexample`.`people` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE `daaexample`.`pet` ( + `idPet` int NOT NULL AUTO_INCREMENT, + `name` varchar(50) NOT NULL, + `idMaster` int NOT NULL, + PRIMARY KEY (`idPet`), + FOREIGN KEY (idMaster) REFERENCES people(id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + CREATE TABLE `daaexample`.`users` ( `login` varchar(100) NOT NULL, `password` varchar(64) NOT NULL, PRIMARY KEY (`login`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + GRANT ALL ON `daaexample`.* TO 'daa'@'localhost' IDENTIFIED BY 'daa'; INSERT INTO `daaexample`.`people` (`id`,`name`,`surname`) VALUES (0,'Antón','Pérez'); @@ -24,6 +34,15 @@ INSERT INTO `daaexample`.`people` (`id`,`name`,`surname`) VALUES (0,'María','Nu INSERT INTO `daaexample`.`people` (`id`,`name`,`surname`) VALUES (0,'Alba','Fernández'); INSERT INTO `daaexample`.`people` (`id`,`name`,`surname`) VALUES (0,'Asunción','Jiménez'); +-- Add inserts to pets +INSERT INTO `daaexample`.`pet` (`idPet`,`name`,`idMaster`) VALUES (0,'Jimminy',0); +INSERT INTO `daaexample`.`pet` (`idPet`,`name`,`idMaster`) VALUES (0,'Cisco',0); +INSERT INTO `daaexample`.`pet` (`idPet`,`name`,`idMaster`) VALUES (0,'Phoenix',1); +INSERT INTO `daaexample`.`pet` (`idPet`,`name`,`idMaster`) VALUES (0,'Rocky',1); +INSERT INTO `daaexample`.`pet` (`idPet`,`name`,`idMaster`) VALUES (0,'Tallulah',2); + + + -- The password for each user is its login suffixed with "pass". For example, user "admin" has the password "adminpass". INSERT INTO `daaexample`.`users` (`login`,`password`) VALUES ('admin', '43f413b773f7d0cfad0e8e6529ec1249ce71e8697919eab30d82d800a3986b70'); INSERT INTO `daaexample`.`users` (`login`,`password`) VALUES ('normal', '688f21dd2d65970f174e2c9d35159250a8a23e27585452683db8c5d10b586336'); diff --git a/db/mysql.sql b/db/mysql.sql index 459a52c..f71c158 100644 --- a/db/mysql.sql +++ b/db/mysql.sql @@ -7,10 +7,20 @@ CREATE TABLE `daaexample`.`people` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE `daaexample`.`pet` ( + `idPet` int NOT NULL AUTO_INCREMENT, + `name` varchar(50) NOT NULL, + `idMaster` int NOT NULL, + PRIMARY KEY (`idPet`), + FOREIGN KEY (idMaster) REFERENCES people(id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + CREATE TABLE `daaexample`.`users` ( `login` varchar(100) NOT NULL, `password` varchar(64) NOT NULL, PRIMARY KEY (`login`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + GRANT ALL ON `daaexample`.* TO 'daa'@'localhost' IDENTIFIED BY 'daa'; -- 2.18.1