From 986eb9054662f8f65d787e82224c2d53e01a45ae Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Tue, 31 Mar 2020 09:40:31 +0200
Subject: [PATCH 1/3] =?UTF-8?q?N=C2=B02893=20-=20Fix=20DataModel=20Viewer?=
 =?UTF-8?q?=20not=20supporting=20special=20chars=20in=20class=20name=20(eg?=
 =?UTF-8?q?.=20")?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/schema.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pages/schema.php b/pages/schema.php
index 8dfb6f474..0254e86af 100644
--- a/pages/schema.php
+++ b/pages/schema.php
@@ -309,12 +309,18 @@ EOF
 			$aRootClasses[$sClassName] = MetaModel::GetName($sClassName);
 		}
 		$sLabelClassName = MetaModel::GetName($sClassName);
+
 		//Fetch classes names for autocomplete purpose
+		// - Encode as JSON to escape quotes and other characters
+		$sClassLabelAndCodeAsJSON = json_encode("$sLabelClassName ($sClassName)");
+		$sClassLabelAsJSON = json_encode($sLabelClassName);
+		$sClassCodeAsJSON = json_encode($sClassName);
+		// - Push to autocomplete
 		$oPage->add_script(
 			<<<EOF
-	autocompleteClassLabelAndCode.push("$sLabelClassName ($sClassName)");
-	autocompleteClassLabel.push("$sLabelClassName");
-	autocompleteClassCode.push("$sClassName");
+	autocompleteClassLabelAndCode.push($sClassLabelAndCodeAsJSON);
+	autocompleteClassLabel.push($sClassLabelAsJSON);
+	autocompleteClassCode.push($sClassCodeAsJSON);
 EOF
 		);
 	}

From 30034d381b27e565f3e1752cc9bca98405b25786 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Tue, 31 Mar 2020 09:47:37 +0200
Subject: [PATCH 2/3] Update version number to 2.7.0-1

---
 css/css-variables.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/css-variables.scss b/css/css-variables.scss
index dc87b202f..524c792b0 100644
--- a/css/css-variables.scss
+++ b/css/css-variables.scss
@@ -17,7 +17,7 @@
  */
 
 // Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
-$version: "v2.7.0";
+$version: "v2.7.0-1";
 $approot-relative: "../../../../../" !default; // relative to env-***/branding/themes/***/main.css
 
 // Base colors

From 15e5e21a89a3d3214dace82b8765a47e304a8f29 Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Wed, 1 Apr 2020 17:37:55 +0200
Subject: [PATCH 3/3] Compatibility with MySQL 5.6

---
 core/sqlunionquery.class.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/sqlunionquery.class.inc.php b/core/sqlunionquery.class.inc.php
index b1743468f..8ff40e6d5 100644
--- a/core/sqlunionquery.class.inc.php
+++ b/core/sqlunionquery.class.inc.php
@@ -131,7 +131,7 @@ class SQLUnionQuery extends SQLQuery
 
 		if ($bGetCount)
 		{
-			$sSelects = "({$sLimitStart}".implode(" {$sLimit}{$sLimitEnd}{$sLineSep} UNION{$sLineSep} {$sLimitStart}", $aSelects)." {$sLimit}{$sLimitEnd})";
+			$sSelects = "{$sLimitStart}".implode(" {$sLimit}{$sLimitEnd}{$sLineSep} UNION{$sLineSep} {$sLimitStart}", $aSelects)." {$sLimit}{$sLimitEnd}";
 			$sFrom = "({$sLineSep}{$sSelects}{$sLineSep}) as __selects__";
 			$sSQL = "SELECT COUNT(*) AS COUNT FROM (SELECT$sLineSep 1 $sLineSep FROM {$sFrom}{$sLineSep}) AS _union_alderaan_";
 		}