From dc8333ef66833a6c81ff7add2e2995731a0864ab Mon Sep 17 00:00:00 2001
From: PavelBegunkov <asml.Silence@gmail.com>
Date: Fri, 6 Mar 2015 01:29:35 +0300
Subject: [PATCH] FIX: stupid phpMyAdmin :/
---
db/StoredProcedures.sql | 40 ++++++++++++++++++----------------------
1 file changed, 18 insertions(+), 22 deletions(-)
diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql
index 240bbcef3..b9d1eb7d8 100644
--- a/db/StoredProcedures.sql
+++ b/db/StoredProcedures.sql
@@ -770,22 +770,22 @@ CREATE PROCEDURE `GetRoadmapExam`
( IN `pDisciplineID` INT)
NO SQL
BEGIN
- SELECT view_disciplines.SubjectID,
- view_disciplines.SubjectName,
- view_roadmap.ModuleID,
- view_roadmap.ModuleName,
- view_roadmap.ModuleType,
- view_roadmap.SubmoduleID,
- view_roadmap.SubmoduleName,
- view_roadmap.SubmoduleRate AS 'MaxRate',
- view_roadmap.SubmoduleType
- FROM `view_roadmap`
- INNER JOIN `view_disciplines` ON view_disciplines.DisciplineID = pDisciplineID
- WHERE view_roadmap.DisciplineID = pDisciplineID AND
- (view_roadmap.ModuleType = 'exam' OR view_roadmap.ModuleType = 'extra')
- ORDER BY InternalOrderModuleTypesForSession(view_roadmap.ModuleType) ASC,
- view_roadmap.ModuleOrderNum ASC,
- view_roadmap.SubmoduleOrderNum ASC;
+ SELECT view_disciplines.SubjectID,
+ view_disciplines.SubjectName,
+ view_roadmap.ModuleID,
+ view_roadmap.ModuleName,
+ view_roadmap.ModuleType,
+ view_roadmap.SubmoduleID,
+ view_roadmap.SubmoduleName,
+ view_roadmap.SubmoduleRate AS 'MaxRate',
+ view_roadmap.SubmoduleType
+ FROM `view_roadmap`
+ INNER JOIN `view_disciplines` ON view_disciplines.DisciplineID = pDisciplineID
+ WHERE view_roadmap.DisciplineID = pDisciplineID AND
+ (view_roadmap.ModuleType = 'exam' OR view_roadmap.ModuleType = 'extra')
+ ORDER BY InternalOrderModuleTypesForSession(view_roadmap.ModuleType) ASC,
+ view_roadmap.ModuleOrderNum ASC,
+ view_roadmap.SubmoduleOrderNum ASC;
END //
@@ -819,15 +819,11 @@ BEGIN
END //
-
-
-
-
# -------------------------------------------------------------------------------------------
# Label: requests
# -------------------------------------------------------------------------------------------
-# DROP PROCEDURE IF EXISTS GetRequests//
+# DROP PROCEDURE IF EXISTS GetRequests
# CREATE PROCEDURE `GetRequests` ( IN `AccountID` INT,
# IN `Type` INT # 0 to me, 1 - from me, 3 - all
# )
@@ -848,7 +844,7 @@ END //
# WHERE ((Type & 1) != 0 AND requests.To = AccountID) OR
# ((Type & 2) != 0 AND requests.From = AccountID)
# ORDER BY requests.To = AccountID DESC, requests.Type ASC, requests.ID ASC;
-# END//
+# END
--
GitLab