From 147b0452fa420d75e62e167a7e520a69bf120d96 Mon Sep 17 00:00:00 2001
From: hacklego <igsalgado@esei.uvigo.es>
Date: Sun, 12 Mar 2017 00:42:38 +0100
Subject: [PATCH] Fix datasets

---
 db/mysql-with-inserts.sql                      | 2 +-
 src/test/resources/datasets/dataset-add.xml    | 6 +++---
 src/test/resources/datasets/dataset-delete.xml | 2 +-
 src/test/resources/datasets/dataset-modify.xml | 4 ++--
 src/test/resources/datasets/dataset.xml        | 4 ++--
 src/test/resources/db/hsqldb-drop.sql          | 1 +
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/db/mysql-with-inserts.sql b/db/mysql-with-inserts.sql
index 9991ef5..d0d9944 100644
--- a/db/mysql-with-inserts.sql
+++ b/db/mysql-with-inserts.sql
@@ -18,7 +18,7 @@ CREATE TABLE `daaexample`.`pets` (
     `name` varchar(30),
     `kind` varchar(30),
     `breed` varchar(30),
-    `onwer` int references people(id)
+    `owner` int references people(id)
 );
 
 GRANT ALL ON `daaexample`.* TO 'daa'@'localhost' IDENTIFIED BY 'daa';
diff --git a/src/test/resources/datasets/dataset-add.xml b/src/test/resources/datasets/dataset-add.xml
index 435de19..d55e96f 100644
--- a/src/test/resources/datasets/dataset-add.xml
+++ b/src/test/resources/datasets/dataset-add.xml
@@ -18,7 +18,7 @@
 	<users login="normal" password="688f21dd2d65970f174e2c9d35159250a8a23e27585452683db8c5d10b586336" />
 	
 	<pets id="1" name="Ron" kind="Can" breed="Moito" owner="1" />
-	<pets id="1" name="Paul" kind="Gato" breed="Alerxico" owner="2" />
-	<pets id="1" name="Punky" kind="Gato" breed="Alerxico" owner="2" />
-	<pets id="1" name="Cospe" kind="Gaivota" breed="Pepera" owner="1" />
+	<pets id="2" name="Paul" kind="Gato" breed="Alerxico" owner="2" />
+	<pets id="3" name="Punky" kind="Gato" breed="Alerxico" owner="2" />
+	<pets id="4" name="Cospe" kind="Gaivota" breed="Pepera" owner="1" />
 </dataset>
\ No newline at end of file
diff --git a/src/test/resources/datasets/dataset-delete.xml b/src/test/resources/datasets/dataset-delete.xml
index b63294b..acdd135 100644
--- a/src/test/resources/datasets/dataset-delete.xml
+++ b/src/test/resources/datasets/dataset-delete.xml
@@ -16,5 +16,5 @@
 	<users login="normal" password="688f21dd2d65970f174e2c9d35159250a8a23e27585452683db8c5d10b586336" />
 	
 	<pets id="1" name="Ron" kind="Can" breed="Moito" owner="1" />
-    <pets id="1" name="Paul" kind="Gato" breed="Alerxico" owner="2" />
+    <pets id="2" name="Paul" kind="Gato" breed="Alerxico" owner="2" />
 </dataset>
\ No newline at end of file
diff --git a/src/test/resources/datasets/dataset-modify.xml b/src/test/resources/datasets/dataset-modify.xml
index 618d74b..3c0744f 100644
--- a/src/test/resources/datasets/dataset-modify.xml
+++ b/src/test/resources/datasets/dataset-modify.xml
@@ -17,6 +17,6 @@
 	<users login="normal" password="688f21dd2d65970f174e2c9d35159250a8a23e27585452683db8c5d10b586336" />
 	
 	<pets id="1" name="Ron" kind="Can" breed="Moito" owner="1" />
-    <pets id="1" name="Paul" kind="Gato" breed="Alerxico" owner="2" />
-    <pets id="1" name="Punky" kind="Gato" breed="Alerxico" owner="2" />
+    <pets id="2" name="Paul" kind="Gato" breed="Alerxico" owner="2" />
+    <pets id="3" name="Punky" kind="Gato" breed="Alerxico" owner="2" />
 </dataset>
\ No newline at end of file
diff --git a/src/test/resources/datasets/dataset.xml b/src/test/resources/datasets/dataset.xml
index a9b4383..1ab0603 100644
--- a/src/test/resources/datasets/dataset.xml
+++ b/src/test/resources/datasets/dataset.xml
@@ -17,6 +17,6 @@
 	<users login="normal" password="688f21dd2d65970f174e2c9d35159250a8a23e27585452683db8c5d10b586336" />
 	
 	<pets id="1" name="Ron" kind="Can" breed="Moito" owner="1" />
-    <pets id="1" name="Paul" kind="Gato" breed="Alerxico" owner="2" />
-    <pets id="1" name="Punky" kind="Gato" breed="Alerxico" owner="2" />
+    <pets id="2" name="Paul" kind="Gato" breed="Alerxico" owner="2" />
+    <pets id="3" name="Punky" kind="Gato" breed="Alerxico" owner="2" />
 </dataset>
\ No newline at end of file
diff --git a/src/test/resources/db/hsqldb-drop.sql b/src/test/resources/db/hsqldb-drop.sql
index 31f8643..94d95af 100644
--- a/src/test/resources/db/hsqldb-drop.sql
+++ b/src/test/resources/db/hsqldb-drop.sql
@@ -1,2 +1,3 @@
 DROP TABLE People IF EXISTS;
 DROP TABLE Users IF EXISTS;
+DROP TABLE pets IF exists;
\ No newline at end of file
-- 
2.18.1