From d50aedf78ec7f960c09ca0739b820adc7943da14 Mon Sep 17 00:00:00 2001 From: PavelBegunkov <asml.silence@gmail.com> Date: Wed, 2 Sep 2015 13:27:19 +0300 Subject: [PATCH] Sql scripts encoding correction --- db/constraints/base.sql | 9 +++++++++ db/constraints/logs.sql | 9 +++++++++ db/data/userRoles.sql | 9 +++++++++ db/extra/duplicate.sql | 9 +++++++++ db/extra/grants.sql | 10 ++++++++++ db/fixes/21_07_15.sql | 9 +++++++++ db/fixes/28_07_15.sql | 9 +++++++++ db/stored/functions.sql | 9 +++++++++ db/stored/procedures.sql | 9 +++++++++ db/stored/views.sql | 9 +++++++++ db/structure/base.sql | 9 +++++++++ db/structure/logs.sql | 10 ++++++++++ 12 files changed, 110 insertions(+) diff --git a/db/constraints/base.sql b/db/constraints/base.sql index db873450c..1b7377fbc 100644 --- a/db/constraints/base.sql +++ b/db/constraints/base.sql @@ -1,3 +1,12 @@ +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; + -- -- Ограничения внешнего ключа сохраненных таблиц -- diff --git a/db/constraints/logs.sql b/db/constraints/logs.sql index 35daa0a12..6231bcffe 100644 --- a/db/constraints/logs.sql +++ b/db/constraints/logs.sql @@ -1,3 +1,12 @@ +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; + -- -- Ограничения внешнего ключа таблицы `logs_rating` -- diff --git a/db/data/userRoles.sql b/db/data/userRoles.sql index bb0bdf359..b8bb544ff 100644 --- a/db/data/userRoles.sql +++ b/db/data/userRoles.sql @@ -1,3 +1,12 @@ +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; + -- -- Дамп данных таблицы `user_roles` -- diff --git a/db/extra/duplicate.sql b/db/extra/duplicate.sql index a1f2cff3e..0715dc61f 100644 --- a/db/extra/duplicate.sql +++ b/db/extra/duplicate.sql @@ -1,3 +1,12 @@ +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; + # Выборка всех студентов, с повторяющимися именами SELECT distinct st1.* FROM students as st1 diff --git a/db/extra/grants.sql b/db/extra/grants.sql index 880479944..b9e5e82dd 100644 --- a/db/extra/grants.sql +++ b/db/extra/grants.sql @@ -1,3 +1,13 @@ +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; + + REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'mmcs_rating_view'@'localhost'; GRANT USAGE ON `mmcs_rating` . * TO 'mmcs_rating_view'@'localhost'; diff --git a/db/fixes/21_07_15.sql b/db/fixes/21_07_15.sql index 2a988deb3..cb2eac0b8 100644 --- a/db/fixes/21_07_15.sql +++ b/db/fixes/21_07_15.sql @@ -1,2 +1,11 @@ +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; + ALTER TABLE students_groups DROP IsStudyLeave; ALTER TABLE students_groups ADD `State` enum('common', 'outlet', 'expulsion', 'leave') NOT NULL DEFAULT 'common'; diff --git a/db/fixes/28_07_15.sql b/db/fixes/28_07_15.sql index b6dcf99fb..fae4a9718 100644 --- a/db/fixes/28_07_15.sql +++ b/db/fixes/28_07_15.sql @@ -1,3 +1,12 @@ +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; + CREATE TABLE IF NOT EXISTS `logs_binds_students` ( `ID` int(11) NOT NULL AUTO_INCREMENT, `DisciplineID` int(11) NOT NULL, diff --git a/db/stored/functions.sql b/db/stored/functions.sql index 5140eb921..b4f4d1de6 100644 --- a/db/stored/functions.sql +++ b/db/stored/functions.sql @@ -1,3 +1,12 @@ +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; + DELIMITER // DROP FUNCTION IF EXISTS GetGradeID// diff --git a/db/stored/procedures.sql b/db/stored/procedures.sql index 074bd2665..6d83516fd 100644 --- a/db/stored/procedures.sql +++ b/db/stored/procedures.sql @@ -1,3 +1,12 @@ +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; + DELIMITER // DROP PROCEDURE IF EXISTS GetCurSemesterInfo// diff --git a/db/stored/views.sql b/db/stored/views.sql index a0746fd67..e1fe5181d 100644 --- a/db/stored/views.sql +++ b/db/stored/views.sql @@ -1,3 +1,12 @@ +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; + DROP VIEW IF EXISTS view_disciplines_teachers; DROP VIEW IF EXISTS `view_disciplines_students`; DROP VIEW IF EXISTS `view_rating_result`; diff --git a/db/structure/base.sql b/db/structure/base.sql index a7d93f0bd..59439c96a 100644 --- a/db/structure/base.sql +++ b/db/structure/base.sql @@ -2,6 +2,15 @@ SET time_zone = "+00:00"; +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; + +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + -- -------------------------------------------------------- -- diff --git a/db/structure/logs.sql b/db/structure/logs.sql index 865aa0028..76ae1d669 100644 --- a/db/structure/logs.sql +++ b/db/structure/logs.sql @@ -2,6 +2,16 @@ SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; SET time_zone = "+00:00"; +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; + + +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET time_zone = "+00:00"; + + -- -------------------------------------------------------- -- GitLab