Make JoinSqlBuilder test demonstrate double from bug in Oracle provider and fix bug.

Author: BruceCowan-AI

src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs

@@ -7,6 +7,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 
 namespace ServiceStack.OrmLite.Oracle
@@ -285,7 +286,8 @@ public override string ToSelectStatement(Type tableType,  string sqlFilter, para
 
 			if (isFullSelectStatement)
 			{
-			    if (!sqlFilter.Trim().ToUpperInvariant().Contains(" FROM ")) sqlFilter += " FROM DUAL";
+                if (Regex.Matches(sqlFilter.Trim().ToUpperInvariant(), @"(\b|\n)FROM(\b|\n)").Count < 1)
+                    sqlFilter += " FROM DUAL";
 			    return sqlFilter.SqlFmt(filterParams);
 			}
 

tests/ServiceStack.OrmLite.Tests/JoinSqlBuilderTests.cs

@@ -1,5 +1,5 @@
+using System.Text.RegularExpressions;
 using NUnit.Framework;
-using System;
 using ServiceStack.DataAnnotations;
 
 namespace ServiceStack.OrmLite.Tests
@@ -82,6 +82,9 @@ public void DoubleWhereLeftJoinTest ()
             var expectedNq = "SELECT \"User\".Id,\"User\".Name,\"User\".Age \nFROM \"User\" \n LEFT OUTER JOIN  Addresses ON \"User\".Id = Addresses.UserId  \nWHERE (\"User\".Age > 18) AND (Addresses.Countryalias = 'Italy') \n";
 
             Assert.That(joinQuery, Is.EqualTo(expected).Or.EqualTo(expectedNq));
+
+            var stmt = OrmLiteConfig.DialectProvider.ToSelectStatement(typeof(User), joinQuery);
+            Assert.That(Regex.Matches(stmt, @"(\b|\n)FROM(\b|\n)", RegexOptions.IgnoreCase).Count, Is.EqualTo(1));
         }
-	}
+    }
 }