From 03453e9d0ab1d11603b70434119137853fe953cb Mon Sep 17 00:00:00 2001
From: PavelBegunkov <asml.Silence@gmail.com>
Date: Wed, 8 Oct 2014 16:56:36 +0400
Subject: [PATCH] fix
---
db/StoredProcedures.sql | 14 +++++++-------
db/Structure.sql | 10 ++++------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql
index 633850764..d5d461ec6 100644
--- a/db/StoredProcedures.sql
+++ b/db/StoredProcedures.sql
@@ -2639,24 +2639,24 @@ CREATE FUNCTION `DeleteDiscipline` ( `AuthorID` INT,
) RETURNS int(11)
NO SQL
BEGIN
- DECLARE temp INT;
+ DECLARE vtemp INT;
IF NOT InternalIsTeacherAuthor(AuthorID, DisciplineID) THEN
RETURN -1;
END IF;
SELECT disciplines.isLocked
+ INTO vtemp
FROM `disciplines`
- INTO temp
WHERE disciplines.ID = DisciplineID
LIMIT 1;
- IF temp != 0 THEN
+ IF vtemp != 0 THEN
RETURN -1;
END IF;
- SET temp = CountRatings(AuthorID, DisciplineID);
- IF temp >= 0 THEN
- RETURN temp;
+ SET vtemp = CountRatings(AuthorID, DisciplineID);
+ IF vtemp >= 0 THEN
+ RETURN vtemp;
END IF;
@@ -3525,7 +3525,7 @@ BEGIN
END //
-DROP FUNCTION IF EXISTS RequestDelegateDiscipline//
+DROP FUNCTION IF EXISTS RequestDeleteDiscipline//
CREATE FUNCTION `RequestDeleteDiscipline` ( `AuthorID` INT,
`DisciplineID` INT
) RETURNS int(11)
diff --git a/db/Structure.sql b/db/Structure.sql
index d89b8f021..7920bf876 100644
--- a/db/Structure.sql
+++ b/db/Structure.sql
@@ -300,10 +300,9 @@ CREATE TABLE IF NOT EXISTS `requests` (
`Data` text NULL DEFAULT NULL,
`DataExt` text NULL DEFAULT NULL,
`Date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
- `Type` enum('delegate_discipline','delete_discipline','clear_discipline','report')
+ `Type` enum('delegate_discipline','delete_discipline','clear_discipline','report') NOT NULL,
`Status` enum('opened','processed','closed') NOT NULL DEFAULT 'opened',
- PRIMARY KEY (`ID`),
- KEY `AccountID` (`AccountID`)
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `requests_old` (
@@ -316,10 +315,9 @@ CREATE TABLE IF NOT EXISTS `requests_old` (
`Data` text NULL DEFAULT NULL,
`DataExt` text NULL DEFAULT NULL,
`Date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
- `Type` enum('delegate_discipline','delete_discipline','clear_discipline','report')
+ `Type` enum('delegate_discipline','delete_discipline','clear_discipline','report') NOT NULL,
`Status` enum('opened','processed','closed') NOT NULL DEFAULT 'opened',
- PRIMARY KEY (`ID`),
- KEY `AccountID` (`AccountID`)
+ PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
--
GitLab