From b92331d9042588dc97273f9d033ae2c00c06569f Mon Sep 17 00:00:00 2001
From: Trevi Awater <t.awater@resoftware.nl>
Date: Mon, 4 Mar 2024 09:29:04 +0100
Subject: [PATCH] Small fix

---
 .../Resources/Resource.designer.cs            |  1 +
 .../Xamarin.Neo4j.Tests/QueryHelperTests.cs   | 26 ++++++++++++++++++-
 .../CustomRenderers/QueryEditorRenderer.cs    |  2 ++
 .../Xamarin.Neo4j.iOS/Info.plist              |  2 +-
 .../Xamarin.Neo4j/Utilities/QueryHelper.cs    |  2 +-
 .../Xamarin.Neo4j/Xamarin.Neo4j.csproj        |  2 +-
 6 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.Android/Resources/Resource.designer.cs b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.Android/Resources/Resource.designer.cs
index 5fc10bb..ce2cad1 100644
--- a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.Android/Resources/Resource.designer.cs
+++ b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.Android/Resources/Resource.designer.cs
@@ -2,6 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.Tests/QueryHelperTests.cs b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.Tests/QueryHelperTests.cs
index d814756..bc822ad 100644
--- a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.Tests/QueryHelperTests.cs
+++ b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.Tests/QueryHelperTests.cs
@@ -39,7 +39,7 @@ namespace Xamarin.Neo4j.Tests
         }
 
         [Test]
-        public void TestWithReturnAll()
+        public void TestWithLabeledAndAliasedReturnAll()
         {
             const string query = "MATCH (t:Tender)-[:LAST]->(z) RETURN *";
             const string expected = "MATCH (t:Tender)-[display_variable_1:LAST]->(z) RETURN *";
@@ -48,7 +48,29 @@ namespace Xamarin.Neo4j.Tests
 
             Assert.AreEqual(expected, actual);
         }
+        
+        [Test]
+        public void TestWithUnlabeledReturnAll()
+        {
+            const string query = "MATCH (t:Tender)-[]->(z) RETURN *";
+            const string expected = "MATCH (t:Tender)-[display_variable_1]->(z) RETURN *";
 
+            var actual = QueryHelper.ToDisplayQuery(query);
+
+            Assert.AreEqual(expected, actual);
+        }
+        
+        [Test]
+        public void TestWithLabeledAndAliasedReturnAllWithMultipleRelationships()
+        {
+            const string query = "MATCH (t:Tender)-[:LAST]->(z)-[:NEXT]->(x) RETURN *";
+            const string expected = "MATCH (t:Tender)-[display_variable_1:LAST]->(z)-[display_variable_2:NEXT]->(x) RETURN *";
+
+            var actual = QueryHelper.ToDisplayQuery(query);
+
+            Assert.AreEqual(expected, actual);
+        }
+        
         [Test]
         public void TestWithNoReturn()
         {
@@ -95,5 +117,7 @@ namespace Xamarin.Neo4j.Tests
 
             Assert.AreEqual(expected, actual);
         }
+        
+        
     }
 }
diff --git a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/CustomRenderers/QueryEditorRenderer.cs b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/CustomRenderers/QueryEditorRenderer.cs
index 8f6c783..3c52174 100644
--- a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/CustomRenderers/QueryEditorRenderer.cs
+++ b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/CustomRenderers/QueryEditorRenderer.cs
@@ -99,6 +99,8 @@ namespace Xamarin.Neo4j.iOS.CustomRenderers
                 toolbar.Items = keyButtons;
 
                 Control.InputAccessoryView = toolbar;
+                
+                HighlightWords(_keyWords);
             }
         }
 
diff --git a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/Info.plist b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/Info.plist
index b64498d..cb4d7df 100644
--- a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/Info.plist
+++ b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/Info.plist
@@ -27,7 +27,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>nl.resoftware.pocketgraph</string>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>5</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.1.0</string>
 	<key>UILaunchStoryboardName</key>
diff --git a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j/Utilities/QueryHelper.cs b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j/Utilities/QueryHelper.cs
index 383d192..53144d7 100644
--- a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j/Utilities/QueryHelper.cs
+++ b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j/Utilities/QueryHelper.cs
@@ -60,7 +60,7 @@ namespace Xamarin.Neo4j.Utilities
                 var returnIndex = transformedQuery.LastIndexOf("RETURN ", StringComparison.OrdinalIgnoreCase);
                 var returnClause = transformedQuery.Substring(returnIndex + "RETURN ".Length);
 
-                if (returnClause.Trim() != "*")
+                if (!returnClause.Trim().StartsWith("*"))
                 {
                     var newReturnClause = returnClause;
                     foreach (var rel in relationships)
diff --git a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.csproj b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.csproj
index 1dd8c6e..96c2786 100644
--- a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.csproj
+++ b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.csproj
@@ -25,4 +25,4 @@
       <EmbeddedResource Include="Resources\licenses.json" />
       <None Remove="Assets\Fonts\RobotoMono-Regular.ttf" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>