From 3534cecf4426f707c61505934d3cec9f8b4441ed Mon Sep 17 00:00:00 2001 From: Miguel Reboiro-Jato 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 ++++--- src/main/angular/package-lock.json | 2 +- src/main/angular/package.json | 2 +- 4 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/src/main/angular/package-lock.json b/src/main/angular/package-lock.json index 5aa1a62..5f90cc4 100644 --- a/src/main/angular/package-lock.json +++ b/src/main/angular/package-lock.json @@ -1,6 +1,6 @@ { "name": "daa-example", - "version": "0.2.0-alpha.10", + "version": "0.2.0-alpha.11", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/main/angular/package.json b/src/main/angular/package.json index ae490ec..b239980 100644 --- a/src/main/angular/package.json +++ b/src/main/angular/package.json @@ -1,6 +1,6 @@ { "name": "daa-example", - "version": "0.2.0-alpha.10", + "version": "0.2.0-alpha.11", "scripts": { "ng": "./node_modules/.bin/ng", "start": "./node_modules/.bin/ng serve", -- 2.18.1