From: Thomas Mudrunka <tomas@mudrunka.cz>
Date: Wed, 25 Jul 2012 21:54:49 +0000 (+0200)
Subject: Po zmenach v DB se umoudrilo ORDER BY
X-Git-Url: http://git.harvie.cz/?p=mirrors%2FSokoMan.git;a=commitdiff_plain;h=1fb6317fc48de7e2324f51a280ea9e97b9cf3ed8

Po zmenach v DB se umoudrilo ORDER BY
---

diff --git a/index.php b/index.php
index ced77fb..7467bbf 100755
--- a/index.php
+++ b/index.php
@@ -663,7 +663,6 @@ class Sklad_DB extends PDO {
 
 		//SELECT
 		$sql="SELECT *$group_concat_query FROM `$class`\n";
-		//$sql="SELECT * FROM `$class`\n";
 		//JOIN
 		if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN `$j` USING($j$suffix_id)\n";
 		if(isset($join2[$class])) foreach($join2[$class] as $j => $c) $sql .= "LEFT JOIN `$j` USING($c)\n";
@@ -685,7 +684,7 @@ class Sklad_DB extends PDO {
 		//ORDER
 		if(!$order) $order = $class.$suffix_id.' DESC';
 		if($this->contains_history($class)) $order .= ",${class}_valid_from DESC";
-		//$sql .= "ORDER BY $order\n"; //TODO: fixnout az budou opraveny vicenasobny carovy kody
+		$sql .= "ORDER BY $order\n";
 		//LIMIT/OFFSET
 		if($limit) {
 			$limit = $this->escape((int)$limit);
diff --git a/install.sql b/install.sql
index aedb948..7ac736c 100644
--- a/install.sql
+++ b/install.sql
@@ -230,7 +230,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2012-07-25 23:41:18
+-- Dump completed on 2012-07-25 23:54:42
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;