From 6c30abb102b5ab9e9ddfd8cc9bb8e7b97b030a35 Mon Sep 17 00:00:00 2001
From: Miguel Reboiro-Jato <mrjato@uvigo.es>
Date: Fri, 14 Feb 2020 18:26:38 +0100
Subject: [PATCH] Makes SQL scripts compatible with MySQL 8

Minor changes have been done in the SQL scripts to make them
compatible with MySQL 8. The main change is the way that the user is
created.
---
 db/mysql-with-inserts.sql | 7 ++++---
 db/mysql.sql              | 7 ++++---
 pom.xml                   | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/db/mysql-with-inserts.sql b/db/mysql-with-inserts.sql
index a35a952..147500d 100644
--- a/db/mysql-with-inserts.sql
+++ b/db/mysql-with-inserts.sql
@@ -5,16 +5,17 @@ CREATE TABLE `daaexample`.`people` (
 	`name` varchar(50) NOT NULL,
 	`surname` varchar(100) NOT NULL,
 	PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE `daaexample`.`users` (
 	`login` varchar(100) NOT NULL,
 	`password` varchar(64) NOT NULL,
 	`role` varchar(10) NOT NULL,
 	PRIMARY KEY (`login`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-GRANT ALL ON `daaexample`.* TO 'daa'@'localhost' IDENTIFIED BY 'daa';
+CREATE USER 'daa'@'localhost' IDENTIFIED BY 'daa';
+GRANT ALL ON `daaexample`.* TO 'daa'@'localhost';
 
 INSERT INTO `daaexample`.`people` (`id`,`name`,`surname`) VALUES (0,'Antón','Pérez');
 INSERT INTO `daaexample`.`people` (`id`,`name`,`surname`) VALUES (0,'Manuel','Martínez');
diff --git a/db/mysql.sql b/db/mysql.sql
index ed7cd93..fc0f895 100644
--- a/db/mysql.sql
+++ b/db/mysql.sql
@@ -5,13 +5,14 @@ CREATE TABLE `daaexample`.`people` (
 	`name` varchar(50) NOT NULL,
 	`surname` varchar(100) NOT NULL,
 	PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE `daaexample`.`users` (
 	`login` varchar(100) NOT NULL,
 	`password` varchar(64) NOT NULL,
 	`role` varchar(10) NOT NULL,
 	PRIMARY KEY (`login`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-GRANT ALL ON `daaexample`.* TO 'daa'@'localhost' IDENTIFIED BY 'daa';
+CREATE USER 'daa'@'localhost' IDENTIFIED BY 'daa';
+GRANT ALL ON `daaexample`.* TO 'daa'@'localhost';
diff --git a/pom.xml b/pom.xml
index ccf5f97..367242a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>es.uvigo.esei.daa</groupId>
-	<artifactId>example</artifactId>
+	<artifactId>example-full-tests</artifactId>
 	<packaging>war</packaging>
-	<version>0.1.13</version>
+	<version>0.1.15</version>
 	<name>DAA Example</name>
 
 	<licenses>
-- 
2.18.1