-
Notifications
You must be signed in to change notification settings - Fork 228
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Map List<T> operations to PostgreSQL arrays
- Note: Includes type handler file renames from "Npgsq*" to "Npgsql*"
- This could be split into another patch.
- First goal: feature parity with mapped `T[]` operations.
- 8 of 10 unit tests passing:
- Passes
- Roundtrip
- SequenceEqual
- Length/Count
- Contains/Any
- Issues:
- Blocked by #430
- There should be a better system for these types of mappings.
- Along the lines of `IMethodCallTranslator`.- Loading branch information
1 parent
cfb63d8
commit 470e8fc
Showing
14 changed files
with
488 additions
and
121 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlListMemberTranslator.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| using System.Collections; | ||
| using System.Collections.Generic; | ||
| using System.Linq.Expressions; | ||
| using JetBrains.Annotations; | ||
| using Microsoft.EntityFrameworkCore.Query.Expressions; | ||
| using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; | ||
|
|
||
| namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query.ExpressionTranslators.Internal | ||
| { | ||
| /// <summary> | ||
| /// Provides translation services for <see cref="List{T}"/> members as PostgreSQL array operators. | ||
| /// </summary> | ||
| /// <remarks> | ||
| /// See: https://www.postgresql.org/docs/current/static/functions-array.html | ||
| /// </remarks> | ||
| public class NpgsqlListMemberTranslator : IMemberTranslator | ||
| { | ||
| /// <inheritdoc /> | ||
| [CanBeNull] | ||
| public virtual Expression Translate(MemberExpression expression) | ||
| { | ||
| if (!typeof(IList).IsAssignableFrom(expression.Expression.Type)) | ||
| return null; | ||
|
|
||
| switch (expression.Member.Name) | ||
| { | ||
| case nameof(IList.Count): | ||
| return new SqlFunctionExpression("array_length", expression.Type, new[] { expression.Expression }); | ||
|
|
||
| default: | ||
| return null; | ||
| } | ||
| } | ||
| } | ||
| } |
90 changes: 90 additions & 0 deletions
90
src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlListTranslator.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| #region License | ||
|
|
||
| // The PostgreSQL License | ||
| // | ||
| // Copyright (C) 2016 The Npgsql Development Team | ||
| // | ||
| // Permission to use, copy, modify, and distribute this software and its | ||
| // documentation for any purpose, without fee, and without a written | ||
| // agreement is hereby granted, provided that the above copyright notice | ||
| // and this paragraph and the following two paragraphs appear in all copies. | ||
| // | ||
| // IN NO EVENT SHALL THE NPGSQL DEVELOPMENT TEAM BE LIABLE TO ANY PARTY | ||
| // FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, | ||
| // INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS | ||
| // DOCUMENTATION, EVEN IF THE NPGSQL DEVELOPMENT TEAM HAS BEEN ADVISED OF | ||
| // THE POSSIBILITY OF SUCH DAMAGE. | ||
| // | ||
| // THE NPGSQL DEVELOPMENT TEAM SPECIFICALLY DISCLAIMS ANY WARRANTIES, | ||
| // INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY | ||
| // AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS | ||
| // ON AN "AS IS" BASIS, AND THE NPGSQL DEVELOPMENT TEAM HAS NO OBLIGATIONS | ||
| // TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. | ||
|
|
||
| #endregion | ||
|
|
||
| using System; | ||
| using System.Collections; | ||
| using System.Collections.Generic; | ||
| using System.Linq.Expressions; | ||
| using JetBrains.Annotations; | ||
| using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; | ||
|
|
||
| namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query.ExpressionTranslators.Internal | ||
| { | ||
| /// <summary> | ||
| /// Provides translation services for <see cref="List{T}"/> methods as PostgreSQL array operators. | ||
| /// </summary> | ||
| /// <remarks> | ||
| /// See: https://www.postgresql.org/docs/current/static/functions-array.html | ||
| /// </remarks> | ||
| public class NpgsqlListTranslator : IMethodCallTranslator | ||
| { | ||
| /// <inheritdoc /> | ||
| [CanBeNull] | ||
| public Expression Translate(MethodCallExpression expression) | ||
| { | ||
| if (!typeof(IList).IsAssignableFrom(expression.Method.DeclaringType)) | ||
| return null; | ||
|
|
||
| switch (expression.Method.Name) | ||
| { | ||
| // case nameof(NpgsqlListExtensions.Contains): | ||
| // return new CustomBinaryExpression(expression.Arguments[0], expression.Arguments[1], "@>", typeof(bool)); | ||
| // | ||
| // case nameof(NpgsqlListExtensions.ContainedBy): | ||
| // return new CustomBinaryExpression(expression.Arguments[0], expression.Arguments[1], "<@", typeof(bool)); | ||
| // | ||
| // case nameof(NpgsqlListExtensions.Overlaps): | ||
| // return new CustomBinaryExpression(expression.Arguments[0], expression.Arguments[1], "&&", typeof(bool)); | ||
| // | ||
| // case nameof(NpgsqlListExtensions.IsStrictlyLeftOf): | ||
| // return new CustomBinaryExpression(expression.Arguments[0], expression.Arguments[1], "<<", typeof(bool)); | ||
| // | ||
| // case nameof(NpgsqlListExtensions.IsStrictlyRightOf): | ||
| // return new CustomBinaryExpression(expression.Arguments[0], expression.Arguments[1], ">>", typeof(bool)); | ||
| // | ||
| // case nameof(NpgsqlListExtensions.DoesNotExtendRightOf): | ||
| // return new CustomBinaryExpression(expression.Arguments[0], expression.Arguments[1], "&<", typeof(bool)); | ||
| // | ||
| // case nameof(NpgsqlListExtensions.DoesNotExtendLeftOf): | ||
| // return new CustomBinaryExpression(expression.Arguments[0], expression.Arguments[1], "&>", typeof(bool)); | ||
| // | ||
| // case nameof(NpgsqlListExtensions.IsAdjacentTo): | ||
| // return new CustomBinaryExpression(expression.Arguments[0], expression.Arguments[1], "-|-", typeof(bool)); | ||
| // | ||
| // case nameof(NpgsqlListExtensions.Union): | ||
| // return new CustomBinaryExpression(expression.Arguments[0], expression.Arguments[1], "+", expression.Arguments[0].Type); | ||
| // | ||
| // case nameof(NpgsqlListExtensions.Intersect): | ||
| // return new CustomBinaryExpression(expression.Arguments[0], expression.Arguments[1], "*", expression.Arguments[0].Type); | ||
| // | ||
| // case nameof(NpgsqlListExtensions.Except): | ||
| // return new CustomBinaryExpression(expression.Arguments[0], expression.Arguments[1], "-", expression.Arguments[0].Type); | ||
|
|
||
| default: | ||
| return null; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.