Merge branch 'master' of https://github.com/ServiceStack/ServiceStack.OrmLite

Author: mythz

src/ServiceStack.OrmLite/Dapper/DynamicParameters.cs

@@ -450,7 +450,7 @@ public DynamicParameters Output<T>(T target, Expression<Func<T, object>> express
 
             // Queue the preparation to be fired off when adding parameters to the DbCommand
             MAKECALLBACK:
-            (outputCallbacks ?? (outputCallbacks = new List<Action>())).Add(() =>
+            (outputCallbacks ??= new List<Action>()).Add(() =>
             {
                 // Finally, prep the parameter and attach the callback to it
                 var targetMemberType = lastMemberAccess?.Type;

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -615,6 +615,8 @@ protected SqlExpression<T> AppendToEnsure(Expression predicate)
             if (predicate == null)
                 return this;
 
+            Reset();
+
             var newExpr = WhereExpressionToString(Visit(predicate));
             return Ensure(newExpr);
         }
@@ -2589,13 +2591,13 @@ protected object GetFalseExpression()
         private string quotedTrue;
         protected object GetQuotedTrueValue()
         {
-            return new PartialSqlString(quotedTrue ?? (quotedTrue = DialectProvider.GetQuotedValue(true, typeof(bool))));
+            return new PartialSqlString(quotedTrue ??= DialectProvider.GetQuotedValue(true, typeof(bool)));
         }
 
         private string quotedFalse;
         protected object GetQuotedFalseValue()
         {
-            return new PartialSqlString(quotedFalse ?? (quotedFalse =DialectProvider.GetQuotedValue(false, typeof(bool))));
+            return new PartialSqlString(quotedFalse ??= DialectProvider.GetQuotedValue(false, typeof(bool)));
         }
 
         private void BuildSelectExpression(string fields, bool distinct)

src/ServiceStack.OrmLite/ModelDefinition.cs

@@ -282,9 +282,9 @@ public override string ToString()
     public static class ModelDefinition<T>
     {
         private static ModelDefinition definition;
-        public static ModelDefinition Definition => definition ?? (definition = typeof(T).GetModelDefinition());
+        public static ModelDefinition Definition => definition ??= typeof(T).GetModelDefinition();
 
         private static string primaryKeyName;
-        public static string PrimaryKeyName => primaryKeyName ?? (primaryKeyName = Definition.PrimaryKey.FieldName);
+        public static string PrimaryKeyName => primaryKeyName ??= Definition.PrimaryKey.FieldName;
     }
 }

src/ServiceStack.OrmLite/OrmLiteConnection.cs

@@ -27,7 +27,7 @@ public OrmLiteConnection(OrmLiteConnectionFactory factory)
             this.DialectProvider = factory.DialectProvider;
         }
 
-        public IDbConnection DbConnection => dbConnection ?? (dbConnection = ConnectionString.ToDbConnection(Factory.DialectProvider));
+        public IDbConnection DbConnection => dbConnection ??= ConnectionString.ToDbConnection(Factory.DialectProvider);
 
         public void Dispose()
         {

src/ServiceStack.OrmLite/OrmLiteContext.cs

@@ -32,14 +32,8 @@ public class OrmLiteContext
         /// </summary>
         public virtual IDictionary Items
         {
-            get
-            {
-                return GetItems() ?? (CreateItems());
-            }
-            set
-            {
-                CreateItems(value);
-            }
+            get => GetItems() ?? (CreateItems());
+            set => CreateItems(value);
         }
 
         private const string _key = "__OrmLite.Items";
@@ -83,17 +77,17 @@ private IDictionary CreateItems(IDictionary items = null)
             {
                 if (UseThreadStatic)
                 {
-                    ContextItems = items ?? (items = new Dictionary<object, object>());
+                    ContextItems = items ??= new Dictionary<object, object>();
                 }
                 else
                 {
-                    CallContext.LogicalSetData(_key, items ?? (items = new ConcurrentDictionary<object, object>()));
+                    CallContext.LogicalSetData(_key, items ??= new ConcurrentDictionary<object, object>());
                 }
             }
             catch (NotImplementedException)
             {
                 //Fixed in Mono master: https://github.com/mono/mono/pull/817
-                CallContext.SetData(_key, items ?? (items = new ConcurrentDictionary<object, object>()));
+                CallContext.SetData(_key, items ??= new ConcurrentDictionary<object, object>());
             }
 #endif
             return items;
@@ -157,10 +151,7 @@ public static OrmLiteState OrmLiteState
 
                 return null;
             }
-            set
-            {
-                SetItem("OrmLiteState", value);
-            }
+            set => SetItem("OrmLiteState", value);
         }
 
         //Only used when using OrmLite API's against a native IDbConnection (i.e. not from DbFactory) 
