From b139decd38ac07915b3b47d7b27bab45bd784157 Mon Sep 17 00:00:00 2001
From: Bob den Otter <bob@twokings.nl>
Date: Wed, 26 Aug 2020 10:59:10 +0200
Subject: [PATCH 1/2] Better check for `INSTR` and `CAST`

---
 public/theme/skeleton/custom/setcontent_1.twig |  9 +++++----
 src/Doctrine/Version.php                       | 15 +++++++++++++++
 src/Storage/Directive/OrderDirective.php       |  6 +++---
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/public/theme/skeleton/custom/setcontent_1.twig b/public/theme/skeleton/custom/setcontent_1.twig
index 88c3852ab..962542b6e 100644
--- a/public/theme/skeleton/custom/setcontent_1.twig
+++ b/public/theme/skeleton/custom/setcontent_1.twig
@@ -106,7 +106,7 @@
     <section id="seven">
         <h1>Seven</h1>
         {% setcontent blocks = "blocks" order "title" printquery  %}
-        Results: <span id="results-six">{{ blocks|length > 0 ? 'yes' }}</span>
+        Results: <span id="results-seven">{{ blocks|length > 0 ? 'yes' }}</span>
         <ul>
             {% for block in blocks %}
                 <li>
@@ -119,7 +119,7 @@
     <section id="eight">
         <h1>Eight</h1>
         {% setcontent entries = "entries,blocks,showcases" where {'title': '%voluptat% || %porro%' } printquery  %}
-        Results: <span id="results-six">{{ entries|length > 0 ? 'yes' }}</span>
+        Results: <span id="results-eight">{{ entries|length > 0 ? 'yes' }}</span>
         <ul>
             {% for entry in entries %}
                 <li>
@@ -134,7 +134,8 @@
     <section id="nine">
         <h1>Nine</h1>
         {% setcontent showcases = 'showcases' orderby '-floatfield' printquery %}
-        Results: <span id="results-six">{{ showcases|length > 0 ? 'yes' }}</span>
+
+        Results: <span id="results-nine">{{ showcases|length > 0 ? 'yes' }}</span>
         <ul>
         {% for showcase in showcases %}
             <li>showcase {{ showcase.id }}: {{ showcase.floatfield }}
@@ -167,7 +168,7 @@
     <section id="eleven">
         <h1>Eleven</h1>
         {% setcontent entries = 'entries' order 'categories' printquery %}
-        Results: <span id="results-six">{{ entries|length > 0 ? 'yes' }}</span>
+        Results: <span id="results-eleven">{{ entries|length > 0 ? 'yes' }}</span>
         <ul>
             {% for entry in entries %}
                 <li>
diff --git a/src/Doctrine/Version.php b/src/Doctrine/Version.php
index 138ec4625..94517c74a 100644
--- a/src/Doctrine/Version.php
+++ b/src/Doctrine/Version.php
@@ -90,6 +90,21 @@ public function hasJson(): bool
         return false;
     }
 
+    public function hasInstrAndCast(): bool
+    {
+        try {
+            $query = $this->connection->createQueryBuilder();
+            $query
+                ->select('CAST (1.1 AS int), INSTR("Bolt", "o")');
+            $query->execute();
+        } catch (\Throwable $e) {
+            return false;
+        }
+
+        return true;
+    }
+
+
     private function checkSqliteVersion(): bool
     {
         /** @var PDOConnection $wrapped */
diff --git a/src/Storage/Directive/OrderDirective.php b/src/Storage/Directive/OrderDirective.php
index 952fc85d2..0344f09df 100644
--- a/src/Storage/Directive/OrderDirective.php
+++ b/src/Storage/Directive/OrderDirective.php
@@ -172,11 +172,11 @@ private function orderByNumericField(QueryInterface $query, string $translations
     {
         $qb = $query->getQueryBuilder();
 
-        // For older bundled SQLite in PHP 7.2 that do not have `INSTR` and `CAST` built in, we fall back to the
-        // "dumb" sorting instead. For this we use the same criteria as to check whether we have JSON. C'est la vie.
+        // For older bundled SQLite in PHP 7.2 that do not have `INSTR` and `CAST` built in, we fall
+        // back to the "dumb" sorting instead. C'est la vie.
         $doctrineVersion = new Version($query->getQueryBuilder()->getEntityManager()->getConnection());
 
-        if (! $doctrineVersion->hasJson()) {
+        if (! $doctrineVersion->hasInstrAndCast()) {
             $qb->addOrderBy($translationsAlias . '.value', $direction);
 
             return;

From c9975747096ff1710fb2107a17e6dca1c61f2b72 Mon Sep 17 00:00:00 2001
From: Bob den Otter <bob@twokings.nl>
Date: Wed, 26 Aug 2020 11:13:39 +0200
Subject: [PATCH 2/2] CSfix

---
 src/Doctrine/Version.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Doctrine/Version.php b/src/Doctrine/Version.php
index 94517c74a..be668a32b 100644
--- a/src/Doctrine/Version.php
+++ b/src/Doctrine/Version.php
@@ -104,7 +104,6 @@ public function hasInstrAndCast(): bool
         return true;
     }
 
-
     private function checkSqliteVersion(): bool
     {
         /** @var PDOConnection $wrapped */