From edc59322cd5ab7ec563306f0d89caa158d0a79aa Mon Sep 17 00:00:00 2001 From: Eric Burcham Date: Thu, 4 Aug 2022 00:09:03 -0500 Subject: [PATCH 1/5] renamed all IDataSource references which were still named 'context' to 'dataSource.' --- .../QueryObjects/AdvancedCommand.cs | 4 +- .../QueryObjects/AdvancedQuery.cs | 38 +++++++++---------- .../QueryObjects/AdvancedScalar.cs | 10 ++--- .../QueryObjects/SqlQuery.cs | 10 ++--- .../QueryObjects/SqlScalar.cs | 4 +- .../Interfaces/BaseInterceptor.cs | 4 +- .../Interfaces/Queries/IQueryBase.cs | 4 +- .../Interfaces/Queries/IQuery`1.cs | 4 +- .../Interfaces/Queries/IScalar`1.cs | 4 +- src/Highway.Data/QueryObjects/Command.cs | 4 +- src/Highway.Data/QueryObjects/QueryBase.cs | 6 +-- src/Highway.Data/QueryObjects/Query`1.cs | 24 ++++++------ src/Highway.Data/QueryObjects/Query`2.cs | 18 ++++----- src/Highway.Data/QueryObjects/Scalar`1.cs | 10 ++--- src/Highway.Data/QueryObjects/Scalar`2.cs | 18 ++++----- 15 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/Highway.Data.EntityFramework/QueryObjects/AdvancedCommand.cs b/src/Highway.Data.EntityFramework/QueryObjects/AdvancedCommand.cs index c3a98467..fa6f4ff1 100644 --- a/src/Highway.Data.EntityFramework/QueryObjects/AdvancedCommand.cs +++ b/src/Highway.Data.EntityFramework/QueryObjects/AdvancedCommand.cs @@ -18,8 +18,8 @@ public class AdvancedCommand : QueryBase, ICommand /// The data context that the command is executed against public virtual void Execute(IDataContext context) { - Context = context; - CheckContextAndQuery(ContextQuery); + DataSource = context; + CheckDataSourceAndQuery(ContextQuery); ContextQuery((DataContext)context); } } diff --git a/src/Highway.Data.EntityFramework/QueryObjects/AdvancedQuery.cs b/src/Highway.Data.EntityFramework/QueryObjects/AdvancedQuery.cs index c08f4955..abbfa6ce 100644 --- a/src/Highway.Data.EntityFramework/QueryObjects/AdvancedQuery.cs +++ b/src/Highway.Data.EntityFramework/QueryObjects/AdvancedQuery.cs @@ -19,18 +19,18 @@ public class AdvancedQuery : QueryBase, IQuery /// This executes the expression in ContextQuery on the context that is passed in, resulting in a /// that is returned as an /// - /// the data context that the query should be executed against + /// the data context that the query should be executed against /// /// /// - public virtual IEnumerable Execute(IDataSource context) + public virtual IEnumerable Execute(IDataSource dataSource) { - return PrepareQuery(context); + return PrepareQuery(dataSource); } - public string OutputQuery(IDataSource context) + public string OutputQuery(IDataSource dataSource) { - var query = PrepareQuery(context); + var query = PrepareQuery(dataSource); return query.ToString(); } @@ -59,13 +59,13 @@ protected virtual IQueryable AppendExpressions(IQueryable query) /// an protected virtual IQueryable ExtendQuery() { - return ContextQuery((DataContext)Context); + return ContextQuery((DataContext)DataSource); } - protected virtual IQueryable PrepareQuery(IDataSource context) + protected virtual IQueryable PrepareQuery(IDataSource dataSource) { - Context = context; - CheckContextAndQuery(ContextQuery); + DataSource = dataSource; + CheckDataSourceAndQuery(ContextQuery); var query = ExtendQuery(); return AppendExpressions(query); @@ -88,18 +88,18 @@ public class AdvancedQuery : QueryBase, IQuery that is returned as an /// - /// the data context that the query should be executed against + /// the data context that the query should be executed against /// /// /// - public virtual IEnumerable Execute(IDataSource context) + public virtual IEnumerable Execute(IDataSource dataSource) { - return PrepareQuery(context); + return PrepareQuery(dataSource); } - public virtual string OutputQuery(IDataSource context) + public virtual string OutputQuery(IDataSource dataSource) { - var query = PrepareQuery(context); + var query = PrepareQuery(dataSource); return query.ToString(); } @@ -128,18 +128,18 @@ protected virtual IQueryable AppendExpressions(IQueryablean protected virtual IQueryable ExtendQuery() { - return Selector((DataContext)Context); + return Selector((DataContext)DataSource); } /// /// Appends the projection to the query and prepares it for execution /// - /// the context to prepare against + /// the context to prepare against /// The prepared but un-executed queryable - protected virtual IQueryable PrepareQuery(IDataSource context) + protected virtual IQueryable PrepareQuery(IDataSource dataSource) { - Context = context; - CheckContextAndQuery(Selector); + DataSource = dataSource; + CheckDataSourceAndQuery(Selector); var query = ExtendQuery(); return AppendExpressions(query); diff --git a/src/Highway.Data.EntityFramework/QueryObjects/AdvancedScalar.cs b/src/Highway.Data.EntityFramework/QueryObjects/AdvancedScalar.cs index 21943359..495beeba 100644 --- a/src/Highway.Data.EntityFramework/QueryObjects/AdvancedScalar.cs +++ b/src/Highway.Data.EntityFramework/QueryObjects/AdvancedScalar.cs @@ -16,14 +16,14 @@ public class AdvancedScalar : QueryBase, IScalar /// /// Executes the expression against the passed in context /// - /// The data context that the scalar query is executed against + /// The data context that the scalar query is executed against /// The instance of that the query materialized if any - public T Execute(IDataSource context) + public T Execute(IDataSource dataSource) { - Context = context; - CheckContextAndQuery(ContextQuery); + DataSource = dataSource; + CheckDataSourceAndQuery(ContextQuery); - return ContextQuery((DataContext)context); + return ContextQuery((DataContext)dataSource); } } } diff --git a/src/Highway.Data.EntityFramework/QueryObjects/SqlQuery.cs b/src/Highway.Data.EntityFramework/QueryObjects/SqlQuery.cs index ea7c872f..ef2c7654 100644 --- a/src/Highway.Data.EntityFramework/QueryObjects/SqlQuery.cs +++ b/src/Highway.Data.EntityFramework/QueryObjects/SqlQuery.cs @@ -12,9 +12,9 @@ public class SqlQuery : IQuery public string SqlStatement { get; set; } - public IEnumerable Execute(IDataSource context) + public IEnumerable Execute(IDataSource dataSource) { - if (!(context is DbContext efContext)) + if (!(dataSource is DbContext efContext)) { throw new InvalidOperationException("You cannot execute EF Sql Queries against a non-EF context"); } @@ -25,14 +25,14 @@ public IEnumerable Execute(IDataSource context) } } - public string OutputQuery(IDataSource context) + public string OutputQuery(IDataSource dataSource) { return SqlStatement; } - public string OutputSQLStatement(IDataSource context) + public string OutputSQLStatement(IDataSource dataSource) { - return OutputQuery(context); + return OutputQuery(dataSource); } } } diff --git a/src/Highway.Data.EntityFramework/QueryObjects/SqlScalar.cs b/src/Highway.Data.EntityFramework/QueryObjects/SqlScalar.cs index dd1c2e98..91ec2de6 100644 --- a/src/Highway.Data.EntityFramework/QueryObjects/SqlScalar.cs +++ b/src/Highway.Data.EntityFramework/QueryObjects/SqlScalar.cs @@ -8,9 +8,9 @@ public abstract class SqlScalar : IScalar { protected Func ContextQuery; - public T Execute(IDataSource context) + public T Execute(IDataSource dataSource) { - var efContext = context as DbContext; + var efContext = dataSource as DbContext; using (var conn = new SqlConnection(efContext.Database.Connection.ConnectionString)) { return ContextQuery.Invoke(conn); diff --git a/src/Highway.Data/EventManagement/Interfaces/BaseInterceptor.cs b/src/Highway.Data/EventManagement/Interfaces/BaseInterceptor.cs index 9d4630b5..aadb497d 100644 --- a/src/Highway.Data/EventManagement/Interfaces/BaseInterceptor.cs +++ b/src/Highway.Data/EventManagement/Interfaces/BaseInterceptor.cs @@ -13,10 +13,10 @@ public interface IEventInterceptor : IInterceptor /// /// Executes the interceptors that were applied during the domain creation /// - /// The DataContext that the current interceptor is using + /// The DataContext that the current interceptor is using /// the EventArgs for the current event being intercepted /// - InterceptorResult Apply(IDataSource context, T eventArgs); + InterceptorResult Apply(IDataSource dataSource, T eventArgs); } /// diff --git a/src/Highway.Data/Interfaces/Queries/IQueryBase.cs b/src/Highway.Data/Interfaces/Queries/IQueryBase.cs index 0d1956d9..b4b23c6c 100644 --- a/src/Highway.Data/Interfaces/Queries/IQueryBase.cs +++ b/src/Highway.Data/Interfaces/Queries/IQueryBase.cs @@ -9,8 +9,8 @@ public interface IQueryBase /// This executes the expression against the passed in context to generate the query details, but doesn't execute the /// IQueryable against the data context /// - /// The data context that the query is evaluated and the details are generated against + /// The data context that the query is evaluated and the details are generated against /// The details of the Statement from the Query - string OutputQuery(IDataSource context); + string OutputQuery(IDataSource dataSource); } } diff --git a/src/Highway.Data/Interfaces/Queries/IQuery`1.cs b/src/Highway.Data/Interfaces/Queries/IQuery`1.cs index 743d0136..8eae6a5c 100644 --- a/src/Highway.Data/Interfaces/Queries/IQuery`1.cs +++ b/src/Highway.Data/Interfaces/Queries/IQuery`1.cs @@ -13,8 +13,8 @@ public interface IQuery : IQueryBase /// This executes the expression in ContextQuery on the context that is passed in, resulting in a /// that is returned as an /// - /// the data context that the query should be executed against + /// the data context that the query should be executed against /// The collection of that the query materialized if any - IEnumerable Execute(IDataSource context); + IEnumerable Execute(IDataSource dataSource); } } diff --git a/src/Highway.Data/Interfaces/Queries/IScalar`1.cs b/src/Highway.Data/Interfaces/Queries/IScalar`1.cs index d41a5b7f..47c50f5e 100644 --- a/src/Highway.Data/Interfaces/Queries/IScalar`1.cs +++ b/src/Highway.Data/Interfaces/Queries/IScalar`1.cs @@ -9,8 +9,8 @@ public interface IScalar /// /// Executes the expression against the passed in context /// - /// The data context that the scalar query is executed against + /// The data context that the scalar query is executed against /// The instance of that the query materialized if any - T Execute(IDataSource context); + T Execute(IDataSource dataSource); } } diff --git a/src/Highway.Data/QueryObjects/Command.cs b/src/Highway.Data/QueryObjects/Command.cs index 5865c965..13ff553f 100644 --- a/src/Highway.Data/QueryObjects/Command.cs +++ b/src/Highway.Data/QueryObjects/Command.cs @@ -18,8 +18,8 @@ public class Command : QueryBase, ICommand /// The data context that the command is executed against public virtual void Execute(IDataContext context) { - Context = context; - CheckContextAndQuery(ContextQuery); + DataSource = context; + CheckDataSourceAndQuery(ContextQuery); ContextQuery(context); } } diff --git a/src/Highway.Data/QueryObjects/QueryBase.cs b/src/Highway.Data/QueryObjects/QueryBase.cs index 0d374123..d9b14647 100644 --- a/src/Highway.Data/QueryObjects/QueryBase.cs +++ b/src/Highway.Data/QueryObjects/QueryBase.cs @@ -43,7 +43,7 @@ static QueryBase() /// /// The reference to the that gives data connection /// - protected IDataSource Context { get; set; } + protected IDataSource DataSource { get; set; } /// /// Adds a method to the expression in the query object @@ -64,9 +64,9 @@ public virtual void AddMethodExpression(string methodName, Type[] generics, Expr /// Checks the context and the Query for null /// /// The query to be executed - protected virtual void CheckContextAndQuery(object query) + protected virtual void CheckDataSourceAndQuery(object query) { - if (Context == null) + if (DataSource == null) { throw new InvalidOperationException("DataContext cannot be null."); } diff --git a/src/Highway.Data/QueryObjects/Query`1.cs b/src/Highway.Data/QueryObjects/Query`1.cs index a268b1db..45f3de0f 100644 --- a/src/Highway.Data/QueryObjects/Query`1.cs +++ b/src/Highway.Data/QueryObjects/Query`1.cs @@ -20,18 +20,18 @@ public class Query : QueryBase, IQuery /// This executes the expression in ContextQuery on the context that is passed in, resulting in a /// that is returned as an /// - /// the data context that the query should be executed against + /// the data context that the query should be executed against /// /// /// - public virtual IEnumerable Execute(IDataSource context) + public virtual IEnumerable Execute(IDataSource dataSource) { - return PrepareQuery(context); + return PrepareQuery(dataSource); } - public virtual string OutputQuery(IDataSource context) + public virtual string OutputQuery(IDataSource dataSource) { - var query = PrepareQuery(context); + var query = PrepareQuery(dataSource); return query.ToString(); } @@ -40,11 +40,11 @@ public virtual string OutputQuery(IDataSource context) /// This executes the expression against the passed in context to generate the SQL statement, but doesn't execute the /// IQueryable against the data context /// - /// The data context that the query is evaluated and the SQL is generated against + /// The data context that the query is evaluated and the SQL is generated against /// - public virtual string OutputSQLStatement(IDataSource context) + public virtual string OutputSQLStatement(IDataSource dataSource) { - return OutputQuery(context); + return OutputQuery(dataSource); } /// @@ -71,13 +71,13 @@ protected virtual IQueryable AppendExpressions(IQueryable query) /// an protected virtual IQueryable ExtendQuery() { - return ContextQuery(Context); + return ContextQuery(DataSource); } - protected virtual IQueryable PrepareQuery(IDataSource context) + protected virtual IQueryable PrepareQuery(IDataSource dataSource) { - Context = context; - CheckContextAndQuery(ContextQuery); + DataSource = dataSource; + CheckDataSourceAndQuery(ContextQuery); var query = ExtendQuery(); return AppendExpressions(query); diff --git a/src/Highway.Data/QueryObjects/Query`2.cs b/src/Highway.Data/QueryObjects/Query`2.cs index d08dca53..c47851eb 100644 --- a/src/Highway.Data/QueryObjects/Query`2.cs +++ b/src/Highway.Data/QueryObjects/Query`2.cs @@ -21,18 +21,18 @@ public class Query : QueryBase, IQuery that is returned as an /// - /// the data context that the query should be executed against + /// the data context that the query should be executed against /// /// /// - public virtual IEnumerable Execute(IDataSource context) + public virtual IEnumerable Execute(IDataSource dataSource) { - return PrepareQuery(context); + return PrepareQuery(dataSource); } - public virtual string OutputQuery(IDataSource context) + public virtual string OutputQuery(IDataSource dataSource) { - var query = PrepareQuery(context); + var query = PrepareQuery(dataSource); return query.ToString(); } @@ -62,13 +62,13 @@ protected IQueryable AppendExpressions(IQueryable query /// an protected virtual IQueryable ExtendQuery() { - return Selector(Context); + return Selector(DataSource); } - protected IQueryable PrepareQuery(IDataSource context) + protected IQueryable PrepareQuery(IDataSource dataSource) { - Context = context; - CheckContextAndQuery(Selector); + DataSource = dataSource; + CheckDataSourceAndQuery(Selector); var query = ExtendQuery(); return AppendExpressions(query); diff --git a/src/Highway.Data/QueryObjects/Scalar`1.cs b/src/Highway.Data/QueryObjects/Scalar`1.cs index 872f0428..876d103d 100644 --- a/src/Highway.Data/QueryObjects/Scalar`1.cs +++ b/src/Highway.Data/QueryObjects/Scalar`1.cs @@ -16,14 +16,14 @@ public class Scalar : QueryBase, IScalar /// /// Executes the expression against the passed in context /// - /// The data context that the scalar query is executed against + /// The data context that the scalar query is executed against /// The instance of that the query materialized if any - public T Execute(IDataSource context) + public T Execute(IDataSource dataSource) { - Context = context; - CheckContextAndQuery(ContextQuery); + DataSource = dataSource; + CheckDataSourceAndQuery(ContextQuery); - return ContextQuery(context); + return ContextQuery(dataSource); } } } diff --git a/src/Highway.Data/QueryObjects/Scalar`2.cs b/src/Highway.Data/QueryObjects/Scalar`2.cs index 2bd52a5b..46a5335e 100644 --- a/src/Highway.Data/QueryObjects/Scalar`2.cs +++ b/src/Highway.Data/QueryObjects/Scalar`2.cs @@ -27,22 +27,22 @@ public class Scalar : QueryBase, IScalar /// This executes the expression in ContextQuery on the context that is passed in, resulting in a /// that is returned as an /// - /// the data context that the query should be executed against + /// the data context that the query should be executed against /// /// /// - public virtual TProjection Execute(IDataSource context) + public virtual TProjection Execute(IDataSource dataSource) { - return PrepareQuery(context); + return PrepareQuery(dataSource); } /// /// This executes the expression against the passed in context to generate the SQL statement, but doesn't execute the /// query against the data context. /// - /// The data context that the query is evaluated and the SQL is generated against + /// The data context that the query is evaluated and the SQL is generated against /// - public string OutputQuery(IDataSource context) + public string OutputQuery(IDataSource dataSource) { return ExtendQuery().ToString(); } @@ -71,13 +71,13 @@ protected TProjection AppendExpressions(IQueryable query) /// an protected virtual IQueryable ExtendQuery() { - return Selector(Context); + return Selector(DataSource); } - private TProjection PrepareQuery(IDataSource context) + private TProjection PrepareQuery(IDataSource dataSource) { - Context = context; - CheckContextAndQuery(Selector); + DataSource = dataSource; + CheckDataSourceAndQuery(Selector); var query = ExtendQuery(); return AppendExpressions(query); From c76462d6a7fe6bb5360b83824528076e9f6aac58 Mon Sep 17 00:00:00 2001 From: Eric Burcham Date: Thu, 4 Aug 2022 00:11:56 -0500 Subject: [PATCH 2/5] update from .net Framework 4.5 to 4.5.2, just for ease of working in VS2022. --- .../Highway.Data.EntityFramework.csproj | 6 +++++- .../Highway.Data.ReadonlyTests.csproj | 4 ++++ src/Highway.Data/Highway.Data.csproj | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/Highway.Data.EntityFramework/Highway.Data.EntityFramework.csproj b/src/Highway.Data.EntityFramework/Highway.Data.EntityFramework.csproj index 01c57b7d..b1023b3f 100644 --- a/src/Highway.Data.EntityFramework/Highway.Data.EntityFramework.csproj +++ b/src/Highway.Data.EntityFramework/Highway.Data.EntityFramework.csproj @@ -14,11 +14,15 @@ - netstandard2.1;net45 + netstandard2.1;net452 true Highway.Data + + + + diff --git a/src/Highway.Data.ReadonlyTests/Highway.Data.ReadonlyTests.csproj b/src/Highway.Data.ReadonlyTests/Highway.Data.ReadonlyTests.csproj index 773c9500..8f937fb3 100644 --- a/src/Highway.Data.ReadonlyTests/Highway.Data.ReadonlyTests.csproj +++ b/src/Highway.Data.ReadonlyTests/Highway.Data.ReadonlyTests.csproj @@ -6,6 +6,10 @@ c39235ad-b1cf-4ff5-999d-b7e0cf62b924 + + + + diff --git a/src/Highway.Data/Highway.Data.csproj b/src/Highway.Data/Highway.Data.csproj index d6623517..01328f06 100644 --- a/src/Highway.Data/Highway.Data.csproj +++ b/src/Highway.Data/Highway.Data.csproj @@ -14,7 +14,7 @@ - netstandard2.1;net45 + netstandard2.1;net452 true From 2c7b03fd5181d5fa38c61892639eb817a53185e6 Mon Sep 17 00:00:00 2001 From: Eric Burcham Date: Thu, 4 Aug 2022 00:19:29 -0500 Subject: [PATCH 3/5] rename 'data context' to 'data source' in appropriate comments. --- .../QueryObjects/AdvancedQuery.cs | 6 +++--- .../QueryObjects/AdvancedScalar.cs | 2 +- .../EventManagement/Interfaces/BaseInterceptor.cs | 2 +- src/Highway.Data/Interfaces/Queries/IQueryBase.cs | 4 ++-- src/Highway.Data/Interfaces/Queries/IQuery`1.cs | 2 +- src/Highway.Data/Interfaces/Queries/IScalar`1.cs | 2 +- src/Highway.Data/QueryObjects/Query`1.cs | 6 +++--- src/Highway.Data/QueryObjects/Query`2.cs | 2 +- src/Highway.Data/QueryObjects/Scalar`1.cs | 2 +- src/Highway.Data/QueryObjects/Scalar`2.cs | 6 +++--- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Highway.Data.EntityFramework/QueryObjects/AdvancedQuery.cs b/src/Highway.Data.EntityFramework/QueryObjects/AdvancedQuery.cs index abbfa6ce..69f8a760 100644 --- a/src/Highway.Data.EntityFramework/QueryObjects/AdvancedQuery.cs +++ b/src/Highway.Data.EntityFramework/QueryObjects/AdvancedQuery.cs @@ -19,7 +19,7 @@ public class AdvancedQuery : QueryBase, IQuery /// This executes the expression in ContextQuery on the context that is passed in, resulting in a /// that is returned as an /// - /// the data context that the query should be executed against + /// the data source that the query should be executed against /// /// /// @@ -88,7 +88,7 @@ public class AdvancedQuery : QueryBase, IQuery that is returned as an /// - /// the data context that the query should be executed against + /// the data source that the query should be executed against /// /// /// @@ -134,7 +134,7 @@ protected virtual IQueryable ExtendQuery() /// /// Appends the projection to the query and prepares it for execution /// - /// the context to prepare against + /// the source to prepare against /// The prepared but un-executed queryable protected virtual IQueryable PrepareQuery(IDataSource dataSource) { diff --git a/src/Highway.Data.EntityFramework/QueryObjects/AdvancedScalar.cs b/src/Highway.Data.EntityFramework/QueryObjects/AdvancedScalar.cs index 495beeba..31e82e61 100644 --- a/src/Highway.Data.EntityFramework/QueryObjects/AdvancedScalar.cs +++ b/src/Highway.Data.EntityFramework/QueryObjects/AdvancedScalar.cs @@ -16,7 +16,7 @@ public class AdvancedScalar : QueryBase, IScalar /// /// Executes the expression against the passed in context /// - /// The data context that the scalar query is executed against + /// The data source that the scalar query is executed against /// The instance of that the query materialized if any public T Execute(IDataSource dataSource) { diff --git a/src/Highway.Data/EventManagement/Interfaces/BaseInterceptor.cs b/src/Highway.Data/EventManagement/Interfaces/BaseInterceptor.cs index aadb497d..ceea1ac0 100644 --- a/src/Highway.Data/EventManagement/Interfaces/BaseInterceptor.cs +++ b/src/Highway.Data/EventManagement/Interfaces/BaseInterceptor.cs @@ -13,7 +13,7 @@ public interface IEventInterceptor : IInterceptor /// /// Executes the interceptors that were applied during the domain creation /// - /// The DataContext that the current interceptor is using + /// The data source that the current interceptor is using /// the EventArgs for the current event being intercepted /// InterceptorResult Apply(IDataSource dataSource, T eventArgs); diff --git a/src/Highway.Data/Interfaces/Queries/IQueryBase.cs b/src/Highway.Data/Interfaces/Queries/IQueryBase.cs index b4b23c6c..f035022c 100644 --- a/src/Highway.Data/Interfaces/Queries/IQueryBase.cs +++ b/src/Highway.Data/Interfaces/Queries/IQueryBase.cs @@ -7,9 +7,9 @@ public interface IQueryBase { /// /// This executes the expression against the passed in context to generate the query details, but doesn't execute the - /// IQueryable against the data context + /// IQueryable against the data source /// - /// The data context that the query is evaluated and the details are generated against + /// The data source that the query is evaluated and the details are generated against /// The details of the Statement from the Query string OutputQuery(IDataSource dataSource); } diff --git a/src/Highway.Data/Interfaces/Queries/IQuery`1.cs b/src/Highway.Data/Interfaces/Queries/IQuery`1.cs index 8eae6a5c..91aa1f53 100644 --- a/src/Highway.Data/Interfaces/Queries/IQuery`1.cs +++ b/src/Highway.Data/Interfaces/Queries/IQuery`1.cs @@ -13,7 +13,7 @@ public interface IQuery : IQueryBase /// This executes the expression in ContextQuery on the context that is passed in, resulting in a /// that is returned as an /// - /// the data context that the query should be executed against + /// the data source that the query should be executed against /// The collection of that the query materialized if any IEnumerable Execute(IDataSource dataSource); } diff --git a/src/Highway.Data/Interfaces/Queries/IScalar`1.cs b/src/Highway.Data/Interfaces/Queries/IScalar`1.cs index 47c50f5e..958880cc 100644 --- a/src/Highway.Data/Interfaces/Queries/IScalar`1.cs +++ b/src/Highway.Data/Interfaces/Queries/IScalar`1.cs @@ -9,7 +9,7 @@ public interface IScalar /// /// Executes the expression against the passed in context /// - /// The data context that the scalar query is executed against + /// The data source that the scalar query is executed against /// The instance of that the query materialized if any T Execute(IDataSource dataSource); } diff --git a/src/Highway.Data/QueryObjects/Query`1.cs b/src/Highway.Data/QueryObjects/Query`1.cs index 45f3de0f..8fc6655a 100644 --- a/src/Highway.Data/QueryObjects/Query`1.cs +++ b/src/Highway.Data/QueryObjects/Query`1.cs @@ -20,7 +20,7 @@ public class Query : QueryBase, IQuery /// This executes the expression in ContextQuery on the context that is passed in, resulting in a /// that is returned as an /// - /// the data context that the query should be executed against + /// the data source that the query should be executed against /// /// /// @@ -38,9 +38,9 @@ public virtual string OutputQuery(IDataSource dataSource) /// /// This executes the expression against the passed in context to generate the SQL statement, but doesn't execute the - /// IQueryable against the data context + /// IQueryable against the data source /// - /// The data context that the query is evaluated and the SQL is generated against + /// The data source that the query is evaluated and the SQL is generated against /// public virtual string OutputSQLStatement(IDataSource dataSource) { diff --git a/src/Highway.Data/QueryObjects/Query`2.cs b/src/Highway.Data/QueryObjects/Query`2.cs index c47851eb..5d364998 100644 --- a/src/Highway.Data/QueryObjects/Query`2.cs +++ b/src/Highway.Data/QueryObjects/Query`2.cs @@ -21,7 +21,7 @@ public class Query : QueryBase, IQuery that is returned as an /// - /// the data context that the query should be executed against + /// the data source that the query should be executed against /// /// /// diff --git a/src/Highway.Data/QueryObjects/Scalar`1.cs b/src/Highway.Data/QueryObjects/Scalar`1.cs index 876d103d..efba728d 100644 --- a/src/Highway.Data/QueryObjects/Scalar`1.cs +++ b/src/Highway.Data/QueryObjects/Scalar`1.cs @@ -16,7 +16,7 @@ public class Scalar : QueryBase, IScalar /// /// Executes the expression against the passed in context /// - /// The data context that the scalar query is executed against + /// The data source that the scalar query is executed against /// The instance of that the query materialized if any public T Execute(IDataSource dataSource) { diff --git a/src/Highway.Data/QueryObjects/Scalar`2.cs b/src/Highway.Data/QueryObjects/Scalar`2.cs index 46a5335e..812e3f87 100644 --- a/src/Highway.Data/QueryObjects/Scalar`2.cs +++ b/src/Highway.Data/QueryObjects/Scalar`2.cs @@ -27,7 +27,7 @@ public class Scalar : QueryBase, IScalar /// This executes the expression in ContextQuery on the context that is passed in, resulting in a /// that is returned as an /// - /// the data context that the query should be executed against + /// the data source that the query should be executed against /// /// /// @@ -38,9 +38,9 @@ public virtual TProjection Execute(IDataSource dataSource) /// /// This executes the expression against the passed in context to generate the SQL statement, but doesn't execute the - /// query against the data context. + /// query against the data source. /// - /// The data context that the query is evaluated and the SQL is generated against + /// The data source that the query is evaluated and the SQL is generated against /// public string OutputQuery(IDataSource dataSource) { From a3d13401be9cb8aad7d1f66565f25a63b8dc7241 Mon Sep 17 00:00:00 2001 From: Eric Burcham Date: Tue, 11 Apr 2023 15:55:37 -0500 Subject: [PATCH 4/5] Update all nuget package versions --- .config/dotnet-tools.json | 2 +- .../Highway.Data.EntityFramework.Test.csproj | 40 +++++++-------- .../Highway.Data.EntityFramework.csproj | 8 +-- .../Highway.Data.ReadonlyTests.csproj | 50 +++++++++---------- .../Highway.Data.Test.csproj | 27 +++++----- src/Highway.Data/Highway.Data.csproj | 46 ++++++++--------- 6 files changed, 84 insertions(+), 89 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 31e896e9..831d039b 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "cake.tool": { - "version": "2.0.0", + "version": "3.0.0", "commands": [ "dotnet-cake" ] diff --git a/src/Highway.Data.EntityFramework.Test/Highway.Data.EntityFramework.Test.csproj b/src/Highway.Data.EntityFramework.Test/Highway.Data.EntityFramework.Test.csproj index ed223f30..bf77eb0e 100644 --- a/src/Highway.Data.EntityFramework.Test/Highway.Data.EntityFramework.Test.csproj +++ b/src/Highway.Data.EntityFramework.Test/Highway.Data.EntityFramework.Test.csproj @@ -1,29 +1,25 @@  - - net5.0 + + net5.0 - false - + false + - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + + + + + + + - - - - - + + + + + diff --git a/src/Highway.Data.EntityFramework/Highway.Data.EntityFramework.csproj b/src/Highway.Data.EntityFramework/Highway.Data.EntityFramework.csproj index b1023b3f..70221243 100644 --- a/src/Highway.Data.EntityFramework/Highway.Data.EntityFramework.csproj +++ b/src/Highway.Data.EntityFramework/Highway.Data.EntityFramework.csproj @@ -1,10 +1,10 @@  - 8.0.0-Beta2 + 8.0.0-Beta3 Tim Rayburn, Devlin Liles The fastest and smoothest way to good architecture. - 2012-2022 Devlin Liles + 2012-2023 Devlin Liles MIT http://hwyfwk.com https://github.com/highwayframework/highway.data @@ -14,7 +14,7 @@ - netstandard2.1;net452 + netstandard2.1;net462 true Highway.Data @@ -29,7 +29,7 @@ - + diff --git a/src/Highway.Data.ReadonlyTests/Highway.Data.ReadonlyTests.csproj b/src/Highway.Data.ReadonlyTests/Highway.Data.ReadonlyTests.csproj index 8f937fb3..21150467 100644 --- a/src/Highway.Data.ReadonlyTests/Highway.Data.ReadonlyTests.csproj +++ b/src/Highway.Data.ReadonlyTests/Highway.Data.ReadonlyTests.csproj @@ -1,32 +1,32 @@  - - false - net5.0 - c39235ad-b1cf-4ff5-999d-b7e0cf62b924 - + + false + net5.0 + c39235ad-b1cf-4ff5-999d-b7e0cf62b924 + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + diff --git a/src/Highway.Data.Test/Highway.Data.Test.csproj b/src/Highway.Data.Test/Highway.Data.Test.csproj index fc8e15b7..9cce6aa8 100644 --- a/src/Highway.Data.Test/Highway.Data.Test.csproj +++ b/src/Highway.Data.Test/Highway.Data.Test.csproj @@ -1,21 +1,20 @@  - - net5.0 + + net5.0 - false - + false + - - - - - - - + + + + + + - - - + + + diff --git a/src/Highway.Data/Highway.Data.csproj b/src/Highway.Data/Highway.Data.csproj index 01328f06..11943b59 100644 --- a/src/Highway.Data/Highway.Data.csproj +++ b/src/Highway.Data/Highway.Data.csproj @@ -1,31 +1,31 @@  - - 8.0.0-Beta2 - Tim Rayburn, Devlin Liles - The fastest and smoothest way to good architecture. - 2012-2022 Devlin Liles - MIT - http://hwyfwk.com - https://github.com/highwayframework/highway.data - Architecture ORM Repository Specification Productivity - - icon.png - + + 8.0.0-Beta3 + Tim Rayburn, Devlin Liles + The fastest and smoothest way to good architecture. + 2012-2023 Devlin Liles + MIT + http://hwyfwk.com + https://github.com/highwayframework/highway.data + Architecture ORM Repository Specification Productivity + + icon.png + - - netstandard2.1;net452 - true - + + netstandard2.1;net462 + true + - - - + + + - - - - + + + + From 671f39a49c50c317228817d54d80190d108048de Mon Sep 17 00:00:00 2001 From: Eric Burcham Date: Tue, 11 Apr 2023 16:00:46 -0500 Subject: [PATCH 5/5] merge from upstream/master and resolve conflicts --- .../Highway.Data.EntityFramework.Test.csproj | 44 +++++++------- .../Highway.Data.EntityFramework.csproj | 60 +++++++++---------- .../Highway.Data.ReadonlyTests.csproj | 50 ++++++++-------- .../Highway.Data.Test.csproj | 34 +++++------ src/Highway.Data/Highway.Data.csproj | 46 +++++++------- 5 files changed, 117 insertions(+), 117 deletions(-) diff --git a/src/Highway.Data.EntityFramework.Test/Highway.Data.EntityFramework.Test.csproj b/src/Highway.Data.EntityFramework.Test/Highway.Data.EntityFramework.Test.csproj index c4a43500..ffba2f49 100644 --- a/src/Highway.Data.EntityFramework.Test/Highway.Data.EntityFramework.Test.csproj +++ b/src/Highway.Data.EntityFramework.Test/Highway.Data.EntityFramework.Test.csproj @@ -1,29 +1,29 @@  - - net5.0 + + net5.0 - false - + false + - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - - - + + + + + diff --git a/src/Highway.Data.EntityFramework/Highway.Data.EntityFramework.csproj b/src/Highway.Data.EntityFramework/Highway.Data.EntityFramework.csproj index 2ed16708..0dd82c0c 100644 --- a/src/Highway.Data.EntityFramework/Highway.Data.EntityFramework.csproj +++ b/src/Highway.Data.EntityFramework/Highway.Data.EntityFramework.csproj @@ -1,39 +1,39 @@  - - 8.0.0-Beta3 - Tim Rayburn, Devlin Liles - The fastest and smoothest way to good architecture. - 2012-2023 Devlin Liles - MIT - http://hwyfwk.com - https://github.com/highwayframework/highway.data - Architecture ORM Repository Specification Productivity - - icon.png - + + 8.0.0-Beta3 + Tim Rayburn, Devlin Liles + The fastest and smoothest way to good architecture. + 2012-2023 Devlin Liles + MIT + http://hwyfwk.com + https://github.com/highwayframework/highway.data + Architecture ORM Repository Specification Productivity + + icon.png + - - netstandard2.1;net462 - true - Highway.Data - + + netstandard2.1;net462 + true + Highway.Data + - - - + + + - - - + + + - - - - + + + + - - - + + + diff --git a/src/Highway.Data.ReadonlyTests/Highway.Data.ReadonlyTests.csproj b/src/Highway.Data.ReadonlyTests/Highway.Data.ReadonlyTests.csproj index 940b4aca..18988d57 100644 --- a/src/Highway.Data.ReadonlyTests/Highway.Data.ReadonlyTests.csproj +++ b/src/Highway.Data.ReadonlyTests/Highway.Data.ReadonlyTests.csproj @@ -1,32 +1,32 @@  - - false - net5.0 - c39235ad-b1cf-4ff5-999d-b7e0cf62b924 - + + false + net5.0 + c39235ad-b1cf-4ff5-999d-b7e0cf62b924 + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + diff --git a/src/Highway.Data.Test/Highway.Data.Test.csproj b/src/Highway.Data.Test/Highway.Data.Test.csproj index 507fd211..18873e46 100644 --- a/src/Highway.Data.Test/Highway.Data.Test.csproj +++ b/src/Highway.Data.Test/Highway.Data.Test.csproj @@ -1,24 +1,24 @@  - - net5.0 + + net5.0 - false - + false + - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - + + + diff --git a/src/Highway.Data/Highway.Data.csproj b/src/Highway.Data/Highway.Data.csproj index 5a3a14d3..5028e0fc 100644 --- a/src/Highway.Data/Highway.Data.csproj +++ b/src/Highway.Data/Highway.Data.csproj @@ -1,31 +1,31 @@  - - 8.0.0-Beta3 - Tim Rayburn, Devlin Liles - The fastest and smoothest way to good architecture. - 2012-2023 Devlin Liles - MIT - http://hwyfwk.com - https://github.com/highwayframework/highway.data - Architecture ORM Repository Specification Productivity - - icon.png - + + 8.0.0-Beta3 + Tim Rayburn, Devlin Liles + The fastest and smoothest way to good architecture. + 2012-2023 Devlin Liles + MIT + http://hwyfwk.com + https://github.com/highwayframework/highway.data + Architecture ORM Repository Specification Productivity + + icon.png + - - netstandard2.1;net462 - true - + + netstandard2.1;net462 + true + - - - + + + - - - - + + + +