From 8273bac8172d0ab1006f09c37489e090ded597fe Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Fri, 25 Sep 2026 16:09:52 +0500 Subject: [PATCH 1/5] Move PostgresqlSqlDml components to Sql.Dml namespace and folder And also reorganize Sql namespace to several folders: - Create nes Dml folder for PostgresqlSqlDml components - Create folder for drivers --- .../Orm.Providers.PostgreSql/NpgsqlBoxCompilers.cs | 3 ++- .../Orm.Providers.PostgreSql/NpgsqlCircleCompilers.cs | 3 ++- .../Orm.Providers.PostgreSql/NpgsqlLSegCompilers.cs | 3 ++- .../Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs | 1 + .../Orm.Providers.PostgreSql/NpgsqlPointCompilers.cs | 3 ++- .../Orm.Providers.PostgreSql/NpgsqlPolygonCompilers.cs | 3 ++- .../Orm.Providers.PostgreSql/SqlCompiler.cs | 1 + .../Dml}/PostgresqlSqlDml.cs | 2 +- .../Dml}/PostgresqlSqlFunctionType.cs | 2 +- .../Drivers.PostgreSql}/Connection.cs | 0 .../Drivers.PostgreSql}/Driver.cs | 0 .../Drivers.PostgreSql}/DriverFactory.cs | 0 .../Drivers.PostgreSql}/PostgreServerInfo.cs | 0 .../Drivers.PostgreSql}/PostgreSqlHelper.cs | 0 .../Drivers.PostgreSql}/PostgreSqlTypeMapper.cs | 0 .../Drivers.PostgreSql}/RelOptions.cs | 0 .../Drivers.PostgreSql}/Resources/Strings.Designer.cs | 0 .../Drivers.PostgreSql}/Resources/Strings.resx | 0 .../Drivers.PostgreSql}/v11_0/BoxMapper.cs | 0 .../Drivers.PostgreSql}/v11_0/CircleMapper.cs | 0 .../Drivers.PostgreSql}/v11_0/Compiler.cs | 5 ++--- .../Drivers.PostgreSql}/v11_0/CustomSqlType.cs | 0 .../Drivers.PostgreSql}/v11_0/Driver.cs | 0 .../Drivers.PostgreSql}/v11_0/Extractor.cs | 0 .../Drivers.PostgreSql}/v11_0/LSegMapper.cs | 0 .../Drivers.PostgreSql}/v11_0/PathMapper.cs | 0 .../Drivers.PostgreSql}/v11_0/PointMapper.cs | 0 .../Drivers.PostgreSql}/v11_0/PolygonMapper.cs | 0 .../Drivers.PostgreSql}/v11_0/ServerInfoProvider.cs | 0 .../Drivers.PostgreSql}/v11_0/Translator.cs | 0 .../Drivers.PostgreSql}/v11_0/TypeMapper.cs | 0 .../Drivers.PostgreSql}/v12_0/Compiler.cs | 0 .../Drivers.PostgreSql}/v12_0/Driver.cs | 0 .../Drivers.PostgreSql}/v12_0/Extractor.cs | 0 .../Drivers.PostgreSql}/v12_0/ServerInfoProvider.cs | 0 .../Drivers.PostgreSql}/v12_0/Translator.cs | 0 .../Drivers.PostgreSql}/v12_0/TypeMapper.cs | 0 Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj | 4 ++-- 38 files changed, 18 insertions(+), 12 deletions(-) rename Orm/Xtensive.Orm.PostgreSql/{Orm.Providers.PostgreSql => Sql/Dml}/PostgresqlSqlDml.cs (99%) rename Orm/Xtensive.Orm.PostgreSql/{Orm.Providers.PostgreSql => Sql/Dml}/PostgresqlSqlFunctionType.cs (99%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/Connection.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/Driver.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/DriverFactory.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/PostgreServerInfo.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/PostgreSqlHelper.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/PostgreSqlTypeMapper.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/RelOptions.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/Resources/Strings.Designer.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/Resources/Strings.resx (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v11_0/BoxMapper.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v11_0/CircleMapper.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v11_0/Compiler.cs (99%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v11_0/CustomSqlType.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v11_0/Driver.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v11_0/Extractor.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v11_0/LSegMapper.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v11_0/PathMapper.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v11_0/PointMapper.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v11_0/PolygonMapper.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v11_0/ServerInfoProvider.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v11_0/Translator.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v11_0/TypeMapper.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v12_0/Compiler.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v12_0/Driver.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v12_0/Extractor.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v12_0/ServerInfoProvider.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v12_0/Translator.cs (100%) rename Orm/Xtensive.Orm.PostgreSql/{Sql.Drivers.PostgreSql => Sql/Drivers.PostgreSql}/v12_0/TypeMapper.cs (100%) diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlBoxCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlBoxCompilers.cs index 09b2169507..b10c721a4a 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlBoxCompilers.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlBoxCompilers.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2020 Xtensive LLC. +// Copyright (C) 2014-2026 Xtensive LLC. // This code is distributed under MIT license terms. // See the License.txt file in the project root for more information. // Created by: Alena Mikshina @@ -6,6 +6,7 @@ using NpgsqlTypes; using Xtensive.Sql.Dml; +using Xtensive.Sql.Dml.PostgreSql; using Operator = Xtensive.Reflection.WellKnown.Operator; namespace Xtensive.Orm.Providers.PostgreSql diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlCircleCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlCircleCompilers.cs index 5e4d1123f2..42d174414c 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlCircleCompilers.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlCircleCompilers.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2020 Xtensive LLC. +// Copyright (C) 2014-2026 Xtensive LLC. // This code is distributed under MIT license terms. // See the License.txt file in the project root for more information. // Created by: Alena Mikshina @@ -6,6 +6,7 @@ using NpgsqlTypes; using Xtensive.Sql.Dml; +using Xtensive.Sql.Dml.PostgreSql; using Operator = Xtensive.Reflection.WellKnown.Operator; namespace Xtensive.Orm.Providers.PostgreSql diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlLSegCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlLSegCompilers.cs index 6f22298de7..46177d7d2a 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlLSegCompilers.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlLSegCompilers.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2020 Xtensive LLC. +// Copyright (C) 2014-2026 Xtensive LLC. // This code is distributed under MIT license terms. // See the License.txt file in the project root for more information. // Created by: Alena Mikshina @@ -6,6 +6,7 @@ using NpgsqlTypes; using Xtensive.Sql.Dml; +using Xtensive.Sql.Dml.PostgreSql; using Operator = Xtensive.Reflection.WellKnown.Operator; namespace Xtensive.Orm.Providers.PostgreSql diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs index 4f8ada0aa5..1ecbbf0f74 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs @@ -6,6 +6,7 @@ using NpgsqlTypes; using Xtensive.Sql.Dml; +using Xtensive.Sql.Dml.PostgreSql; namespace Xtensive.Orm.Providers.PostgreSql { diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPointCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPointCompilers.cs index 1870b57751..86c59f2bd3 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPointCompilers.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPointCompilers.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2020 Xtensive LLC. +// Copyright (C) 2014-2026 Xtensive LLC. // This code is distributed under MIT license terms. // See the License.txt file in the project root for more information. // Created by: Alena Mikshina @@ -6,6 +6,7 @@ using NpgsqlTypes; using Xtensive.Sql.Dml; +using Xtensive.Sql.Dml.PostgreSql; using Operator = Xtensive.Reflection.WellKnown.Operator; namespace Xtensive.Orm.Providers.PostgreSql diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPolygonCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPolygonCompilers.cs index 7b45156ce6..d1fac7f3bc 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPolygonCompilers.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPolygonCompilers.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2020 Xtensive LLC. +// Copyright (C) 2014-2026 Xtensive LLC. // This code is distributed under MIT license terms. // See the License.txt file in the project root for more information. // Created by: Alena Mikshina @@ -6,6 +6,7 @@ using NpgsqlTypes; using Xtensive.Sql.Dml; +using Xtensive.Sql.Dml.PostgreSql; using Operator = Xtensive.Reflection.WellKnown.Operator; namespace Xtensive.Orm.Providers.PostgreSql diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/SqlCompiler.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/SqlCompiler.cs index 6de659947f..44a202f298 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/SqlCompiler.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/SqlCompiler.cs @@ -14,6 +14,7 @@ using Xtensive.Reflection.PostgreSql; using Xtensive.Sql; using Xtensive.Sql.Dml; +using Xtensive.Sql.Dml.PostgreSql; namespace Xtensive.Orm.Providers.PostgreSql { diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/PostgresqlSqlDml.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Dml/PostgresqlSqlDml.cs similarity index 99% rename from Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/PostgresqlSqlDml.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Dml/PostgresqlSqlDml.cs index 2a530e46b8..b0b16346a4 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/PostgresqlSqlDml.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Sql/Dml/PostgresqlSqlDml.cs @@ -9,7 +9,7 @@ using Xtensive.Sql; using Xtensive.Sql.Dml; -namespace Xtensive.Orm.Providers.PostgreSql +namespace Xtensive.Sql.Dml.PostgreSql { /// /// A factory for SQL DML operations for Postgresql DBMS. diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/PostgresqlSqlFunctionType.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Dml/PostgresqlSqlFunctionType.cs similarity index 99% rename from Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/PostgresqlSqlFunctionType.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Dml/PostgresqlSqlFunctionType.cs index 6332f2fe2e..8779b59dbd 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/PostgresqlSqlFunctionType.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Sql/Dml/PostgresqlSqlFunctionType.cs @@ -6,7 +6,7 @@ using Xtensive.Sql.Dml; -namespace Xtensive.Orm.Providers.PostgreSql +namespace Xtensive.Sql.Dml.PostgreSql { /// /// Contains additional provider-specific SQL functions. diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Connection.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Connection.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Connection.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Connection.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Driver.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Driver.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Driver.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Driver.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/DriverFactory.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/DriverFactory.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/DriverFactory.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/DriverFactory.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/PostgreServerInfo.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/PostgreServerInfo.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/PostgreServerInfo.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/PostgreServerInfo.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/PostgreSqlHelper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/PostgreSqlHelper.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/PostgreSqlHelper.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/PostgreSqlHelper.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/PostgreSqlTypeMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/PostgreSqlTypeMapper.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/PostgreSqlTypeMapper.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/PostgreSqlTypeMapper.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/RelOptions.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/RelOptions.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/RelOptions.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/RelOptions.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Resources/Strings.Designer.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Resources/Strings.Designer.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Resources/Strings.Designer.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Resources/Strings.Designer.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Resources/Strings.resx b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Resources/Strings.resx similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Resources/Strings.resx rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Resources/Strings.resx diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/BoxMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/BoxMapper.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/BoxMapper.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/BoxMapper.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/CircleMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/CircleMapper.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/CircleMapper.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/CircleMapper.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Compiler.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Compiler.cs similarity index 99% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Compiler.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Compiler.cs index 3b7262696f..64a3d2cf2a 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Compiler.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Compiler.cs @@ -8,9 +8,8 @@ using Xtensive.Sql.Compiler; using Xtensive.Sql.Ddl; using Xtensive.Sql.Dml; +using Xtensive.Sql.Dml.PostgreSql; using Xtensive.Sql.Model; -using Xtensive.Sql.Drivers.PostgreSql.Resources; -using Xtensive.Orm.Providers.PostgreSql; using SqlCompiler = Xtensive.Sql.Compiler.SqlCompiler; namespace Xtensive.Sql.Drivers.PostgreSql.v11_0 @@ -789,7 +788,7 @@ public override void Visit(SqlCreateIndex node, IndexColumn item) public override void Visit(SqlFreeTextTable node) { if (node.TargetColumns.Count != 1 || node.TargetColumns[0] != node.TargetTable.Asterisk) { - throw new NotSupportedException(Strings.ExFreeTextSearchOnCustomColumnsNotSupported); + throw new NotSupportedException(Resources.Strings.ExFreeTextSearchOnCustomColumnsNotSupported); } var fullTextIndex = node.TargetTable.DataTable.Indexes.OfType().Single(); diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/CustomSqlType.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/CustomSqlType.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/CustomSqlType.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/CustomSqlType.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Driver.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Driver.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Driver.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Driver.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Extractor.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Extractor.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Extractor.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Extractor.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/LSegMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/LSegMapper.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/LSegMapper.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/LSegMapper.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/PathMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/PathMapper.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/PathMapper.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/PathMapper.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/PointMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/PointMapper.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/PointMapper.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/PointMapper.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/PolygonMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/PolygonMapper.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/PolygonMapper.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/PolygonMapper.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/ServerInfoProvider.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/ServerInfoProvider.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/ServerInfoProvider.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/ServerInfoProvider.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Translator.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Translator.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Translator.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Translator.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/TypeMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/TypeMapper.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/TypeMapper.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/TypeMapper.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/Compiler.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/Compiler.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/Compiler.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/Compiler.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/Driver.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/Driver.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/Driver.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/Driver.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/Extractor.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/Extractor.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/Extractor.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/Extractor.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/ServerInfoProvider.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/ServerInfoProvider.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/ServerInfoProvider.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/ServerInfoProvider.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/Translator.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/Translator.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/Translator.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/Translator.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/TypeMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/TypeMapper.cs similarity index 100% rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/TypeMapper.cs rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/TypeMapper.cs diff --git a/Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj b/Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj index c0f6771846..4ef41625f2 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj +++ b/Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj @@ -36,12 +36,12 @@ - + ResXFileCodeGenerator Designer Strings.Designer.cs - + True True Strings.resx From b17d22fa8925ef2e1aaf18421a0c843a2b94b20b Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Fri, 25 Sep 2026 16:11:03 +0500 Subject: [PATCH 2/5] NpgsqlXxxCompilers: use nameof for member names --- .../NpgsqlBoxCompilers.cs | 16 +++++------ .../NpgsqlCircleCompilers.cs | 4 +-- .../NpgsqlLSegCompilers.cs | 4 +-- .../NpgsqlPathCompilers.cs | 27 ++++++++++++++++--- .../NpgsqlPointCompilers.cs | 4 +-- .../NpgsqlPolygonCompilers.cs | 4 +-- 6 files changed, 40 insertions(+), 19 deletions(-) diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlBoxCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlBoxCompilers.cs index b10c721a4a..a77fa98d12 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlBoxCompilers.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlBoxCompilers.cs @@ -16,49 +16,49 @@ internal class NpgsqlBoxCompilers { #region Extractors - [Compiler(typeof(NpgsqlBox), "UpperRight", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlBox), nameof(NpgsqlBox.UpperRight), TargetKind.PropertyGet)] public static SqlExpression NpgsqlBoxExtractUpperRightPoint(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlTypeExtractPoint(_this, 0); } - [Compiler(typeof(NpgsqlBox), "LowerLeft", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlBox), nameof(NpgsqlBox.LowerLeft), TargetKind.PropertyGet)] public static SqlExpression NpgsqlBoxExtractLowerLeftPoint(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlTypeExtractPoint(_this, 1); } - [Compiler(typeof(NpgsqlBox), "Right", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlBox), nameof(NpgsqlBox.Right), TargetKind.PropertyGet)] public static SqlExpression NpgsqlPointExtractRight(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlPointExtractX(PostgresqlSqlDml.NpgsqlTypeExtractPoint(_this, 0)); } - [Compiler(typeof(NpgsqlBox), "Top", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlBox), nameof(NpgsqlBox.Top), TargetKind.PropertyGet)] public static SqlExpression NpgsqlPointExtractTop(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlPointExtractY(PostgresqlSqlDml.NpgsqlTypeExtractPoint(_this, 0)); } - [Compiler(typeof(NpgsqlBox), "Left", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlBox), nameof(NpgsqlBox.Left), TargetKind.PropertyGet)] public static SqlExpression NpgsqlPointExtractLeft(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlPointExtractX(PostgresqlSqlDml.NpgsqlTypeExtractPoint(_this, 1)); } - [Compiler(typeof(NpgsqlBox), "Bottom", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlBox), nameof(NpgsqlBox.Bottom), TargetKind.PropertyGet)] public static SqlExpression NpgsqlPointExtractBottom(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlPointExtractY(PostgresqlSqlDml.NpgsqlTypeExtractPoint(_this, 1)); } - [Compiler(typeof(NpgsqlBox), "Height", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlBox), nameof(NpgsqlBox.Height), TargetKind.PropertyGet)] public static SqlExpression NpgsqlPointExtractHeight(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlBoxExtractHeight(_this); } - [Compiler(typeof(NpgsqlBox), "Width", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlBox), nameof(NpgsqlBox.Width), TargetKind.PropertyGet)] public static SqlExpression NpgsqlPointExtractWidth(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlBoxExtractWidth(_this); diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlCircleCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlCircleCompilers.cs index 42d174414c..f389dfcbb9 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlCircleCompilers.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlCircleCompilers.cs @@ -16,13 +16,13 @@ internal class NpgsqlCircleCompilers { #region Extractors - [Compiler(typeof(NpgsqlCircle), "Center", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlCircle), nameof(NpgsqlCircle.Center), TargetKind.PropertyGet)] public static SqlExpression NpgsqlCircleExtractCenterPoint(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlCircleExtractCenter(_this); } - [Compiler(typeof(NpgsqlCircle), "Radius", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlCircle), nameof(NpgsqlCircle.Radius), TargetKind.PropertyGet)] public static SqlExpression NpgsqlCircleExtractRadius(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlCircleExtractRadius(_this); diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlLSegCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlLSegCompilers.cs index 46177d7d2a..dab8a1301b 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlLSegCompilers.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlLSegCompilers.cs @@ -16,13 +16,13 @@ internal static class NpgsqlLSegCompilers { #region Extractors - [Compiler(typeof(NpgsqlLSeg), "Start", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlLSeg), nameof(NpgsqlLSeg.Start), TargetKind.PropertyGet)] public static SqlExpression NpgsqlLSegExtractStartPoint(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlTypeExtractPoint(_this, 0); } - [Compiler(typeof(NpgsqlLSeg), "End", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlLSeg), nameof(NpgsqlLSeg.End), TargetKind.PropertyGet)] public static SqlExpression NpgsqlLSegExtractEndPoint(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlTypeExtractPoint(_this, 1); diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs index 1ecbbf0f74..2fb3e42fdc 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs @@ -7,29 +7,50 @@ using NpgsqlTypes; using Xtensive.Sql.Dml; using Xtensive.Sql.Dml.PostgreSql; +using Operator = Xtensive.Reflection.WellKnown.Operator; namespace Xtensive.Orm.Providers.PostgreSql { [CompilerContainer(typeof(SqlExpression))] internal class NpgsqlPathCompilers { - [Compiler(typeof(NpgsqlPath), "Count", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlPath), nameof(NpgsqlPath.Count), TargetKind.PropertyGet)] public static SqlExpression NpgsqlPathCount(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlPathAndPolygonCount(_this); } - [Compiler(typeof(NpgsqlPath), "Open", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlPath), nameof(NpgsqlPath.Open), TargetKind.PropertyGet)] public static SqlExpression NpgsqlPathOpen(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlPathAndPolygonOpen(_this); } - [Compiler(typeof(NpgsqlPath), "Contains", TargetKind.Method)] + [Compiler(typeof(NpgsqlPath), nameof(NpgsqlPath.Contains), TargetKind.Method)] public static SqlExpression NpgsqlPathContains(SqlExpression _this, [Type(typeof(NpgsqlPoint))] SqlExpression point) { return PostgresqlSqlDml.NpgsqlPathAndPolygonContains(_this, point); } + + #region Operators + + [Compiler(typeof(NpgsqlPath), Operator.Equality, TargetKind.Operator)] + public static SqlExpression NpgsqlPathOperatorEquality( + [Type(typeof(NpgsqlLSeg))] SqlExpression left, + [Type(typeof(NpgsqlLSeg))] SqlExpression right) + { + return PostgresqlSqlDml.NpgsqlTypeOperatorEquality(left, right); + } + + [Compiler(typeof(NpgsqlPath), Operator.Inequality, TargetKind.Operator)] + public static SqlExpression NpgsqlPathOperatorInequality( + [Type(typeof(NpgsqlLSeg))] SqlExpression left, + [Type(typeof(NpgsqlLSeg))] SqlExpression right) + { + return !NpgsqlPathOperatorEquality(left, right); + } + + #endregion } } \ No newline at end of file diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPointCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPointCompilers.cs index 86c59f2bd3..88b6b8bc7f 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPointCompilers.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPointCompilers.cs @@ -16,13 +16,13 @@ internal static class NpgsqlPointCompilers { #region Extractors - [Compiler(typeof(NpgsqlPoint), "X", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlPoint), nameof(NpgsqlPoint.X), TargetKind.PropertyGet)] public static SqlExpression NpgsqlPointExtractX(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlPointExtractX(_this); } - [Compiler(typeof(NpgsqlPoint), "Y", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlPoint), nameof(NpgsqlPoint.Y), TargetKind.PropertyGet)] public static SqlExpression NpgsqlPointExtractY(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlPointExtractY(_this); diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPolygonCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPolygonCompilers.cs index d1fac7f3bc..f0c76fd518 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPolygonCompilers.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPolygonCompilers.cs @@ -14,13 +14,13 @@ namespace Xtensive.Orm.Providers.PostgreSql [CompilerContainer(typeof(SqlExpression))] internal class NpgsqlPolygonCompilers { - [Compiler(typeof(NpgsqlPolygon), "Count", TargetKind.PropertyGet)] + [Compiler(typeof(NpgsqlPolygon), nameof(NpgsqlPolygon.Count), TargetKind.PropertyGet)] public static SqlExpression NpgsqlPolygonCount(SqlExpression _this) { return PostgresqlSqlDml.NpgsqlPathAndPolygonCount(_this); } - [Compiler(typeof(NpgsqlPolygon), "Contains", TargetKind.Method)] + [Compiler(typeof(NpgsqlPolygon), nameof(NpgsqlPolygon.Contains), TargetKind.Method)] public static SqlExpression NpgsqlPolygonContains(SqlExpression _this, [Type(typeof(NpgsqlPoint))] SqlExpression point) { From 557d8240da1583d938a875cc56c7fb779fd84274 Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Mon, 28 Sep 2026 11:06:16 +0500 Subject: [PATCH 3/5] Fix compilation error --- .../PostgreSql/NpgsqlTypeConstructorTest.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Orm/Xtensive.Orm.Tests.Sql/PostgreSql/NpgsqlTypeConstructorTest.cs b/Orm/Xtensive.Orm.Tests.Sql/PostgreSql/NpgsqlTypeConstructorTest.cs index 6f48105eba..c786c8e48a 100644 --- a/Orm/Xtensive.Orm.Tests.Sql/PostgreSql/NpgsqlTypeConstructorTest.cs +++ b/Orm/Xtensive.Orm.Tests.Sql/PostgreSql/NpgsqlTypeConstructorTest.cs @@ -1,14 +1,14 @@ -// Copyright (C) 2013 Xtensive LLC. -// All rights reserved. -// For conditions of distribution and use, see license. +// Copyright (C) 2014-2026 Xtensive LLC. +// This code is distributed under MIT license terms. +// See the License.txt file in the project root for more information. // Created by: Alena Mikshina // Created: 2014.05.14 using System; using NUnit.Framework; -using Xtensive.Orm.Providers.PostgreSql; using Xtensive.Sql; using Xtensive.Sql.Dml; +using Xtensive.Sql.Dml.PostgreSql; namespace Xtensive.Orm.Tests.Sql.PostgreSql { From 5f9a917c8342f809b77a22a963b85a1478975d31 Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Mon, 28 Sep 2026 11:39:05 +0500 Subject: [PATCH 4/5] Fix copy-paste error wrong type was set as parameter of desired method for compiler to be work with --- .../Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs index 2fb3e42fdc..b83c5836d2 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs @@ -37,16 +37,16 @@ public static SqlExpression NpgsqlPathContains(SqlExpression _this, [Compiler(typeof(NpgsqlPath), Operator.Equality, TargetKind.Operator)] public static SqlExpression NpgsqlPathOperatorEquality( - [Type(typeof(NpgsqlLSeg))] SqlExpression left, - [Type(typeof(NpgsqlLSeg))] SqlExpression right) + [Type(typeof(NpgsqlPath))] SqlExpression left, + [Type(typeof(NpgsqlPath))] SqlExpression right) { return PostgresqlSqlDml.NpgsqlTypeOperatorEquality(left, right); } [Compiler(typeof(NpgsqlPath), Operator.Inequality, TargetKind.Operator)] public static SqlExpression NpgsqlPathOperatorInequality( - [Type(typeof(NpgsqlLSeg))] SqlExpression left, - [Type(typeof(NpgsqlLSeg))] SqlExpression right) + [Type(typeof(NpgsqlPath))] SqlExpression left, + [Type(typeof(NpgsqlPath))] SqlExpression right) { return !NpgsqlPathOperatorEquality(left, right); } From 2733ea3874685b9b8e34c1b006054ebc0a2361c6 Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Mon, 28 Sep 2026 13:50:42 +0500 Subject: [PATCH 5/5] Set custom namespace for resource file That resolves issue of replacing dots of folder name with underscores --- .../Sql/Drivers.PostgreSql/Resources/Strings.Designer.cs | 2 +- Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Resources/Strings.Designer.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Resources/Strings.Designer.cs index b26114fa3f..9c8d9a2fcc 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Resources/Strings.Designer.cs +++ b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Resources/Strings.Designer.cs @@ -19,7 +19,7 @@ namespace Xtensive.Sql.Drivers.PostgreSql.Resources { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Strings { diff --git a/Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj b/Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj index 4ef41625f2..1f0b91432b 100644 --- a/Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj +++ b/Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj @@ -40,6 +40,7 @@ ResXFileCodeGenerator Designer Strings.Designer.cs + Xtensive.Sql.Drivers.PostgreSql.Resources True