From a7bc6b99491f76d71e44d5e1270fbe1227030b7a Mon Sep 17 00:00:00 2001
From: Grzegorz Russek <grzegorz.russek@gmail.com>
Date: Fri, 24 May 2024 09:07:51 +0200
Subject: [PATCH] Added ability to set nolock with db.From<Table>(alias,
 nolock);

---
 AmalgamationTool/DynamORM.Amalgamation.cs | 25 +++++++++++++++++++++++
 DynamORM.Tests/Select/ParserTests.cs      | 23 +++++++++++++++++++++
 DynamORM/DynamicDatabase.cs               | 25 +++++++++++++++++++++++
 3 files changed, 73 insertions(+)

diff --git a/AmalgamationTool/DynamORM.Amalgamation.cs b/AmalgamationTool/DynamORM.Amalgamation.cs
index aaefba5..2c6c78a 100644
--- a/AmalgamationTool/DynamORM.Amalgamation.cs
+++ b/AmalgamationTool/DynamORM.Amalgamation.cs
@@ -1932,6 +1932,31 @@ namespace DynamORM
             return new DynamicSelectQueryBuilder(this).From(x => x(typeof(T)).As(alias));
         }
 
+        /// <summary>Adds to the <code>FROM</code> clause using <see cref="Type"/>.</summary>
+        /// <typeparam name="T">Type which can be represented in database.</typeparam>
+        /// <param name="noLock">use no lock.</param>
+        /// <returns>This instance to permit chaining.</returns>
+        public virtual IDynamicSelectQueryBuilder From<T>(bool noLock)
+        {
+            if (noLock)
+                return new DynamicSelectQueryBuilder(this).From(x => x(typeof(T)).NoLock());
+            else
+                return new DynamicSelectQueryBuilder(this).From(x => x(typeof(T)));
+        }
+
+        /// <summary>Adds to the <code>FROM</code> clause using <see cref="Type"/>.</summary>
+        /// <typeparam name="T">Type which can be represented in database.</typeparam>
+        /// <param name="alias">Table alias.</param>
+        /// <param name="noLock">use no lock.</param>
+        /// <returns>This instance to permit chaining.</returns>
+        public virtual IDynamicSelectQueryBuilder From<T>(string alias, bool noLock)
+        {
+            if (noLock)
+                return new DynamicSelectQueryBuilder(this).From(x => x(typeof(T)).As(alias).NoLock());
+            else
+                return new DynamicSelectQueryBuilder(this).From(x => x(typeof(T)).As(alias));
+        }
+
         /// <summary>Adds to the <code>FROM</code> clause using <see cref="Type"/>.</summary>
         /// <param name="t">Type which can be represented in database.</param>
         /// <returns>This instance to permit chaining.</returns>
diff --git a/DynamORM.Tests/Select/ParserTests.cs b/DynamORM.Tests/Select/ParserTests.cs
index f7654de..a8c0f1e 100644
--- a/DynamORM.Tests/Select/ParserTests.cs
+++ b/DynamORM.Tests/Select/ParserTests.cs
@@ -29,6 +29,7 @@
 using System.Linq;
 using DynamORM.Builders;
 using DynamORM.Builders.Implementation;
+using DynamORM.Tests.Helpers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace DynamORM.Tests.Select
@@ -75,6 +76,28 @@ namespace DynamORM.Tests.Select
             Assert.AreEqual("SELECT * FROM \"dbo\".\"Users\"", cmd.CommandText());
         }
 
+        /// <summary>
+        /// Tests from typed method.
+        /// </summary>
+        [TestMethod]
+        public void TestFromGetTyped()
+        {
+            IDynamicSelectQueryBuilder cmd = Database.From<Users>();
+
+            Assert.AreEqual("SELECT * FROM \"users\"", cmd.CommandText());
+        }
+
+        /// <summary>
+        /// Tests from typed method.
+        /// </summary>
+        [TestMethod]
+        public void TestFromGetTypedAs()
+        {
+            IDynamicSelectQueryBuilder cmd = Database.From<Users>("u");
+
+            Assert.AreEqual("SELECT * FROM \"users\" AS u", cmd.CommandText());
+        }
+
         /// <summary>
         /// Tests from method with multi tables.
         /// </summary>
diff --git a/DynamORM/DynamicDatabase.cs b/DynamORM/DynamicDatabase.cs
index 639bc92..95bbfe5 100644
--- a/DynamORM/DynamicDatabase.cs
+++ b/DynamORM/DynamicDatabase.cs
@@ -381,6 +381,31 @@ namespace DynamORM
             return new DynamicSelectQueryBuilder(this).From(x => x(typeof(T)).As(alias));
         }
 
+        /// <summary>Adds to the <code>FROM</code> clause using <see cref="Type"/>.</summary>
+        /// <typeparam name="T">Type which can be represented in database.</typeparam>
+        /// <param name="noLock">use no lock.</param>
+        /// <returns>This instance to permit chaining.</returns>
+        public virtual IDynamicSelectQueryBuilder From<T>(bool noLock)
+        {
+            if (noLock)
+                return new DynamicSelectQueryBuilder(this).From(x => x(typeof(T)).NoLock());
+            else
+                return new DynamicSelectQueryBuilder(this).From(x => x(typeof(T)));
+        }
+
+        /// <summary>Adds to the <code>FROM</code> clause using <see cref="Type"/>.</summary>
+        /// <typeparam name="T">Type which can be represented in database.</typeparam>
+        /// <param name="alias">Table alias.</param>
+        /// <param name="noLock">use no lock.</param>
+        /// <returns>This instance to permit chaining.</returns>
+        public virtual IDynamicSelectQueryBuilder From<T>(string alias, bool noLock)
+        {
+            if (noLock)
+                return new DynamicSelectQueryBuilder(this).From(x => x(typeof(T)).As(alias).NoLock());
+            else
+                return new DynamicSelectQueryBuilder(this).From(x => x(typeof(T)).As(alias));
+        }
+
         /// <summary>Adds to the <code>FROM</code> clause using <see cref="Type"/>.</summary>
         /// <param name="t">Type which can be represented in database.</param>
         /// <returns>This instance to permit chaining.</returns>