From cf7a14a7d058c09f53147c8e01469e60014cd7f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Geelen?= Date: Fri, 18 Jun 2021 16:21:21 +0200 Subject: [PATCH 1/7] Ensure all files have consistent BOM markers. --- Program/Program.cs | 2 +- QueryBuilder.Tests/AggregateTests.cs | 2 +- QueryBuilder.Tests/DefineTest.cs | 2 +- QueryBuilder.Tests/ExecutionTests.cs | 2 +- QueryBuilder.Tests/Infrastructure/TestCompilersContainer.cs | 2 +- QueryBuilder.Tests/Infrastructure/TestSqlResultContainer.cs | 2 +- QueryBuilder.Tests/Infrastructure/TestSupport.cs | 2 +- QueryBuilder.Tests/InfrastructureTests.cs | 2 +- QueryBuilder.Tests/InsertTests.cs | 2 +- QueryBuilder.Tests/OperatorWhitelistTests.cs | 2 +- QueryBuilder.Tests/Oracle/OracleDateConditionTests.cs | 2 +- QueryBuilder.Tests/Oracle/OracleLegacyLimitTests.cs | 2 +- QueryBuilder.Tests/Oracle/OracleLimitTests.cs | 2 +- QueryBuilder.Tests/QueryBuilder.Tests.csproj | 2 +- QueryBuilder.Tests/SelectTests.cs | 2 +- QueryBuilder.Tests/SqlServer/NestedSelectTests.cs | 2 +- QueryBuilder.Tests/SqlServer/SqlServerTests.cs | 2 +- QueryBuilder.Tests/UpdateTests.cs | 2 +- QueryBuilder/ColumnAttribute.cs | 2 +- QueryBuilder/Compilers/EngineCodes.cs | 2 +- QueryBuilder/Compilers/OracleCompiler.cs | 2 +- QueryBuilder/Extensions/QueryForExtensions.cs | 2 +- QueryBuilder/IgnoreAttribute.cs | 2 +- QueryBuilder/Properties/AssemblyInfo.cs | 2 +- QueryBuilder/Query.cs | 2 +- QueryBuilder/QueryBuilder.csproj | 2 +- SqlKata.Execution/SqlKata.Execution.csproj | 2 +- SqlKata.Execution/XQuery.cs | 2 +- sqlkata.sln | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Program/Program.cs b/Program/Program.cs index 7ed6ba40..38d59f4d 100644 --- a/Program/Program.cs +++ b/Program/Program.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using SqlKata; using SqlKata.Compilers; diff --git a/QueryBuilder.Tests/AggregateTests.cs b/QueryBuilder.Tests/AggregateTests.cs index 8c12c819..68a69842 100644 --- a/QueryBuilder.Tests/AggregateTests.cs +++ b/QueryBuilder.Tests/AggregateTests.cs @@ -1,4 +1,4 @@ -using SqlKata.Compilers; +using SqlKata.Compilers; using SqlKata.Tests.Infrastructure; using Xunit; diff --git a/QueryBuilder.Tests/DefineTest.cs b/QueryBuilder.Tests/DefineTest.cs index a68af920..0b5ff292 100644 --- a/QueryBuilder.Tests/DefineTest.cs +++ b/QueryBuilder.Tests/DefineTest.cs @@ -1,4 +1,4 @@ -using static SqlKata.Expressions; +using static SqlKata.Expressions; using SqlKata.Compilers; using SqlKata.Tests.Infrastructure; using Xunit; diff --git a/QueryBuilder.Tests/ExecutionTests.cs b/QueryBuilder.Tests/ExecutionTests.cs index f67c4a57..894ca193 100644 --- a/QueryBuilder.Tests/ExecutionTests.cs +++ b/QueryBuilder.Tests/ExecutionTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using SqlKata.Execution; using Xunit; diff --git a/QueryBuilder.Tests/Infrastructure/TestCompilersContainer.cs b/QueryBuilder.Tests/Infrastructure/TestCompilersContainer.cs index 58fe6c28..4f57501f 100644 --- a/QueryBuilder.Tests/Infrastructure/TestCompilersContainer.cs +++ b/QueryBuilder.Tests/Infrastructure/TestCompilersContainer.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using SqlKata.Compilers; diff --git a/QueryBuilder.Tests/Infrastructure/TestSqlResultContainer.cs b/QueryBuilder.Tests/Infrastructure/TestSqlResultContainer.cs index 2efbd1c9..fd40ba83 100644 --- a/QueryBuilder.Tests/Infrastructure/TestSqlResultContainer.cs +++ b/QueryBuilder.Tests/Infrastructure/TestSqlResultContainer.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Collections.ObjectModel; namespace SqlKata.Tests.Infrastructure diff --git a/QueryBuilder.Tests/Infrastructure/TestSupport.cs b/QueryBuilder.Tests/Infrastructure/TestSupport.cs index d701de58..9559ebe1 100644 --- a/QueryBuilder.Tests/Infrastructure/TestSupport.cs +++ b/QueryBuilder.Tests/Infrastructure/TestSupport.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; namespace SqlKata.Tests.Infrastructure diff --git a/QueryBuilder.Tests/InfrastructureTests.cs b/QueryBuilder.Tests/InfrastructureTests.cs index 3085e061..d2a0480a 100644 --- a/QueryBuilder.Tests/InfrastructureTests.cs +++ b/QueryBuilder.Tests/InfrastructureTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using SqlKata.Compilers; using SqlKata.Tests.Infrastructure; diff --git a/QueryBuilder.Tests/InsertTests.cs b/QueryBuilder.Tests/InsertTests.cs index 10aad0e0..a8676052 100644 --- a/QueryBuilder.Tests/InsertTests.cs +++ b/QueryBuilder.Tests/InsertTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Dynamic; diff --git a/QueryBuilder.Tests/OperatorWhitelistTests.cs b/QueryBuilder.Tests/OperatorWhitelistTests.cs index 0381a061..b56b9521 100644 --- a/QueryBuilder.Tests/OperatorWhitelistTests.cs +++ b/QueryBuilder.Tests/OperatorWhitelistTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using SqlKata.Compilers; using Xunit; diff --git a/QueryBuilder.Tests/Oracle/OracleDateConditionTests.cs b/QueryBuilder.Tests/Oracle/OracleDateConditionTests.cs index 6c89d57a..6407f5ca 100644 --- a/QueryBuilder.Tests/Oracle/OracleDateConditionTests.cs +++ b/QueryBuilder.Tests/Oracle/OracleDateConditionTests.cs @@ -1,4 +1,4 @@ -using SqlKata.Compilers; +using SqlKata.Compilers; using SqlKata.Tests.Infrastructure; using Xunit; diff --git a/QueryBuilder.Tests/Oracle/OracleLegacyLimitTests.cs b/QueryBuilder.Tests/Oracle/OracleLegacyLimitTests.cs index 6f19735a..500103ba 100644 --- a/QueryBuilder.Tests/Oracle/OracleLegacyLimitTests.cs +++ b/QueryBuilder.Tests/Oracle/OracleLegacyLimitTests.cs @@ -1,4 +1,4 @@ -using SqlKata.Compilers; +using SqlKata.Compilers; using SqlKata.Tests.Infrastructure; using Xunit; diff --git a/QueryBuilder.Tests/Oracle/OracleLimitTests.cs b/QueryBuilder.Tests/Oracle/OracleLimitTests.cs index d6a5991e..bd05a03c 100644 --- a/QueryBuilder.Tests/Oracle/OracleLimitTests.cs +++ b/QueryBuilder.Tests/Oracle/OracleLimitTests.cs @@ -1,4 +1,4 @@ -using SqlKata.Compilers; +using SqlKata.Compilers; using SqlKata.Tests.Infrastructure; using Xunit; diff --git a/QueryBuilder.Tests/QueryBuilder.Tests.csproj b/QueryBuilder.Tests/QueryBuilder.Tests.csproj index 9a988405..775844ea 100755 --- a/QueryBuilder.Tests/QueryBuilder.Tests.csproj +++ b/QueryBuilder.Tests/QueryBuilder.Tests.csproj @@ -1,4 +1,4 @@ - + net5.0 Library diff --git a/QueryBuilder.Tests/SelectTests.cs b/QueryBuilder.Tests/SelectTests.cs index 1b5b3133..d327eb95 100644 --- a/QueryBuilder.Tests/SelectTests.cs +++ b/QueryBuilder.Tests/SelectTests.cs @@ -1,4 +1,4 @@ -using SqlKata.Compilers; +using SqlKata.Compilers; using SqlKata.Extensions; using SqlKata.Tests.Infrastructure; using System; diff --git a/QueryBuilder.Tests/SqlServer/NestedSelectTests.cs b/QueryBuilder.Tests/SqlServer/NestedSelectTests.cs index 9495751d..8a257e8c 100644 --- a/QueryBuilder.Tests/SqlServer/NestedSelectTests.cs +++ b/QueryBuilder.Tests/SqlServer/NestedSelectTests.cs @@ -1,4 +1,4 @@ -using SqlKata.Compilers; +using SqlKata.Compilers; using SqlKata.Tests.Infrastructure; using Xunit; diff --git a/QueryBuilder.Tests/SqlServer/SqlServerTests.cs b/QueryBuilder.Tests/SqlServer/SqlServerTests.cs index 56862547..5ac08e7c 100644 --- a/QueryBuilder.Tests/SqlServer/SqlServerTests.cs +++ b/QueryBuilder.Tests/SqlServer/SqlServerTests.cs @@ -1,4 +1,4 @@ -using SqlKata.Compilers; +using SqlKata.Compilers; using SqlKata.Tests.Infrastructure; using Xunit; diff --git a/QueryBuilder.Tests/UpdateTests.cs b/QueryBuilder.Tests/UpdateTests.cs index 994feddc..ecc36b5b 100644 --- a/QueryBuilder.Tests/UpdateTests.cs +++ b/QueryBuilder.Tests/UpdateTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Dynamic; diff --git a/QueryBuilder/ColumnAttribute.cs b/QueryBuilder/ColumnAttribute.cs index 9c3af6b7..35e96343 100644 --- a/QueryBuilder/ColumnAttribute.cs +++ b/QueryBuilder/ColumnAttribute.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SqlKata { diff --git a/QueryBuilder/Compilers/EngineCodes.cs b/QueryBuilder/Compilers/EngineCodes.cs index cb898b4c..9405f7f5 100644 --- a/QueryBuilder/Compilers/EngineCodes.cs +++ b/QueryBuilder/Compilers/EngineCodes.cs @@ -1,4 +1,4 @@ -namespace SqlKata.Compilers +namespace SqlKata.Compilers { public static class EngineCodes { diff --git a/QueryBuilder/Compilers/OracleCompiler.cs b/QueryBuilder/Compilers/OracleCompiler.cs index f9f95bf2..3fedf8d7 100644 --- a/QueryBuilder/Compilers/OracleCompiler.cs +++ b/QueryBuilder/Compilers/OracleCompiler.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; diff --git a/QueryBuilder/Extensions/QueryForExtensions.cs b/QueryBuilder/Extensions/QueryForExtensions.cs index cde10dca..08262624 100644 --- a/QueryBuilder/Extensions/QueryForExtensions.cs +++ b/QueryBuilder/Extensions/QueryForExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using SqlKata.Compilers; namespace SqlKata.Extensions diff --git a/QueryBuilder/IgnoreAttribute.cs b/QueryBuilder/IgnoreAttribute.cs index 57e08476..4174d106 100644 --- a/QueryBuilder/IgnoreAttribute.cs +++ b/QueryBuilder/IgnoreAttribute.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SqlKata { diff --git a/QueryBuilder/Properties/AssemblyInfo.cs b/QueryBuilder/Properties/AssemblyInfo.cs index 5e161ab1..d818ff75 100644 --- a/QueryBuilder/Properties/AssemblyInfo.cs +++ b/QueryBuilder/Properties/AssemblyInfo.cs @@ -1,3 +1,3 @@ -using System.Runtime.CompilerServices; +using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("QueryBuilder.Tests")] \ No newline at end of file diff --git a/QueryBuilder/Query.cs b/QueryBuilder/Query.cs index 1021242f..b9264b60 100755 --- a/QueryBuilder/Query.cs +++ b/QueryBuilder/Query.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; diff --git a/QueryBuilder/QueryBuilder.csproj b/QueryBuilder/QueryBuilder.csproj index a56fc647..ffcce676 100755 --- a/QueryBuilder/QueryBuilder.csproj +++ b/QueryBuilder/QueryBuilder.csproj @@ -1,4 +1,4 @@ - + SqlKata The C# Sql Query Builder diff --git a/SqlKata.Execution/SqlKata.Execution.csproj b/SqlKata.Execution/SqlKata.Execution.csproj index bb9a0a80..41c3dba2 100644 --- a/SqlKata.Execution/SqlKata.Execution.csproj +++ b/SqlKata.Execution/SqlKata.Execution.csproj @@ -1,4 +1,4 @@ - + SqlKata The C# Sql Query Builder Adds the execution capabilities for SqlKata diff --git a/SqlKata.Execution/XQuery.cs b/SqlKata.Execution/XQuery.cs index 55c58f85..9d771eaa 100644 --- a/SqlKata.Execution/XQuery.cs +++ b/SqlKata.Execution/XQuery.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Data; using System.Linq; using SqlKata.Compilers; diff --git a/sqlkata.sln b/sqlkata.sln index c6c05b67..af806183 100644 --- a/sqlkata.sln +++ b/sqlkata.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26124.0 From e72b97bed6ec8a83f8f6e42bd0d9e13837be5d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Geelen?= Date: Fri, 18 Jun 2021 16:21:39 +0200 Subject: [PATCH 2/7] Ensure all files have consistent line-endings. --- Program/Program.cs | 228 ++++++++++++++++++------------------ SqlKata.Execution/XQuery.cs | 84 ++++++------- sqlkata.sln | 158 ++++++++++++------------- 3 files changed, 235 insertions(+), 235 deletions(-) diff --git a/Program/Program.cs b/Program/Program.cs index 38d59f4d..9b4c2845 100644 --- a/Program/Program.cs +++ b/Program/Program.cs @@ -1,114 +1,114 @@ -using System; -using System.Collections.Generic; -using SqlKata; -using SqlKata.Compilers; -using SqlKata.Execution; -using System.Data.SqlClient; -using System.Threading.Tasks; -using System.Linq; -using Newtonsoft.Json; -using Npgsql; -using System.Data; -using Dapper; -using System.Data.SQLite; -using static SqlKata.Expressions; -using System.IO; - -namespace Program -{ - class Program - { - private class Loan - { - public string Id { get; set; } - public string Name { get; set; } - public List Installments { get; set; } = new List(); - } - - private class Installment - { - public string Id { get; set; } - public string LoanId { get; set; } - public int DaysCount { get; set; } - } - - static void Main(string[] args) - { - using (var db = SqlLiteQueryFactory()) - { - var query = db.Query("accounts") - .Where("balance", ">", 0) - .GroupBy("balance") - .Limit(10); - - var accounts = query.Clone().Get(); - Console.WriteLine(JsonConvert.SerializeObject(accounts, Formatting.Indented)); - - var exists = query.Clone().Exists(); - Console.WriteLine(exists); - } - } - - private static void log(Compiler compiler, Query query) - { - var compiled = compiler.Compile(query); - Console.WriteLine(compiled.ToString()); - Console.WriteLine(JsonConvert.SerializeObject(compiled.Bindings)); - } - - private static QueryFactory SqlLiteQueryFactory() - { - var compiler = new SqliteCompiler(); - - var connection = new SQLiteConnection("Data Source=Demo.db"); - - var db = new QueryFactory(connection, compiler); - - db.Logger = result => - { - Console.WriteLine(result.ToString()); - }; - - if (!File.Exists("Demo.db")) - { - Console.WriteLine("db not exists creating db"); - - SQLiteConnection.CreateFile("Demo.db"); - - db.Statement("create table accounts(id integer primary key autoincrement, name varchar, currency_id varchar, balance decimal, created_at datetime);"); - for (var i = 0; i < 10; i++) - { - db.Statement("insert into accounts(name, currency_id, balance, created_at) values(@name, @currency, @balance, @date)", new - { - name = $"Account {i}", - currency = "USD", - balance = 100 * i * 1.1, - date = DateTime.UtcNow, - }); - } - - } - - return db; - - } - - private static QueryFactory SqlServerQueryFactory() - { - var compiler = new PostgresCompiler(); - var connection = new SqlConnection( - "Server=tcp:localhost,1433;Initial Catalog=Lite;User ID=sa;Password=P@ssw0rd" - ); - - var db = new QueryFactory(connection, compiler); - - db.Logger = result => - { - Console.WriteLine(result.ToString()); - }; - - return db; - } - - } -} +using System; +using System.Collections.Generic; +using SqlKata; +using SqlKata.Compilers; +using SqlKata.Execution; +using System.Data.SqlClient; +using System.Threading.Tasks; +using System.Linq; +using Newtonsoft.Json; +using Npgsql; +using System.Data; +using Dapper; +using System.Data.SQLite; +using static SqlKata.Expressions; +using System.IO; + +namespace Program +{ + class Program + { + private class Loan + { + public string Id { get; set; } + public string Name { get; set; } + public List Installments { get; set; } = new List(); + } + + private class Installment + { + public string Id { get; set; } + public string LoanId { get; set; } + public int DaysCount { get; set; } + } + + static void Main(string[] args) + { + using (var db = SqlLiteQueryFactory()) + { + var query = db.Query("accounts") + .Where("balance", ">", 0) + .GroupBy("balance") + .Limit(10); + + var accounts = query.Clone().Get(); + Console.WriteLine(JsonConvert.SerializeObject(accounts, Formatting.Indented)); + + var exists = query.Clone().Exists(); + Console.WriteLine(exists); + } + } + + private static void log(Compiler compiler, Query query) + { + var compiled = compiler.Compile(query); + Console.WriteLine(compiled.ToString()); + Console.WriteLine(JsonConvert.SerializeObject(compiled.Bindings)); + } + + private static QueryFactory SqlLiteQueryFactory() + { + var compiler = new SqliteCompiler(); + + var connection = new SQLiteConnection("Data Source=Demo.db"); + + var db = new QueryFactory(connection, compiler); + + db.Logger = result => + { + Console.WriteLine(result.ToString()); + }; + + if (!File.Exists("Demo.db")) + { + Console.WriteLine("db not exists creating db"); + + SQLiteConnection.CreateFile("Demo.db"); + + db.Statement("create table accounts(id integer primary key autoincrement, name varchar, currency_id varchar, balance decimal, created_at datetime);"); + for (var i = 0; i < 10; i++) + { + db.Statement("insert into accounts(name, currency_id, balance, created_at) values(@name, @currency, @balance, @date)", new + { + name = $"Account {i}", + currency = "USD", + balance = 100 * i * 1.1, + date = DateTime.UtcNow, + }); + } + + } + + return db; + + } + + private static QueryFactory SqlServerQueryFactory() + { + var compiler = new PostgresCompiler(); + var connection = new SqlConnection( + "Server=tcp:localhost,1433;Initial Catalog=Lite;User ID=sa;Password=P@ssw0rd" + ); + + var db = new QueryFactory(connection, compiler); + + db.Logger = result => + { + Console.WriteLine(result.ToString()); + }; + + return db; + } + + } +} diff --git a/SqlKata.Execution/XQuery.cs b/SqlKata.Execution/XQuery.cs index 9d771eaa..b9265fd9 100644 --- a/SqlKata.Execution/XQuery.cs +++ b/SqlKata.Execution/XQuery.cs @@ -1,42 +1,42 @@ -using System; -using System.Data; -using System.Linq; -using SqlKata.Compilers; - -namespace SqlKata.Execution -{ - public class XQuery : Query - { - public IDbConnection Connection { get; set; } - public Compiler Compiler { get; set; } - public Action Logger = result => { }; - public QueryFactory QueryFactory { get; set; } - - public XQuery(IDbConnection connection, Compiler compiler) - { - this.Connection = connection; - this.Compiler = compiler; - } - - public override Query Clone() - { - - var query = new XQuery(this.Connection, this.Compiler); - - query.Clauses = this.Clauses.Select(x => x.Clone()).ToList(); - query.Logger = this.Logger; - - query.QueryAlias = QueryAlias; - query.IsDistinct = IsDistinct; - query.Method = Method; - query.Includes = Includes; - query.Variables = Variables; - - query.SetEngineScope(EngineScope); - - return query; - } - - } - -} +using System; +using System.Data; +using System.Linq; +using SqlKata.Compilers; + +namespace SqlKata.Execution +{ + public class XQuery : Query + { + public IDbConnection Connection { get; set; } + public Compiler Compiler { get; set; } + public Action Logger = result => { }; + public QueryFactory QueryFactory { get; set; } + + public XQuery(IDbConnection connection, Compiler compiler) + { + this.Connection = connection; + this.Compiler = compiler; + } + + public override Query Clone() + { + + var query = new XQuery(this.Connection, this.Compiler); + + query.Clauses = this.Clauses.Select(x => x.Clone()).ToList(); + query.Logger = this.Logger; + + query.QueryAlias = QueryAlias; + query.IsDistinct = IsDistinct; + query.Method = Method; + query.Includes = Includes; + query.Variables = Variables; + + query.SetEngineScope(EngineScope); + + return query; + } + + } + +} diff --git a/sqlkata.sln b/sqlkata.sln index af806183..32820701 100644 --- a/sqlkata.sln +++ b/sqlkata.sln @@ -1,79 +1,79 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QueryBuilder", "QueryBuilder\QueryBuilder.csproj", "{2D0657E1-7046-4B45-BAF3-90291BD74E0B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QueryBuilder.Tests", "QueryBuilder.Tests\QueryBuilder.Tests.csproj", "{61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlKata.Execution", "SqlKata.Execution\SqlKata.Execution.csproj", "{B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Program", "Program\Program.csproj", "{5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Debug|x64.ActiveCfg = Debug|Any CPU - {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Debug|x64.Build.0 = Debug|Any CPU - {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Debug|x86.ActiveCfg = Debug|Any CPU - {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Debug|x86.Build.0 = Debug|Any CPU - {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Release|Any CPU.Build.0 = Release|Any CPU - {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Release|x64.ActiveCfg = Release|Any CPU - {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Release|x64.Build.0 = Release|Any CPU - {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Release|x86.ActiveCfg = Release|Any CPU - {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Release|x86.Build.0 = Release|Any CPU - {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Debug|x64.ActiveCfg = Debug|Any CPU - {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Debug|x64.Build.0 = Debug|Any CPU - {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Debug|x86.ActiveCfg = Debug|Any CPU - {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Debug|x86.Build.0 = Debug|Any CPU - {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Release|Any CPU.Build.0 = Release|Any CPU - {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Release|x64.ActiveCfg = Release|Any CPU - {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Release|x64.Build.0 = Release|Any CPU - {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Release|x86.ActiveCfg = Release|Any CPU - {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Release|x86.Build.0 = Release|Any CPU - {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Debug|x64.ActiveCfg = Debug|Any CPU - {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Debug|x64.Build.0 = Debug|Any CPU - {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Debug|x86.ActiveCfg = Debug|Any CPU - {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Debug|x86.Build.0 = Debug|Any CPU - {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Release|Any CPU.Build.0 = Release|Any CPU - {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Release|x64.ActiveCfg = Release|Any CPU - {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Release|x64.Build.0 = Release|Any CPU - {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Release|x86.ActiveCfg = Release|Any CPU - {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Release|x86.Build.0 = Release|Any CPU - {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|x64.ActiveCfg = Debug|Any CPU - {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|x64.Build.0 = Debug|Any CPU - {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|x86.ActiveCfg = Debug|Any CPU - {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|x86.Build.0 = Debug|Any CPU - {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|Any CPU.Build.0 = Release|Any CPU - {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|x64.ActiveCfg = Release|Any CPU - {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|x64.Build.0 = Release|Any CPU - {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|x86.ActiveCfg = Release|Any CPU - {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {8FFC834B-6CAA-409C-8E6A-43D4FB187669} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QueryBuilder", "QueryBuilder\QueryBuilder.csproj", "{2D0657E1-7046-4B45-BAF3-90291BD74E0B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QueryBuilder.Tests", "QueryBuilder.Tests\QueryBuilder.Tests.csproj", "{61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlKata.Execution", "SqlKata.Execution\SqlKata.Execution.csproj", "{B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Program", "Program\Program.csproj", "{5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Debug|x64.ActiveCfg = Debug|Any CPU + {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Debug|x64.Build.0 = Debug|Any CPU + {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Debug|x86.ActiveCfg = Debug|Any CPU + {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Debug|x86.Build.0 = Debug|Any CPU + {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Release|Any CPU.Build.0 = Release|Any CPU + {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Release|x64.ActiveCfg = Release|Any CPU + {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Release|x64.Build.0 = Release|Any CPU + {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Release|x86.ActiveCfg = Release|Any CPU + {2D0657E1-7046-4B45-BAF3-90291BD74E0B}.Release|x86.Build.0 = Release|Any CPU + {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Debug|Any CPU.Build.0 = Debug|Any CPU + {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Debug|x64.ActiveCfg = Debug|Any CPU + {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Debug|x64.Build.0 = Debug|Any CPU + {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Debug|x86.ActiveCfg = Debug|Any CPU + {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Debug|x86.Build.0 = Debug|Any CPU + {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Release|Any CPU.ActiveCfg = Release|Any CPU + {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Release|Any CPU.Build.0 = Release|Any CPU + {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Release|x64.ActiveCfg = Release|Any CPU + {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Release|x64.Build.0 = Release|Any CPU + {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Release|x86.ActiveCfg = Release|Any CPU + {61B3CBF1-7471-4F7B-B4AE-8D7F1E124371}.Release|x86.Build.0 = Release|Any CPU + {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Debug|x64.ActiveCfg = Debug|Any CPU + {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Debug|x64.Build.0 = Debug|Any CPU + {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Debug|x86.ActiveCfg = Debug|Any CPU + {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Debug|x86.Build.0 = Debug|Any CPU + {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Release|Any CPU.Build.0 = Release|Any CPU + {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Release|x64.ActiveCfg = Release|Any CPU + {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Release|x64.Build.0 = Release|Any CPU + {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Release|x86.ActiveCfg = Release|Any CPU + {B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Release|x86.Build.0 = Release|Any CPU + {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|x64.ActiveCfg = Debug|Any CPU + {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|x64.Build.0 = Debug|Any CPU + {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|x86.ActiveCfg = Debug|Any CPU + {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|x86.Build.0 = Debug|Any CPU + {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|Any CPU.Build.0 = Release|Any CPU + {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|x64.ActiveCfg = Release|Any CPU + {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|x64.Build.0 = Release|Any CPU + {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|x86.ActiveCfg = Release|Any CPU + {5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {8FFC834B-6CAA-409C-8E6A-43D4FB187669} + EndGlobalSection +EndGlobal From 1b3545c4bef204275115bdd9b291c9726597d5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Geelen?= Date: Wed, 5 May 2021 09:55:24 +0200 Subject: [PATCH 3/7] Add .editorconfig to help maintain line endings. --- .editorconfig | 5 +++++ sqlkata.sln | 5 +++++ 2 files changed, 10 insertions(+) create mode 100755 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100755 index 00000000..87f877b2 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,5 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf diff --git a/sqlkata.sln b/sqlkata.sln index 32820701..957e67a0 100644 --- a/sqlkata.sln +++ b/sqlkata.sln @@ -11,6 +11,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlKata.Execution", "SqlKat EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Program", "Program\Program.csproj", "{5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{86D00525-7428-4DD7-914D-0A10D5C53EDE}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU From 8e1d961f0e8b3695817c9696e465fb9d7baa03f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Geelen?= Date: Wed, 5 May 2021 09:39:32 +0200 Subject: [PATCH 4/7] Ensure new-lines-before-eof are present. --- .github/workflows/build.yml | 2 +- .vscode/launch.json | 2 +- .vscode/tasks.json | 2 +- QueryBuilder.Tests/ExecutionTests.cs | 2 +- QueryBuilder.Tests/Firebird/FirebirdLimitTests.cs | 2 +- QueryBuilder.Tests/HelperTests.cs | 2 +- QueryBuilder.Tests/Infrastructure/TestCompiler.cs | 2 +- QueryBuilder.Tests/Infrastructure/TestCompilersContainer.cs | 2 +- QueryBuilder.Tests/Infrastructure/TestSqlResultContainer.cs | 2 +- QueryBuilder.Tests/Infrastructure/TestSupport.cs | 2 +- QueryBuilder.Tests/InfrastructureTests.cs | 2 +- QueryBuilder.Tests/InsertTests.cs | 2 +- QueryBuilder.Tests/MySql/MySqlLimitTests.cs | 2 +- QueryBuilder.Tests/OperatorWhitelistTests.cs | 2 +- QueryBuilder.Tests/Oracle/OracleLegacyLimitTests.cs | 2 +- QueryBuilder.Tests/Oracle/OracleLimitTests.cs | 2 +- QueryBuilder.Tests/ParameterTypeTests.cs | 2 +- QueryBuilder.Tests/PostgreSql/PostgreSqlLimitTests.cs | 2 +- QueryBuilder.Tests/SqlServer/NestedSelectTests.cs | 2 +- QueryBuilder.Tests/SqlServer/SqlServerLegacyLimitTests.cs | 2 +- QueryBuilder.Tests/SqlServer/SqlServerLimitTests.cs | 2 +- QueryBuilder.Tests/SqlServer/SqlServerTests.cs | 2 +- QueryBuilder.Tests/Sqlite/SqliteLimitTests.cs | 2 +- QueryBuilder.Tests/UpdateTests.cs | 2 +- QueryBuilder/BaseQuery.cs | 2 +- QueryBuilder/Clauses/AbstractClause.cs | 2 +- QueryBuilder/Clauses/AggregateClause.cs | 2 +- QueryBuilder/Clauses/ColumnClause.cs | 2 +- QueryBuilder/Clauses/Combine.cs | 2 +- QueryBuilder/Clauses/ConditionClause.cs | 2 +- QueryBuilder/Clauses/FromClause.cs | 2 +- QueryBuilder/Clauses/InsertClause.cs | 2 +- QueryBuilder/Clauses/JoinClause.cs | 2 +- QueryBuilder/Clauses/LimitClause.cs | 2 +- QueryBuilder/Clauses/OffsetClause.cs | 2 +- QueryBuilder/Clauses/OrderClause.cs | 2 +- QueryBuilder/Compilers/ConditionsCompilerProvider.cs | 2 +- QueryBuilder/Compilers/MySqlCompiler.cs | 2 +- QueryBuilder/Expressions.cs | 2 +- QueryBuilder/Extensions/QueryForExtensions.cs | 2 +- QueryBuilder/Helper.cs | 2 +- QueryBuilder/Include.cs | 2 +- QueryBuilder/Join.cs | 2 +- QueryBuilder/Properties/AssemblyInfo.cs | 2 +- QueryBuilder/Query.Aggregate.cs | 2 +- QueryBuilder/Query.Combine.cs | 2 +- QueryBuilder/Query.Delete.cs | 2 +- QueryBuilder/Query.Having.cs | 2 +- QueryBuilder/Query.Join.cs | 2 +- QueryBuilder/Query.Select.cs | 2 +- QueryBuilder/SqlResult.cs | 2 +- QueryBuilder/UnsafeLiteral.cs | 2 +- QueryBuilder/Variable.cs | 2 +- SqlKata.Execution/InsertGetId.cs | 2 +- SqlKata.Execution/PaginationIterator.cs | 2 +- SqlKata.Execution/PaginationResult.cs | 2 +- SqlKata.Execution/Query.Extensions.cs | 2 +- SqlKata.Execution/QueryFactory.cs | 2 +- 58 files changed, 58 insertions(+), 58 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7ba9fdb9..485e7079 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -112,4 +112,4 @@ jobs: - name: Push to GitHub Feed run: dotnet nuget push ./nupkg/*.nupkg --skip-duplicate --source $GITHUB_FEED --api-key $GITHUB_TOKEN - name: Push to NuGet Feed - run: dotnet nuget push ./nupkg/*.nupkg --skip-duplicate --source $NUGET_FEED --api-key $NUGET_KEY \ No newline at end of file + run: dotnet nuget push ./nupkg/*.nupkg --skip-duplicate --source $NUGET_FEED --api-key $NUGET_KEY diff --git a/.vscode/launch.json b/.vscode/launch.json index 3f3e6ff4..0770d69f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -25,4 +25,4 @@ "processId": "${command:pickProcess}" } ,] -} \ No newline at end of file +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 09e616d6..14c8f5ab 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -12,4 +12,4 @@ "problemMatcher": "$msCompile" } ] -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/ExecutionTests.cs b/QueryBuilder.Tests/ExecutionTests.cs index 894ca193..7bcea9fc 100644 --- a/QueryBuilder.Tests/ExecutionTests.cs +++ b/QueryBuilder.Tests/ExecutionTests.cs @@ -15,4 +15,4 @@ public void ShouldThrowException() }); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/Firebird/FirebirdLimitTests.cs b/QueryBuilder.Tests/Firebird/FirebirdLimitTests.cs index 2e202e43..5eda1d97 100644 --- a/QueryBuilder.Tests/Firebird/FirebirdLimitTests.cs +++ b/QueryBuilder.Tests/Firebird/FirebirdLimitTests.cs @@ -52,4 +52,4 @@ public void LimitAndOffset() Assert.Equal(2, ctx.Bindings.Count); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/HelperTests.cs b/QueryBuilder.Tests/HelperTests.cs index bbc31108..11a9fd4e 100644 --- a/QueryBuilder.Tests/HelperTests.cs +++ b/QueryBuilder.Tests/HelperTests.cs @@ -234,4 +234,4 @@ public void WrapIdentifiers(string input, string escapeCharacter, string identif Assert.Equal(expected, result); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/Infrastructure/TestCompiler.cs b/QueryBuilder.Tests/Infrastructure/TestCompiler.cs index acec3c2f..2f5a845e 100644 --- a/QueryBuilder.Tests/Infrastructure/TestCompiler.cs +++ b/QueryBuilder.Tests/Infrastructure/TestCompiler.cs @@ -48,4 +48,4 @@ public virtual MethodInfo Call_FindCompilerMethodInfo(Type clauseType, string me return FindCompilerMethodInfo(clauseType, methodName); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/Infrastructure/TestCompilersContainer.cs b/QueryBuilder.Tests/Infrastructure/TestCompilersContainer.cs index 4f57501f..4639ee7e 100644 --- a/QueryBuilder.Tests/Infrastructure/TestCompilersContainer.cs +++ b/QueryBuilder.Tests/Infrastructure/TestCompilersContainer.cs @@ -103,4 +103,4 @@ public TestSqlResultContainer Compile(Query query) return new TestSqlResultContainer(resultKeyValues); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/Infrastructure/TestSqlResultContainer.cs b/QueryBuilder.Tests/Infrastructure/TestSqlResultContainer.cs index fd40ba83..16a5eeff 100644 --- a/QueryBuilder.Tests/Infrastructure/TestSqlResultContainer.cs +++ b/QueryBuilder.Tests/Infrastructure/TestSqlResultContainer.cs @@ -10,4 +10,4 @@ public TestSqlResultContainer(IDictionary dictionary) : base( } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/Infrastructure/TestSupport.cs b/QueryBuilder.Tests/Infrastructure/TestSupport.cs index 9559ebe1..78d912cc 100644 --- a/QueryBuilder.Tests/Infrastructure/TestSupport.cs +++ b/QueryBuilder.Tests/Infrastructure/TestSupport.cs @@ -17,4 +17,4 @@ protected IReadOnlyDictionary Compile(Query query) return Compilers.Compile(query).ToDictionary(s => s.Key, v => v.Value.ToString()); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/InfrastructureTests.cs b/QueryBuilder.Tests/InfrastructureTests.cs index d2a0480a..0cc4b085 100644 --- a/QueryBuilder.Tests/InfrastructureTests.cs +++ b/QueryBuilder.Tests/InfrastructureTests.cs @@ -51,4 +51,4 @@ public void ShouldThrowIfAnyEngineCodesAreInvalid() Assert.Throws(() => Compilers.Compile(codes, new Query())); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/InsertTests.cs b/QueryBuilder.Tests/InsertTests.cs index a8676052..1451b951 100644 --- a/QueryBuilder.Tests/InsertTests.cs +++ b/QueryBuilder.Tests/InsertTests.cs @@ -305,4 +305,4 @@ public void InsertExpandoObject() c[EngineCodes.Firebird]); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/MySql/MySqlLimitTests.cs b/QueryBuilder.Tests/MySql/MySqlLimitTests.cs index 8894f4c8..659388f4 100644 --- a/QueryBuilder.Tests/MySql/MySqlLimitTests.cs +++ b/QueryBuilder.Tests/MySql/MySqlLimitTests.cs @@ -55,4 +55,4 @@ public void WithLimitAndOffset() Assert.Equal(2, ctx.Bindings.Count); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/OperatorWhitelistTests.cs b/QueryBuilder.Tests/OperatorWhitelistTests.cs index b56b9521..55c3aafc 100644 --- a/QueryBuilder.Tests/OperatorWhitelistTests.cs +++ b/QueryBuilder.Tests/OperatorWhitelistTests.cs @@ -136,4 +136,4 @@ public void ShouldNotConsiderWhereRawCondition() } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/Oracle/OracleLegacyLimitTests.cs b/QueryBuilder.Tests/Oracle/OracleLegacyLimitTests.cs index 500103ba..48dca81e 100644 --- a/QueryBuilder.Tests/Oracle/OracleLegacyLimitTests.cs +++ b/QueryBuilder.Tests/Oracle/OracleLegacyLimitTests.cs @@ -79,4 +79,4 @@ public void WithLimitAndOffset() Assert.Equal(2, ctx.Bindings.Count); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/Oracle/OracleLimitTests.cs b/QueryBuilder.Tests/Oracle/OracleLimitTests.cs index bd05a03c..13223e78 100644 --- a/QueryBuilder.Tests/Oracle/OracleLimitTests.cs +++ b/QueryBuilder.Tests/Oracle/OracleLimitTests.cs @@ -72,4 +72,4 @@ public void LimitAndOffset() compiler.CompileLimit(ctx); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/ParameterTypeTests.cs b/QueryBuilder.Tests/ParameterTypeTests.cs index c4f5c5d9..fd3d74fd 100644 --- a/QueryBuilder.Tests/ParameterTypeTests.cs +++ b/QueryBuilder.Tests/ParameterTypeTests.cs @@ -49,4 +49,4 @@ public void CorrectParameterTypeOutput(string rendered, object input) Assert.Equal($"SELECT * FROM [Table] WHERE [Col] = {rendered}", c[EngineCodes.SqlServer]); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/PostgreSql/PostgreSqlLimitTests.cs b/QueryBuilder.Tests/PostgreSql/PostgreSqlLimitTests.cs index ff6c154a..fd878c78 100644 --- a/QueryBuilder.Tests/PostgreSql/PostgreSqlLimitTests.cs +++ b/QueryBuilder.Tests/PostgreSql/PostgreSqlLimitTests.cs @@ -55,4 +55,4 @@ public void WithLimitAndOffset() Assert.Equal(2, ctx.Bindings.Count); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/SqlServer/NestedSelectTests.cs b/QueryBuilder.Tests/SqlServer/NestedSelectTests.cs index 8a257e8c..4c3f20a0 100644 --- a/QueryBuilder.Tests/SqlServer/NestedSelectTests.cs +++ b/QueryBuilder.Tests/SqlServer/NestedSelectTests.cs @@ -61,4 +61,4 @@ public void SqlCompile_QueryLimitAndNestedLimit_BindingValue() // Assert.Contains("SELECT * FROM [Foo] WHERE [C] = 'c' AND EXISTS (SELECT TOP (1) 1 FROM [Bar]) AND [A] = 'a'", actual); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/SqlServer/SqlServerLegacyLimitTests.cs b/QueryBuilder.Tests/SqlServer/SqlServerLegacyLimitTests.cs index 5ba0fc84..bb6720e1 100644 --- a/QueryBuilder.Tests/SqlServer/SqlServerLegacyLimitTests.cs +++ b/QueryBuilder.Tests/SqlServer/SqlServerLegacyLimitTests.cs @@ -75,4 +75,4 @@ public void ShouldKeepTheOrdersAsIsIfPaginationProvided() Assert.DoesNotContain("(SELECT 0)", compiler.Compile(query).ToString()); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/SqlServer/SqlServerLimitTests.cs b/QueryBuilder.Tests/SqlServer/SqlServerLimitTests.cs index bd7827c4..aef7809a 100644 --- a/QueryBuilder.Tests/SqlServer/SqlServerLimitTests.cs +++ b/QueryBuilder.Tests/SqlServer/SqlServerLimitTests.cs @@ -85,4 +85,4 @@ public void ShouldKeepTheOrdersAsIsIfPaginationProvided() Assert.DoesNotContain("(SELECT 0)", compiler.Compile(query).ToString()); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/SqlServer/SqlServerTests.cs b/QueryBuilder.Tests/SqlServer/SqlServerTests.cs index 5ac08e7c..3adb84f5 100644 --- a/QueryBuilder.Tests/SqlServer/SqlServerTests.cs +++ b/QueryBuilder.Tests/SqlServer/SqlServerTests.cs @@ -59,4 +59,4 @@ public void OffsetSqlServer_Should_Be_Incremented_By_One(int offset) (offset + 1), c.ToString()); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/Sqlite/SqliteLimitTests.cs b/QueryBuilder.Tests/Sqlite/SqliteLimitTests.cs index 818c2461..d4e63503 100644 --- a/QueryBuilder.Tests/Sqlite/SqliteLimitTests.cs +++ b/QueryBuilder.Tests/Sqlite/SqliteLimitTests.cs @@ -55,4 +55,4 @@ public void WithLimitAndOffset() Assert.Equal(2, ctx.Bindings.Count); } } -} \ No newline at end of file +} diff --git a/QueryBuilder.Tests/UpdateTests.cs b/QueryBuilder.Tests/UpdateTests.cs index ecc36b5b..af085d4c 100644 --- a/QueryBuilder.Tests/UpdateTests.cs +++ b/QueryBuilder.Tests/UpdateTests.cs @@ -316,4 +316,4 @@ public void DecrementUpdate() Assert.Equal("UPDATE [Table] SET [Total] = [Total] - 2 WHERE [Name] = 'A'", c[EngineCodes.SqlServer]); } } -} \ No newline at end of file +} diff --git a/QueryBuilder/BaseQuery.cs b/QueryBuilder/BaseQuery.cs index 9e7a9ec8..86b44a23 100644 --- a/QueryBuilder/BaseQuery.cs +++ b/QueryBuilder/BaseQuery.cs @@ -307,4 +307,4 @@ public Q From(Func callback, string alias = null) } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Clauses/AbstractClause.cs b/QueryBuilder/Clauses/AbstractClause.cs index 5c00fe21..1f286594 100644 --- a/QueryBuilder/Clauses/AbstractClause.cs +++ b/QueryBuilder/Clauses/AbstractClause.cs @@ -19,4 +19,4 @@ public abstract class AbstractClause public string Component { get; set; } public abstract AbstractClause Clone(); } -} \ No newline at end of file +} diff --git a/QueryBuilder/Clauses/AggregateClause.cs b/QueryBuilder/Clauses/AggregateClause.cs index 802249b5..2d18d78e 100644 --- a/QueryBuilder/Clauses/AggregateClause.cs +++ b/QueryBuilder/Clauses/AggregateClause.cs @@ -36,4 +36,4 @@ public override AbstractClause Clone() }; } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Clauses/ColumnClause.cs b/QueryBuilder/Clauses/ColumnClause.cs index 2d3eca36..58872d8e 100644 --- a/QueryBuilder/Clauses/ColumnClause.cs +++ b/QueryBuilder/Clauses/ColumnClause.cs @@ -77,4 +77,4 @@ public override AbstractClause Clone() }; } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Clauses/Combine.cs b/QueryBuilder/Clauses/Combine.cs index 22e2cb22..da0f5e37 100644 --- a/QueryBuilder/Clauses/Combine.cs +++ b/QueryBuilder/Clauses/Combine.cs @@ -63,4 +63,4 @@ public override AbstractClause Clone() }; } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Clauses/ConditionClause.cs b/QueryBuilder/Clauses/ConditionClause.cs index 845d2896..287149e5 100644 --- a/QueryBuilder/Clauses/ConditionClause.cs +++ b/QueryBuilder/Clauses/ConditionClause.cs @@ -336,4 +336,4 @@ public override AbstractClause Clone() }; } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Clauses/FromClause.cs b/QueryBuilder/Clauses/FromClause.cs index 9b21a50b..a0ca9748 100644 --- a/QueryBuilder/Clauses/FromClause.cs +++ b/QueryBuilder/Clauses/FromClause.cs @@ -94,4 +94,4 @@ public override AbstractClause Clone() }; } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Clauses/InsertClause.cs b/QueryBuilder/Clauses/InsertClause.cs index 41dfd74b..14ece2d2 100644 --- a/QueryBuilder/Clauses/InsertClause.cs +++ b/QueryBuilder/Clauses/InsertClause.cs @@ -42,4 +42,4 @@ public override AbstractClause Clone() }; } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Clauses/JoinClause.cs b/QueryBuilder/Clauses/JoinClause.cs index 022148ee..94c6b322 100644 --- a/QueryBuilder/Clauses/JoinClause.cs +++ b/QueryBuilder/Clauses/JoinClause.cs @@ -47,4 +47,4 @@ public override AbstractClause Clone() }; } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Clauses/LimitClause.cs b/QueryBuilder/Clauses/LimitClause.cs index b37d5b29..97bf542b 100644 --- a/QueryBuilder/Clauses/LimitClause.cs +++ b/QueryBuilder/Clauses/LimitClause.cs @@ -32,4 +32,4 @@ public override AbstractClause Clone() }; } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Clauses/OffsetClause.cs b/QueryBuilder/Clauses/OffsetClause.cs index 39fe8b4e..2852efd1 100644 --- a/QueryBuilder/Clauses/OffsetClause.cs +++ b/QueryBuilder/Clauses/OffsetClause.cs @@ -32,4 +32,4 @@ public override AbstractClause Clone() }; } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Clauses/OrderClause.cs b/QueryBuilder/Clauses/OrderClause.cs index e7e92892..69af772e 100644 --- a/QueryBuilder/Clauses/OrderClause.cs +++ b/QueryBuilder/Clauses/OrderClause.cs @@ -52,4 +52,4 @@ public override AbstractClause Clone() }; } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Compilers/ConditionsCompilerProvider.cs b/QueryBuilder/Compilers/ConditionsCompilerProvider.cs index c542410a..6439da94 100644 --- a/QueryBuilder/Compilers/ConditionsCompilerProvider.cs +++ b/QueryBuilder/Compilers/ConditionsCompilerProvider.cs @@ -51,4 +51,4 @@ private MethodInfo FindMethodInfo(Type clauseType, string methodName) return methodInfo; } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Compilers/MySqlCompiler.cs b/QueryBuilder/Compilers/MySqlCompiler.cs index 1f2bae8c..f016f9f7 100644 --- a/QueryBuilder/Compilers/MySqlCompiler.cs +++ b/QueryBuilder/Compilers/MySqlCompiler.cs @@ -46,4 +46,4 @@ public override string CompileLimit(SqlResult ctx) } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Expressions.cs b/QueryBuilder/Expressions.cs index f2dbbc18..8a5fdae1 100644 --- a/QueryBuilder/Expressions.cs +++ b/QueryBuilder/Expressions.cs @@ -25,4 +25,4 @@ public static UnsafeLiteral UnsafeLiteral(string value, bool replaceQuotes = tru return new UnsafeLiteral(value, replaceQuotes); } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Extensions/QueryForExtensions.cs b/QueryBuilder/Extensions/QueryForExtensions.cs index 08262624..a785a5f0 100644 --- a/QueryBuilder/Extensions/QueryForExtensions.cs +++ b/QueryBuilder/Extensions/QueryForExtensions.cs @@ -36,4 +36,4 @@ public static Query ForSqlServer(this Query src, Func fn) } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Helper.cs b/QueryBuilder/Helper.cs index 23b77eb6..520d08d5 100644 --- a/QueryBuilder/Helper.cs +++ b/QueryBuilder/Helper.cs @@ -170,4 +170,4 @@ public static string ReplaceIdentifierUnlessEscaped(this string input, string es return escapedRegex.Replace(nonEscapedReplace, identifier); } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Include.cs b/QueryBuilder/Include.cs index 9e5a5a94..e0cbfe02 100644 --- a/QueryBuilder/Include.cs +++ b/QueryBuilder/Include.cs @@ -8,4 +8,4 @@ public class Include public string LocalKey { get; set; } public bool IsMany { get; set; } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Join.cs b/QueryBuilder/Join.cs index 9172ef08..ae0969a6 100644 --- a/QueryBuilder/Join.cs +++ b/QueryBuilder/Join.cs @@ -74,4 +74,4 @@ public override Join NewQuery() return new Join(); } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Properties/AssemblyInfo.cs b/QueryBuilder/Properties/AssemblyInfo.cs index d818ff75..b8e480cf 100644 --- a/QueryBuilder/Properties/AssemblyInfo.cs +++ b/QueryBuilder/Properties/AssemblyInfo.cs @@ -1,3 +1,3 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("QueryBuilder.Tests")] \ No newline at end of file +[assembly: InternalsVisibleTo("QueryBuilder.Tests")] diff --git a/QueryBuilder/Query.Aggregate.cs b/QueryBuilder/Query.Aggregate.cs index 750f5671..d4fc5057 100644 --- a/QueryBuilder/Query.Aggregate.cs +++ b/QueryBuilder/Query.Aggregate.cs @@ -56,4 +56,4 @@ public Query AsMin(string column) return AsAggregate("min", new[] { column }); } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Query.Combine.cs b/QueryBuilder/Query.Combine.cs index d28216a7..b7238264 100644 --- a/QueryBuilder/Query.Combine.cs +++ b/QueryBuilder/Query.Combine.cs @@ -103,4 +103,4 @@ public Query IntersectAll(Func callback) public Query IntersectRaw(string sql, params object[] bindings) => CombineRaw(sql, bindings); } -} \ No newline at end of file +} diff --git a/QueryBuilder/Query.Delete.cs b/QueryBuilder/Query.Delete.cs index f15d2940..bd00cad9 100644 --- a/QueryBuilder/Query.Delete.cs +++ b/QueryBuilder/Query.Delete.cs @@ -9,4 +9,4 @@ public Query AsDelete() } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Query.Having.cs b/QueryBuilder/Query.Having.cs index 91450307..8dcf43ca 100644 --- a/QueryBuilder/Query.Having.cs +++ b/QueryBuilder/Query.Having.cs @@ -653,4 +653,4 @@ public Query OrHavingNotTime(string column, object value) #endregion } -} \ No newline at end of file +} diff --git a/QueryBuilder/Query.Join.cs b/QueryBuilder/Query.Join.cs index d8b4606e..3fe3bbb1 100644 --- a/QueryBuilder/Query.Join.cs +++ b/QueryBuilder/Query.Join.cs @@ -72,4 +72,4 @@ public Query CrossJoin(string table) } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Query.Select.cs b/QueryBuilder/Query.Select.cs index 852b1543..ada1b029 100644 --- a/QueryBuilder/Query.Select.cs +++ b/QueryBuilder/Query.Select.cs @@ -63,4 +63,4 @@ public Query Select(Func callback, string alias) return Select(callback.Invoke(NewChild()), alias); } } -} \ No newline at end of file +} diff --git a/QueryBuilder/SqlResult.cs b/QueryBuilder/SqlResult.cs index 0eaaeee7..7826ea54 100644 --- a/QueryBuilder/SqlResult.cs +++ b/QueryBuilder/SqlResult.cs @@ -84,4 +84,4 @@ private string ChangeToSqlValue(object value) return "'" + value.ToString() + "'"; } } -} \ No newline at end of file +} diff --git a/QueryBuilder/UnsafeLiteral.cs b/QueryBuilder/UnsafeLiteral.cs index 748ad0ce..b96c8080 100644 --- a/QueryBuilder/UnsafeLiteral.cs +++ b/QueryBuilder/UnsafeLiteral.cs @@ -20,4 +20,4 @@ public UnsafeLiteral(string value, bool replaceQuotes = true) } } -} \ No newline at end of file +} diff --git a/QueryBuilder/Variable.cs b/QueryBuilder/Variable.cs index 3f899584..63b936ea 100644 --- a/QueryBuilder/Variable.cs +++ b/QueryBuilder/Variable.cs @@ -10,4 +10,4 @@ public Variable(string name) } } -} \ No newline at end of file +} diff --git a/SqlKata.Execution/InsertGetId.cs b/SqlKata.Execution/InsertGetId.cs index a4f50094..a25d6a3f 100644 --- a/SqlKata.Execution/InsertGetId.cs +++ b/SqlKata.Execution/InsertGetId.cs @@ -4,4 +4,4 @@ public class InsertGetIdRow { public T Id { get; set; } } -} \ No newline at end of file +} diff --git a/SqlKata.Execution/PaginationIterator.cs b/SqlKata.Execution/PaginationIterator.cs index 4864aa08..9af8d036 100644 --- a/SqlKata.Execution/PaginationIterator.cs +++ b/SqlKata.Execution/PaginationIterator.cs @@ -27,4 +27,4 @@ IEnumerator IEnumerable.GetEnumerator() return GetEnumerator(); } } -} \ No newline at end of file +} diff --git a/SqlKata.Execution/PaginationResult.cs b/SqlKata.Execution/PaginationResult.cs index 200ebb27..85277503 100644 --- a/SqlKata.Execution/PaginationResult.cs +++ b/SqlKata.Execution/PaginationResult.cs @@ -104,4 +104,4 @@ public PaginationIterator Each } } -} \ No newline at end of file +} diff --git a/SqlKata.Execution/Query.Extensions.cs b/SqlKata.Execution/Query.Extensions.cs index a3aadf35..60a54ff4 100644 --- a/SqlKata.Execution/Query.Extensions.cs +++ b/SqlKata.Execution/Query.Extensions.cs @@ -378,4 +378,4 @@ internal static QueryFactory CreateQueryFactory(Query query) return CreateQueryFactory(CastToXQuery(query)); } } -} \ No newline at end of file +} diff --git a/SqlKata.Execution/QueryFactory.cs b/SqlKata.Execution/QueryFactory.cs index cc441ae4..b10677ab 100644 --- a/SqlKata.Execution/QueryFactory.cs +++ b/SqlKata.Execution/QueryFactory.cs @@ -896,4 +896,4 @@ public void Dispose() GC.SuppressFinalize(this); } } -} \ No newline at end of file +} From c6a55f4d093adf06fe23a169739e2069628296c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Geelen?= Date: Wed, 5 May 2021 09:46:37 +0200 Subject: [PATCH 5/7] Trim trailing whitespace. --- QueryBuilder/Clauses/LimitClause.cs | 2 +- QueryBuilder/Helper.cs | 4 ++-- QueryBuilder/Query.cs | 2 +- README.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/QueryBuilder/Clauses/LimitClause.cs b/QueryBuilder/Clauses/LimitClause.cs index 97bf542b..89defc99 100644 --- a/QueryBuilder/Clauses/LimitClause.cs +++ b/QueryBuilder/Clauses/LimitClause.cs @@ -3,7 +3,7 @@ namespace SqlKata public class LimitClause : AbstractClause { private int _limit; - + public int Limit { get => _limit; diff --git a/QueryBuilder/Helper.cs b/QueryBuilder/Helper.cs index 520d08d5..ccf4bb22 100644 --- a/QueryBuilder/Helper.cs +++ b/QueryBuilder/Helper.cs @@ -158,13 +158,13 @@ public static IEnumerable Repeat(this string str, int count) { return Enumerable.Repeat(str, count); } - + public static string ReplaceIdentifierUnlessEscaped(this string input, string escapeCharacter, string identifier, string newIdentifier) { //Replace standard, non-escaped identifiers first var nonEscapedRegex = new Regex($@"(? CacheDictionaryProperties = new ConcurrentDictionary(); /// diff --git a/README.md b/README.md index 6858b787..9d5a22e3 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ -> **WE ARE NOT ACCEPTING NEW COMPILERS, if you want to add your own compiler, we recommend to create a separate repo like SqlKata-Oracle** +> **WE ARE NOT ACCEPTING NEW COMPILERS, if you want to add your own compiler, we recommend to create a separate repo like SqlKata-Oracle** Follow Twitter for the latest updates about SqlKata. From 5d7a04a7f0ad2925e53fa056befbd708e811a440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Geelen?= Date: Wed, 9 Jun 2021 11:03:29 +0200 Subject: [PATCH 6/7] Update .editorconfig to maintain whitespace. --- .editorconfig | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.editorconfig b/.editorconfig index 87f877b2..b33fe946 100755 --- a/.editorconfig +++ b/.editorconfig @@ -3,3 +3,26 @@ root = true [*] charset = utf-8 end_of_line = lf +# Note: the trim_trailing_whitespace option is br0ken in visualstudio, it +# simply does not follow the EditorConfig specification. Therefor you are +# strongly encouraged to not rely on this setting alone, but please install +# the following extension too: https://marketplace.visualstudio.com/items?itemName=MadsKristensen.TrailingWhitespaceVisualizer +# +# References: +# https://developercommunity.visualstudio.com/t/EditorConfig:-trim_trailing_whitespace-d/1240174?space=8&q=trim_trailing_whitespace +# https://developercommunity.visualstudio.com/t/editorconfig-trim_trailing_whitespace-on/134457?space=8&q=trim_trailing_whitespace +# https://developercommunity.visualstudio.com/t/trim_trailing_whitespace-in-editorconfi/1351034?space=8&q=trim_trailing_whitespace +# https://developercommunity.visualstudio.com/t/BUG:-editorconfig-trim_trailing_whitespa/953937?space=8&q=trim_trailing_whitespace +trim_trailing_whitespace = true +insert_final_newline = true +indent_style = tab +indent_size = 2 + + +[*.cs] # To match existing style +indent_style = space +indent_size = 4 + + +[*.yml] +indent_style = space From 29bc41c944040ab86a701be79887e66f47d9438c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Geelen?= Date: Wed, 5 May 2021 10:11:28 +0200 Subject: [PATCH 7/7] Run visual studio auto-formatter. --- QueryBuilder.Tests/Firebird/FirebirdLimitTests.cs | 8 ++++---- .../Infrastructure/TestCompilersContainer.cs | 2 +- QueryBuilder.Tests/InfrastructureTests.cs | 4 ++-- QueryBuilder.Tests/MySql/MySqlLimitTests.cs | 8 ++++---- QueryBuilder.Tests/PostgreSql/PostgreSqlLimitTests.cs | 8 ++++---- QueryBuilder.Tests/SqlServer/SqlServerLegacyLimitTests.cs | 8 ++++---- QueryBuilder.Tests/SqlServer/SqlServerLimitTests.cs | 8 ++++---- QueryBuilder/Helper.cs | 2 +- QueryBuilder/Query.Insert.cs | 2 +- QueryBuilder/UnsafeLiteral.cs | 6 +++--- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/QueryBuilder.Tests/Firebird/FirebirdLimitTests.cs b/QueryBuilder.Tests/Firebird/FirebirdLimitTests.cs index 5eda1d97..dd7972f2 100644 --- a/QueryBuilder.Tests/Firebird/FirebirdLimitTests.cs +++ b/QueryBuilder.Tests/Firebird/FirebirdLimitTests.cs @@ -17,7 +17,7 @@ public FirebirdLimitTests() public void NoLimitNorOffset() { var query = new Query("Table"); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Null(compiler.CompileLimit(ctx)); } @@ -26,7 +26,7 @@ public void NoLimitNorOffset() public void LimitOnly() { var query = new Query("Table").Limit(10); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Null(compiler.CompileLimit(ctx)); } @@ -35,7 +35,7 @@ public void LimitOnly() public void OffsetOnly() { var query = new Query("Table").Offset(20); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Null(compiler.CompileLimit(ctx)); } @@ -44,7 +44,7 @@ public void OffsetOnly() public void LimitAndOffset() { var query = new Query("Table").Limit(5).Offset(20); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Equal("ROWS ? TO ?", compiler.CompileLimit(ctx)); Assert.Equal(21, ctx.Bindings[0]); diff --git a/QueryBuilder.Tests/Infrastructure/TestCompilersContainer.cs b/QueryBuilder.Tests/Infrastructure/TestCompilersContainer.cs index 4639ee7e..c808fb6d 100644 --- a/QueryBuilder.Tests/Infrastructure/TestCompilersContainer.cs +++ b/QueryBuilder.Tests/Infrastructure/TestCompilersContainer.cs @@ -52,7 +52,7 @@ public Compiler Get(string engineCode) /// public TCompiler Get(string engineCode) where TCompiler : Compiler { - return (TCompiler) Get(engineCode); + return (TCompiler)Get(engineCode); } /// diff --git a/QueryBuilder.Tests/InfrastructureTests.cs b/QueryBuilder.Tests/InfrastructureTests.cs index 0cc4b085..5bb7f2df 100644 --- a/QueryBuilder.Tests/InfrastructureTests.cs +++ b/QueryBuilder.Tests/InfrastructureTests.cs @@ -29,11 +29,11 @@ public void CanCompile() [Fact] public void CanCompileSelectively() { - var desiredEngines = new[] {EngineCodes.SqlServer, EngineCodes.MySql}; + var desiredEngines = new[] { EngineCodes.SqlServer, EngineCodes.MySql }; var results = Compilers.Compile(desiredEngines, new Query("Table")); Assert.Equal(desiredEngines.Length, results.Count); - Assert.Contains(results, a =>a.Key == EngineCodes.SqlServer); + Assert.Contains(results, a => a.Key == EngineCodes.SqlServer); Assert.Contains(results, a => a.Key == EngineCodes.MySql); } diff --git a/QueryBuilder.Tests/MySql/MySqlLimitTests.cs b/QueryBuilder.Tests/MySql/MySqlLimitTests.cs index 659388f4..2456b226 100644 --- a/QueryBuilder.Tests/MySql/MySqlLimitTests.cs +++ b/QueryBuilder.Tests/MySql/MySqlLimitTests.cs @@ -17,7 +17,7 @@ public MySqlLimitTests() public void WithNoLimitNorOffset() { var query = new Query("Table"); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Null(compiler.CompileLimit(ctx)); } @@ -26,7 +26,7 @@ public void WithNoLimitNorOffset() public void WithNoOffset() { var query = new Query("Table").Limit(10); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Equal("LIMIT ?", compiler.CompileLimit(ctx)); Assert.Equal(10, ctx.Bindings[0]); @@ -36,7 +36,7 @@ public void WithNoOffset() public void WithNoLimit() { var query = new Query("Table").Offset(20); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Equal("LIMIT 18446744073709551615 OFFSET ?", compiler.CompileLimit(ctx)); Assert.Equal(20, ctx.Bindings[0]); @@ -47,7 +47,7 @@ public void WithNoLimit() public void WithLimitAndOffset() { var query = new Query("Table").Limit(5).Offset(20); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Equal("LIMIT ? OFFSET ?", compiler.CompileLimit(ctx)); Assert.Equal(5, ctx.Bindings[0]); diff --git a/QueryBuilder.Tests/PostgreSql/PostgreSqlLimitTests.cs b/QueryBuilder.Tests/PostgreSql/PostgreSqlLimitTests.cs index fd878c78..b6342c57 100644 --- a/QueryBuilder.Tests/PostgreSql/PostgreSqlLimitTests.cs +++ b/QueryBuilder.Tests/PostgreSql/PostgreSqlLimitTests.cs @@ -17,7 +17,7 @@ public PostgreSqlLimitTests() public void WithNoLimitNorOffset() { var query = new Query("Table"); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Null(compiler.CompileLimit(ctx)); } @@ -26,7 +26,7 @@ public void WithNoLimitNorOffset() public void WithNoOffset() { var query = new Query("Table").Limit(10); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Equal("LIMIT ?", compiler.CompileLimit(ctx)); Assert.Equal(10, ctx.Bindings[0]); @@ -36,7 +36,7 @@ public void WithNoOffset() public void WithNoLimit() { var query = new Query("Table").Offset(20); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Equal("OFFSET ?", compiler.CompileLimit(ctx)); Assert.Equal(20, ctx.Bindings[0]); @@ -47,7 +47,7 @@ public void WithNoLimit() public void WithLimitAndOffset() { var query = new Query("Table").Limit(5).Offset(20); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Equal("LIMIT ? OFFSET ?", compiler.CompileLimit(ctx)); Assert.Equal(5, ctx.Bindings[0]); diff --git a/QueryBuilder.Tests/SqlServer/SqlServerLegacyLimitTests.cs b/QueryBuilder.Tests/SqlServer/SqlServerLegacyLimitTests.cs index bb6720e1..85493d2f 100644 --- a/QueryBuilder.Tests/SqlServer/SqlServerLegacyLimitTests.cs +++ b/QueryBuilder.Tests/SqlServer/SqlServerLegacyLimitTests.cs @@ -18,7 +18,7 @@ public SqlServerLegacyLimitTests() public void NoLimitNorOffset() { var query = new Query("Table"); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Null(compiler.CompileLimit(ctx)); } @@ -27,7 +27,7 @@ public void NoLimitNorOffset() public void LimitOnly() { var query = new Query("Table").Limit(10); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Null(compiler.CompileLimit(ctx)); } @@ -36,7 +36,7 @@ public void LimitOnly() public void OffsetOnly() { var query = new Query("Table").Offset(20); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Null(compiler.CompileLimit(ctx)); } @@ -45,7 +45,7 @@ public void OffsetOnly() public void LimitAndOffset() { var query = new Query("Table").Limit(5).Offset(20); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Null(compiler.CompileLimit(ctx)); } diff --git a/QueryBuilder.Tests/SqlServer/SqlServerLimitTests.cs b/QueryBuilder.Tests/SqlServer/SqlServerLimitTests.cs index aef7809a..011d8a2e 100644 --- a/QueryBuilder.Tests/SqlServer/SqlServerLimitTests.cs +++ b/QueryBuilder.Tests/SqlServer/SqlServerLimitTests.cs @@ -18,7 +18,7 @@ public SqlServerLimitTests() public void NoLimitNorOffset() { var query = new Query("Table"); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.Null(compiler.CompileLimit(ctx)); } @@ -27,7 +27,7 @@ public void NoLimitNorOffset() public void LimitOnly() { var query = new Query("Table").Limit(10); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.EndsWith("OFFSET ? ROWS FETCH NEXT ? ROWS ONLY", compiler.CompileLimit(ctx)); Assert.Equal(2, ctx.Bindings.Count); @@ -39,7 +39,7 @@ public void LimitOnly() public void OffsetOnly() { var query = new Query("Table").Offset(20); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.EndsWith("OFFSET ? ROWS", compiler.CompileLimit(ctx)); @@ -51,7 +51,7 @@ public void OffsetOnly() public void LimitAndOffset() { var query = new Query("Table").Limit(5).Offset(20); - var ctx = new SqlResult {Query = query}; + var ctx = new SqlResult { Query = query }; Assert.EndsWith("OFFSET ? ROWS FETCH NEXT ? ROWS ONLY", compiler.CompileLimit(ctx)); diff --git a/QueryBuilder/Helper.cs b/QueryBuilder/Helper.cs index ccf4bb22..998e5d59 100644 --- a/QueryBuilder/Helper.cs +++ b/QueryBuilder/Helper.cs @@ -10,7 +10,7 @@ public static class Helper { public static bool IsArray(object value) { - if(value is string) + if (value is string) { return false; } diff --git a/QueryBuilder/Query.Insert.cs b/QueryBuilder/Query.Insert.cs index bebce921..dbec60af 100644 --- a/QueryBuilder/Query.Insert.cs +++ b/QueryBuilder/Query.Insert.cs @@ -51,7 +51,7 @@ public Query AsInsert(IEnumerable> values, bool ret ClearComponent("insert").AddComponent("insert", new InsertClause { - Columns = values.Select(x=>x.Key).ToList(), + Columns = values.Select(x => x.Key).ToList(), Values = values.Select(x => x.Value).ToList(), ReturnId = returnId, }); diff --git a/QueryBuilder/UnsafeLiteral.cs b/QueryBuilder/UnsafeLiteral.cs index b96c8080..23d81e2d 100644 --- a/QueryBuilder/UnsafeLiteral.cs +++ b/QueryBuilder/UnsafeLiteral.cs @@ -2,16 +2,16 @@ namespace SqlKata { public class UnsafeLiteral { - public string Value {get; set;} + public string Value { get; set; } public UnsafeLiteral(string value, bool replaceQuotes = true) { - if(value == null) + if (value == null) { value = ""; } - if(replaceQuotes) + if (replaceQuotes) { value = value.Replace("'", "''"); }