@@ -171,7 +162,7 @@ internal static IDbTransaction TSTransaction
                 var state = OrmLiteState;
                 return state?.TSTransaction;
             }
-            set { GetOrCreateState().TSTransaction = value; }
+            set => GetOrCreateState().TSTransaction = value;
         }
     }
 

tests/ServiceStack.OrmLite.SqlServer.Tests/Expressions/ExpressionsTestBase.cs

@@ -18,12 +18,12 @@ public void Setup()
 
         public override IDbConnection OpenDbConnection(string connString = null, IOrmLiteDialectProvider dialectProvider = null)
         {
-            dialectProvider = dialectProvider ?? OrmLiteConfig.DialectProvider;
+            dialectProvider ??= OrmLiteConfig.DialectProvider;
 
             if (db != null && db.State != ConnectionState.Open)
                 db = null;
 
-            return db ?? (db = base.OpenDbConnection(connString, dialectProvider));
+            return db ??= base.OpenDbConnection(connString, dialectProvider);
         }
 
         [TearDown]

tests/ServiceStack.OrmLite.SqlServer.Tests/ReturnAttributeTests.cs

@@ -39,7 +39,7 @@ public class TestsBase
 
         protected string ConnectionString { get; set; }
         protected IOrmLiteDialectProvider DialectProvider { get; set; }
-        protected OrmLiteConnectionFactory DbFactory => dbFactory ?? (dbFactory = new OrmLiteConnectionFactory(ConnectionString, DialectProvider));
+        protected OrmLiteConnectionFactory DbFactory => dbFactory ??= new OrmLiteConnectionFactory(ConnectionString, DialectProvider);
 
         public TestsBase()
         {

tests/ServiceStack.OrmLite.SqliteTests/Issues/BooleanTests.cs

@@ -37,7 +37,6 @@ public async Task Can_create_user_with_BOOLEAN_columns()
         {
             var factory = new OrmLiteConnectionFactory(":memory:", SqliteDialect.Provider);
             using var db = await factory.OpenAsync();
-            OrmLiteUtils.PrintSql();
 
             db.ExecuteSql(@"
 CREATE TABLE IF NOT EXISTS `users` (

tests/ServiceStack.OrmLite.Tests.Setup/TestConfig.cs

@@ -277,7 +277,7 @@ public static string GetConnection(Dialect dialect, int version)
         }
 
         private static Dictionary<Tuple<Dialect, int>, string> dialectConnections;
-        public static Dictionary<Tuple<Dialect,int>, string> DialectConnections => dialectConnections ?? (dialectConnections = LoadDialectConnections());
+        public static Dictionary<Tuple<Dialect,int>, string> DialectConnections => dialectConnections ??= LoadDialectConnections();
 
         private static Dictionary<Tuple<Dialect, int>, string> LoadDialectConnections()
         {

tests/ServiceStack.OrmLite.Tests/EnsureTests.cs

@@ -196,5 +196,22 @@ void assertEnsure(SqlExpression<Rockstar> q)
 
             assertEnsure(q);
         }
+        
+        [Test]
+        public void Ensure_does_use_aliases()
+        {
+            using var db = OpenDbConnection();
+            db.DropAndCreateTable<ModelWithAlias>();
+
+            db.Insert(new ModelWithAlias {
+                IntField = 1,
+            });
+
+            var q = db.From<ModelWithAlias>()
+                .Ensure(x => x.IntField > 0);
+
+            var results = db.Select(q);
+            Assert.That(results.Count, Is.EqualTo(1));
+        }
     }
 }