diff --git a/src/EFCore.PG/Extensions/NpgsqlEntityTypeBuilderExtensions.cs b/src/EFCore.PG/Extensions/NpgsqlEntityTypeBuilderExtensions.cs index 0520d829f..c232d41fc 100644 --- a/src/EFCore.PG/Extensions/NpgsqlEntityTypeBuilderExtensions.cs +++ b/src/EFCore.PG/Extensions/NpgsqlEntityTypeBuilderExtensions.cs @@ -65,7 +65,7 @@ public static EntityTypeBuilder SetStorageParameter( { Check.NotNull(entityTypeBuilder, nameof(entityTypeBuilder)); - entityTypeBuilder.Metadata.SetNpgsqlStorageParameter(parameterName, parameterValue); + entityTypeBuilder.Metadata.SetStorageParameter(parameterName, parameterValue); return entityTypeBuilder; } @@ -101,7 +101,7 @@ public static IConventionEntityTypeBuilder SetStorageParameter( { if (entityTypeBuilder.ForNpgsqlCanSetStorageParameter(parameterName, parameterValue, fromDataAnnotation)) { - entityTypeBuilder.Metadata.SetNpgsqlStorageParameter(parameterName, parameterValue); + entityTypeBuilder.Metadata.SetStorageParameter(parameterName, parameterValue); return entityTypeBuilder; } @@ -145,7 +145,7 @@ public static EntityTypeBuilder ForNpgsqlHasComment( Check.NotNull(entityTypeBuilder, nameof(entityTypeBuilder)); Check.NullButNotEmpty(comment, nameof(comment)); - entityTypeBuilder.Metadata.SetNpgsqlComment(comment); + NpgsqlEntityTypeExtensions.SetComment(entityTypeBuilder.Metadata, comment); return entityTypeBuilder; } @@ -184,7 +184,7 @@ public static EntityTypeBuilder IsUnlogged( { Check.NotNull(entityTypeBuilder, nameof(entityTypeBuilder)); - entityTypeBuilder.Metadata.SetNpgsqlIsUnlogged(isUnlogged); + entityTypeBuilder.Metadata.SetIsUnlogged(isUnlogged); return entityTypeBuilder; } @@ -225,7 +225,7 @@ public static IConventionEntityTypeBuilder IsUnlogged( { if (entityTypeBuilder.ForNpgsqlCanSetIsUnlogged(isUnlogged, fromDataAnnotation)) { - entityTypeBuilder.Metadata.SetNpgsqlIsUnlogged(isUnlogged, fromDataAnnotation); + entityTypeBuilder.Metadata.SetIsUnlogged(isUnlogged, fromDataAnnotation); return entityTypeBuilder; } @@ -272,7 +272,7 @@ public static EntityTypeBuilder UseCockroachDbInterleaveInParent( if (parentEntity == null) throw new ArgumentException("Entity not found in model for type: " + parentTableType, nameof(parentTableType)); - var interleaveInParent = entityTypeBuilder.Metadata.GetNpgsqlCockroachDbInterleaveInParent(); + var interleaveInParent = entityTypeBuilder.Metadata.GetCockroachDbInterleaveInParent(); interleaveInParent.ParentTableSchema = parentEntity.GetSchema(); interleaveInParent.ParentTableName = parentEntity.GetTableName(); interleaveInParent.InterleavePrefix = interleavePrefix; diff --git a/src/EFCore.PG/Extensions/NpgsqlEntityTypeExtensions.cs b/src/EFCore.PG/Extensions/NpgsqlEntityTypeExtensions.cs index ee400efe2..3ba6e5e2c 100644 --- a/src/EFCore.PG/Extensions/NpgsqlEntityTypeExtensions.cs +++ b/src/EFCore.PG/Extensions/NpgsqlEntityTypeExtensions.cs @@ -21,31 +21,31 @@ public static Dictionary GetStorageParameters([NotNull] this IEn a => a.Value ); - public static string GetNpgsqlStorageParameter([NotNull] this IEntityType entityType, string parameterName) + public static string GetStorageParameter([NotNull] this IEntityType entityType, string parameterName) => (string)entityType[NpgsqlAnnotationNames.StorageParameterPrefix + parameterName]; - public static void SetNpgsqlStorageParameter([NotNull] this IMutableEntityType entityType, string parameterName, object parameterValue) + public static void SetStorageParameter([NotNull] this IMutableEntityType entityType, string parameterName, object parameterValue) => entityType.SetOrRemoveAnnotation(NpgsqlAnnotationNames.StorageParameterPrefix + parameterName, parameterValue); - public static void SetNpgsqlStorageParameter([NotNull] this IConventionEntityType entityType, string parameterName, object parameterValue, bool fromDataAnnotation = false) + public static void SetStorageParameter([NotNull] this IConventionEntityType entityType, string parameterName, object parameterValue, bool fromDataAnnotation = false) => entityType.SetOrRemoveAnnotation(NpgsqlAnnotationNames.StorageParameterPrefix + parameterName, parameterValue, fromDataAnnotation); - public static string GetNpgsqlComment([NotNull] this IEntityType entityType) + public static string GetComment([NotNull] this IEntityType entityType) => (string)entityType[NpgsqlAnnotationNames.Comment]; - public static void SetNpgsqlComment([NotNull] this IMutableEntityType entityType, [CanBeNull] string comment) + public static void SetComment([NotNull] this IMutableEntityType entityType, [CanBeNull] string comment) => entityType.SetOrRemoveAnnotation(NpgsqlAnnotationNames.Comment, comment); - public static bool GetNpgsqlIsUnlogged([NotNull] this IEntityType entityType) + public static bool GetIsUnlogged([NotNull] this IEntityType entityType) => entityType[NpgsqlAnnotationNames.UnloggedTable] as bool? ?? false; - public static void SetNpgsqlIsUnlogged([NotNull] this IMutableEntityType entityType, bool isUnlogged) + public static void SetIsUnlogged([NotNull] this IMutableEntityType entityType, bool isUnlogged) => entityType.SetOrRemoveAnnotation(NpgsqlAnnotationNames.UnloggedTable, isUnlogged); - public static void SetNpgsqlIsUnlogged([NotNull] this IConventionEntityType entityType, bool isUnlogged, bool fromDataAnnotation = false) + public static void SetIsUnlogged([NotNull] this IConventionEntityType entityType, bool isUnlogged, bool fromDataAnnotation = false) => entityType.SetOrRemoveAnnotation(NpgsqlAnnotationNames.UnloggedTable, isUnlogged, fromDataAnnotation); - public static CockroachDbInterleaveInParent GetNpgsqlCockroachDbInterleaveInParent([NotNull] this IEntityType entityType) + public static CockroachDbInterleaveInParent GetCockroachDbInterleaveInParent([NotNull] this IEntityType entityType) => new CockroachDbInterleaveInParent(entityType); } } diff --git a/src/EFCore.PG/Extensions/NpgsqlIndexBuilderExtensions.cs b/src/EFCore.PG/Extensions/NpgsqlIndexBuilderExtensions.cs index 1d6937742..191a0d257 100644 --- a/src/EFCore.PG/Extensions/NpgsqlIndexBuilderExtensions.cs +++ b/src/EFCore.PG/Extensions/NpgsqlIndexBuilderExtensions.cs @@ -38,7 +38,7 @@ public static IndexBuilder HasMethod( Check.NotNull(indexBuilder, nameof(indexBuilder)); Check.NullButNotEmpty(method, nameof(method)); - indexBuilder.Metadata.SetNpgsqlMethod(method); + indexBuilder.Metadata.SetMethod(method); return indexBuilder; } @@ -74,7 +74,7 @@ public static IConventionIndexBuilder HasMethod( { if (indexBuilder.ForNpgsqlCanSetHasMethod(method, fromDataAnnotation)) { - indexBuilder.Metadata.SetNpgsqlMethod(method, fromDataAnnotation); + indexBuilder.Metadata.SetMethod(method, fromDataAnnotation); return indexBuilder; } @@ -122,7 +122,7 @@ public static IndexBuilder HasOperators( Check.NotNull(indexBuilder, nameof(indexBuilder)); Check.NullButNotEmpty(operators, nameof(operators)); - indexBuilder.Metadata.SetNpgsqlOperators(operators); + indexBuilder.Metadata.SetOperators(operators); return indexBuilder; } @@ -158,7 +158,7 @@ public static IConventionIndexBuilder HasOperators( { if (indexBuilder.ForNpgsqlCanSetHasOperators(operators, fromDataAnnotation)) { - indexBuilder.Metadata.SetNpgsqlOperators(operators, fromDataAnnotation); + indexBuilder.Metadata.SetOperators(operators, fromDataAnnotation); return indexBuilder; } @@ -206,7 +206,7 @@ public static IndexBuilder HasCollation( Check.NotNull(indexBuilder, nameof(indexBuilder)); Check.NullButNotEmpty(values, nameof(values)); - indexBuilder.Metadata.SetNpgsqlCollation(values); + indexBuilder.Metadata.SetCollation(values); return indexBuilder; } @@ -242,7 +242,7 @@ public static IConventionIndexBuilder HasCollation( { if (indexBuilder.ForNpgsqlCanSetHasCollation(values, fromDataAnnotation)) { - indexBuilder.Metadata.SetNpgsqlCollation(values, fromDataAnnotation); + indexBuilder.Metadata.SetCollation(values, fromDataAnnotation); return indexBuilder; } @@ -291,7 +291,7 @@ public static IndexBuilder HasSortOrder( Check.NullButNotEmpty(values, nameof(values)); if (!SortOrderHelper.IsDefaultSortOrder(values)) - indexBuilder.Metadata.SetNpgsqlSortOrder(values); + indexBuilder.Metadata.SetSortOrder(values); return indexBuilder; } @@ -331,7 +331,7 @@ public static IConventionIndexBuilder HasSortOrder( Check.NullButNotEmpty(values, nameof(values)); if (!SortOrderHelper.IsDefaultSortOrder(values)) - indexBuilder.Metadata.SetNpgsqlSortOrder(values, fromDataAnnotation); + indexBuilder.Metadata.SetSortOrder(values, fromDataAnnotation); return indexBuilder; } @@ -379,10 +379,10 @@ public static IndexBuilder HasNullSortOrder( Check.NotNull(indexBuilder, nameof(indexBuilder)); Check.NullButNotEmpty(values, nameof(values)); - var sortOrders = indexBuilder.Metadata.GetNpgsqlSortOrder(); + var sortOrders = indexBuilder.Metadata.GetSortOrder(); if (!SortOrderHelper.IsDefaultNullSortOrder(values, sortOrders)) - indexBuilder.Metadata.SetNpgsqlNullSortOrder(values); + indexBuilder.Metadata.SetNullSortOrder(values); return indexBuilder; } @@ -418,10 +418,10 @@ public static IConventionIndexBuilder HasNullSortOrder( { if (indexBuilder.ForNpgsqlCanSetHasNullSortOrder(values, fromDataAnnotation)) { - var sortOrders = indexBuilder.Metadata.GetNpgsqlSortOrder(); + var sortOrders = indexBuilder.Metadata.GetSortOrder(); if (!SortOrderHelper.IsDefaultNullSortOrder(values, sortOrders)) - indexBuilder.Metadata.SetNpgsqlNullSortOrder(values, fromDataAnnotation); + indexBuilder.Metadata.SetNullSortOrder(values, fromDataAnnotation); return indexBuilder; } @@ -470,7 +470,7 @@ public static IndexBuilder IncludeProperties( Check.NotNull(indexBuilder, nameof(indexBuilder)); Check.NullButNotEmpty(propertyNames, nameof(propertyNames)); - indexBuilder.Metadata.SetNpgsqlIncludeProperties(propertyNames); + indexBuilder.Metadata.SetIncludeProperties(propertyNames); return indexBuilder; } @@ -524,7 +524,7 @@ public static IConventionIndexBuilder IncludeProperties( { if (indexBuilder.ForNpgsqlCanSetInclude(propertyNames, fromDataAnnotation)) { - indexBuilder.Metadata.SetNpgsqlIncludeProperties(propertyNames, fromDataAnnotation); + indexBuilder.Metadata.SetIncludeProperties(propertyNames, fromDataAnnotation); return indexBuilder; } @@ -547,9 +547,9 @@ public static bool ForNpgsqlCanSetInclude( Check.NotNull(indexBuilder, nameof(indexBuilder)); return (fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention) - .Overrides(indexBuilder.Metadata.GetNpgsqlIncludePropertiesConfigurationSource()) + .Overrides(indexBuilder.Metadata.GetIncludePropertiesConfigurationSource()) || StructuralComparisons.StructuralEqualityComparer.Equals( - propertyNames, indexBuilder.Metadata.GetNpgsqlIncludeProperties()); + propertyNames, indexBuilder.Metadata.GetIncludeProperties()); } #endregion Include diff --git a/src/EFCore.PG/Extensions/NpgsqlIndexExtensions.cs b/src/EFCore.PG/Extensions/NpgsqlIndexExtensions.cs index bf047aadb..1ff0d3edd 100644 --- a/src/EFCore.PG/Extensions/NpgsqlIndexExtensions.cs +++ b/src/EFCore.PG/Extensions/NpgsqlIndexExtensions.cs @@ -22,7 +22,7 @@ public static class NpgsqlIndexExtensions /// /// http://www.postgresql.org/docs/current/static/sql-createindex.html /// - public static string GetNpgsqlMethod([NotNull] this IIndex index) + public static string GetMethod([NotNull] this IIndex index) => (string)index[NpgsqlAnnotationNames.IndexMethod]; /// @@ -32,7 +32,7 @@ public static string GetNpgsqlMethod([NotNull] this IIndex index) /// /// http://www.postgresql.org/docs/current/static/sql-createindex.html /// - public static void SetNpgsqlMethod([NotNull] this IMutableIndex index, [CanBeNull] string method) + public static void SetMethod([NotNull] this IMutableIndex index, [CanBeNull] string method) => index.SetOrRemoveAnnotation(NpgsqlAnnotationNames.IndexMethod, method); /// @@ -42,7 +42,7 @@ public static void SetNpgsqlMethod([NotNull] this IMutableIndex index, [CanBeNul /// /// http://www.postgresql.org/docs/current/static/sql-createindex.html /// - public static void SetNpgsqlMethod([NotNull] this IConventionIndex index, [CanBeNull] string method, bool fromDataAnnotation = false) + public static void SetMethod([NotNull] this IConventionIndex index, [CanBeNull] string method, bool fromDataAnnotation = false) => index.SetOrRemoveAnnotation(NpgsqlAnnotationNames.IndexMethod, method, fromDataAnnotation); /// @@ -51,7 +51,7 @@ public static void SetNpgsqlMethod([NotNull] this IConventionIndex index, [CanBe /// /// https://www.postgresql.org/docs/current/static/indexes-opclass.html /// - public static IReadOnlyList GetNpgsqlOperators([NotNull] this IIndex index) + public static IReadOnlyList GetOperators([NotNull] this IIndex index) => (IReadOnlyList)index[NpgsqlAnnotationNames.IndexOperators]; /// @@ -60,7 +60,7 @@ public static IReadOnlyList GetNpgsqlOperators([NotNull] this IIndex ind /// /// https://www.postgresql.org/docs/current/static/indexes-opclass.html /// - public static void SetNpgsqlOperators([NotNull] this IMutableIndex index, [CanBeNull] IReadOnlyList operators) + public static void SetOperators([NotNull] this IMutableIndex index, [CanBeNull] IReadOnlyList operators) => index.SetOrRemoveAnnotation(NpgsqlAnnotationNames.IndexMethod, operators); /// @@ -69,7 +69,7 @@ public static void SetNpgsqlOperators([NotNull] this IMutableIndex index, [CanBe /// /// https://www.postgresql.org/docs/current/static/indexes-opclass.html /// - public static void SetNpgsqlOperators([NotNull] this IConventionIndex index, [CanBeNull] IReadOnlyList operators, bool fromDataAnnotation) + public static void SetOperators([NotNull] this IConventionIndex index, [CanBeNull] IReadOnlyList operators, bool fromDataAnnotation) => index.SetOrRemoveAnnotation(NpgsqlAnnotationNames.IndexMethod, operators, fromDataAnnotation); /// @@ -78,7 +78,7 @@ public static void SetNpgsqlOperators([NotNull] this IConventionIndex index, [Ca /// /// https://www.postgresql.org/docs/current/static/indexes-collations.html /// - public static IReadOnlyList GetNpgsqlCollation([NotNull] this IIndex index) + public static IReadOnlyList GetCollation([NotNull] this IIndex index) => (IReadOnlyList)index[NpgsqlAnnotationNames.IndexCollation]; /// @@ -87,7 +87,7 @@ public static IReadOnlyList GetNpgsqlCollation([NotNull] this IIndex ind /// /// https://www.postgresql.org/docs/current/static/indexes-collations.html /// - public static void SetNpgsqlCollation([NotNull] this IMutableIndex index, [CanBeNull] IReadOnlyList collations) + public static void SetCollation([NotNull] this IMutableIndex index, [CanBeNull] IReadOnlyList collations) => index.SetOrRemoveAnnotation(NpgsqlAnnotationNames.IndexCollation, collations); /// @@ -96,7 +96,7 @@ public static void SetNpgsqlCollation([NotNull] this IMutableIndex index, [CanBe /// /// https://www.postgresql.org/docs/current/static/indexes-collations.html /// - public static void SetNpgsqlCollation([NotNull] this IConventionIndex index, [CanBeNull] IReadOnlyList collations, bool fromDataAnnotation) + public static void SetCollation([NotNull] this IConventionIndex index, [CanBeNull] IReadOnlyList collations, bool fromDataAnnotation) => index.SetOrRemoveAnnotation(NpgsqlAnnotationNames.IndexCollation, collations, fromDataAnnotation); /// @@ -105,7 +105,7 @@ public static void SetNpgsqlCollation([NotNull] this IConventionIndex index, [Ca /// /// https://www.postgresql.org/docs/current/static/indexes-ordering.html /// - public static IReadOnlyList GetNpgsqlSortOrder([NotNull] this IIndex index) + public static IReadOnlyList GetSortOrder([NotNull] this IIndex index) => (IReadOnlyList)index[NpgsqlAnnotationNames.IndexSortOrder]; /// @@ -114,7 +114,7 @@ public static IReadOnlyList GetNpgsqlSortOrder([NotNull] this IIndex /// /// https://www.postgresql.org/docs/current/static/indexes-ordering.html /// - public static void SetNpgsqlSortOrder([NotNull] this IMutableIndex index, [CanBeNull] IReadOnlyList sortOrder) + public static void SetSortOrder([NotNull] this IMutableIndex index, [CanBeNull] IReadOnlyList sortOrder) => index.SetOrRemoveAnnotation(NpgsqlAnnotationNames.IndexSortOrder, sortOrder); /// @@ -123,7 +123,7 @@ public static void SetNpgsqlSortOrder([NotNull] this IMutableIndex index, [CanBe /// /// https://www.postgresql.org/docs/current/static/indexes-ordering.html /// - public static void SetNpgsqlSortOrder([NotNull] this IConventionIndex index, [CanBeNull] IReadOnlyList sortOrder, bool fromDataAnnotation) + public static void SetSortOrder([NotNull] this IConventionIndex index, [CanBeNull] IReadOnlyList sortOrder, bool fromDataAnnotation) => index.SetOrRemoveAnnotation(NpgsqlAnnotationNames.IndexSortOrder, sortOrder, fromDataAnnotation); /// @@ -132,7 +132,7 @@ public static void SetNpgsqlSortOrder([NotNull] this IConventionIndex index, [Ca /// /// https://www.postgresql.org/docs/current/static/indexes-ordering.html /// - public static IReadOnlyList GetNpgsqlNullSortOrder([NotNull] this IIndex index) + public static IReadOnlyList GetNullSortOrder([NotNull] this IIndex index) => (IReadOnlyList)index[NpgsqlAnnotationNames.IndexNullSortOrder]; /// @@ -141,7 +141,7 @@ public static IReadOnlyList GetNpgsqlNullSortOrder([NotNull] this /// /// https://www.postgresql.org/docs/current/static/indexes-ordering.html /// - public static void SetNpgsqlNullSortOrder([NotNull] this IMutableIndex index, [CanBeNull] IReadOnlyList nullSortOrder) + public static void SetNullSortOrder([NotNull] this IMutableIndex index, [CanBeNull] IReadOnlyList nullSortOrder) => index.SetOrRemoveAnnotation(NpgsqlAnnotationNames.IndexNullSortOrder, nullSortOrder); /// @@ -150,7 +150,7 @@ public static void SetNpgsqlNullSortOrder([NotNull] this IMutableIndex index, [C /// /// https://www.postgresql.org/docs/current/static/indexes-ordering.html /// - public static void SetNpgsqlNullSortOrder([NotNull] this IConventionIndex index, + public static void SetNullSortOrder([NotNull] this IConventionIndex index, [CanBeNull] IReadOnlyList nullSortOrder, bool fromDataAnnotation) => index.SetOrRemoveAnnotation(NpgsqlAnnotationNames.IndexNullSortOrder, nullSortOrder, fromDataAnnotation); @@ -161,7 +161,7 @@ public static void SetNpgsqlNullSortOrder([NotNull] this IConventionIndex index, /// /// The index. /// The included property names, or null if they have not been specified. - public static IReadOnlyList GetNpgsqlIncludeProperties([NotNull] this IIndex index) + public static IReadOnlyList GetIncludeProperties([NotNull] this IIndex index) => (IReadOnlyList)index[NpgsqlAnnotationNames.IndexInclude]; /// @@ -169,7 +169,7 @@ public static IReadOnlyList GetNpgsqlIncludeProperties([NotNull] this II /// /// The index. /// The value to set. - public static void SetNpgsqlIncludeProperties([NotNull] this IMutableIndex index, [NotNull] IReadOnlyList properties) + public static void SetIncludeProperties([NotNull] this IMutableIndex index, [NotNull] IReadOnlyList properties) => index.SetOrRemoveAnnotation( NpgsqlAnnotationNames.IndexInclude, properties); @@ -180,7 +180,7 @@ public static void SetNpgsqlIncludeProperties([NotNull] this IMutableIndex index /// The index. /// Indicates whether the configuration was specified using a data annotation. /// The value to set. - public static void SetNpgsqlIncludeProperties( + public static void SetIncludeProperties( [NotNull] this IConventionIndex index, [NotNull] IReadOnlyList properties, bool fromDataAnnotation = false) => index.SetOrRemoveAnnotation( NpgsqlAnnotationNames.IndexInclude, @@ -192,7 +192,7 @@ public static void SetNpgsqlIncludeProperties( /// /// The index. /// The for the included property names. - public static ConfigurationSource? GetNpgsqlIncludePropertiesConfigurationSource([NotNull] this IConventionIndex index) + public static ConfigurationSource? GetIncludePropertiesConfigurationSource([NotNull] this IConventionIndex index) => index.FindAnnotation(NpgsqlAnnotationNames.IndexInclude)?.GetConfigurationSource(); #endregion Included properties diff --git a/src/EFCore.PG/Extensions/NpgsqlModelBuilderExtensions.cs b/src/EFCore.PG/Extensions/NpgsqlModelBuilderExtensions.cs index 26f938f02..79230b83c 100644 --- a/src/EFCore.PG/Extensions/NpgsqlModelBuilderExtensions.cs +++ b/src/EFCore.PG/Extensions/NpgsqlModelBuilderExtensions.cs @@ -48,9 +48,9 @@ public static ModelBuilder UseHiLo( modelBuilder.HasSequence(name, schema).IncrementsBy(10); } - model.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); - model.SetNpgsqlHiLoSequenceName(name); - model.SetNpgsqlHiLoSequenceSchema(schema); + model.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); + model.SetHiLoSequenceName(name); + model.SetHiLoSequenceSchema(schema); return modelBuilder; } @@ -75,8 +75,8 @@ public static IConventionSequenceBuilder HasHiLoSequence( return null; } - modelBuilder.Metadata.SetNpgsqlHiLoSequenceName(name, fromDataAnnotation); - modelBuilder.Metadata.SetNpgsqlHiLoSequenceSchema(schema, fromDataAnnotation); + modelBuilder.Metadata.SetHiLoSequenceName(name, fromDataAnnotation); + modelBuilder.Metadata.SetHiLoSequenceSchema(schema, fromDataAnnotation); return name == null ? null : modelBuilder.HasSequence(name, schema, fromDataAnnotation); } @@ -121,9 +121,9 @@ public static ModelBuilder UseSerialColumns( var property = modelBuilder.Model; - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.SerialColumn); - property.SetNpgsqlHiLoSequenceName(null); - property.SetNpgsqlHiLoSequenceSchema(null); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SerialColumn); + property.SetHiLoSequenceName(null); + property.SetHiLoSequenceSchema(null); return modelBuilder; } @@ -150,9 +150,9 @@ public static ModelBuilder UseIdentityAlwaysColumns( var property = modelBuilder.Model; - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityAlwaysColumn); - property.SetNpgsqlHiLoSequenceName(null); - property.SetNpgsqlHiLoSequenceSchema(null); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityAlwaysColumn); + property.SetHiLoSequenceName(null); + property.SetHiLoSequenceSchema(null); return modelBuilder; } @@ -175,9 +175,9 @@ public static ModelBuilder UseIdentityByDefaultColumns( var property = modelBuilder.Model; - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - property.SetNpgsqlHiLoSequenceName(null); - property.SetNpgsqlHiLoSequenceSchema(null); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + property.SetHiLoSequenceName(null); + property.SetHiLoSequenceSchema(null); return modelBuilder; } @@ -214,7 +214,7 @@ public static IConventionModelBuilder HasValueGenerationStrategy( if (modelBuilder.CanSetAnnotation( NpgsqlAnnotationNames.ValueGenerationStrategy, valueGenerationStrategy, fromDataAnnotation)) { - modelBuilder.Metadata.SetNpgsqlValueGenerationStrategy(valueGenerationStrategy, fromDataAnnotation); + modelBuilder.Metadata.SetValueGenerationStrategy(valueGenerationStrategy, fromDataAnnotation); if (valueGenerationStrategy != NpgsqlValueGenerationStrategy.SequenceHiLo) { modelBuilder.HasHiLoSequence(null, null, fromDataAnnotation); @@ -376,7 +376,7 @@ public static ModelBuilder UseDatabaseTemplate( Check.NotNull(modelBuilder, nameof(modelBuilder)); Check.NotEmpty(templateDatabaseName, nameof(templateDatabaseName)); - modelBuilder.Model.SetNpgsqlDatabaseTemplate(templateDatabaseName); + modelBuilder.Model.SetDatabaseTemplate(templateDatabaseName); return modelBuilder; } @@ -457,7 +457,7 @@ public static ModelBuilder UseTablespace( Check.NotNull(modelBuilder, nameof(modelBuilder)); Check.NotEmpty(tablespace, nameof(tablespace)); - modelBuilder.Model.SetNpgsqlTablespace(tablespace); + modelBuilder.Model.SetTablespace(tablespace); return modelBuilder; } diff --git a/src/EFCore.PG/Extensions/NpgsqlModelExtensions.cs b/src/EFCore.PG/Extensions/NpgsqlModelExtensions.cs index 37b64dda4..97a949fe3 100644 --- a/src/EFCore.PG/Extensions/NpgsqlModelExtensions.cs +++ b/src/EFCore.PG/Extensions/NpgsqlModelExtensions.cs @@ -20,7 +20,7 @@ public static class NpgsqlModelExtensions /// /// The model. /// The name to use for the default hi-lo sequence. - public static string GetNpgsqlHiLoSequenceName([NotNull] this IModel model) + public static string GetHiLoSequenceName([NotNull] this IModel model) => (string)model[NpgsqlAnnotationNames.HiLoSequenceName] ?? DefaultHiLoSequenceName; @@ -29,7 +29,7 @@ public static string GetNpgsqlHiLoSequenceName([NotNull] this IModel model) /// /// The model. /// The value to set. - public static void SetNpgsqlHiLoSequenceName([NotNull] this IMutableModel model, [CanBeNull] string name) + public static void SetHiLoSequenceName([NotNull] this IMutableModel model, [CanBeNull] string name) { Check.NullButNotEmpty(name, nameof(name)); @@ -42,7 +42,7 @@ public static void SetNpgsqlHiLoSequenceName([NotNull] this IMutableModel model, /// The model. /// The value to set. /// Indicates whether the configuration was specified using a data annotation. - public static void SetNpgsqlHiLoSequenceName( + public static void SetHiLoSequenceName( [NotNull] this IConventionModel model, [CanBeNull] string name, bool fromDataAnnotation = false) { Check.NullButNotEmpty(name, nameof(name)); @@ -55,7 +55,7 @@ public static void SetNpgsqlHiLoSequenceName( /// /// The model. /// The for the default hi-lo sequence name. - public static ConfigurationSource? GetNpgsqlHiLoSequenceNameConfigurationSource([NotNull] this IConventionModel model) + public static ConfigurationSource? GetHiLoSequenceNameConfigurationSource([NotNull] this IConventionModel model) => model.FindAnnotation(NpgsqlAnnotationNames.HiLoSequenceName)?.GetConfigurationSource(); /// @@ -64,7 +64,7 @@ public static void SetNpgsqlHiLoSequenceName( /// /// The model. /// The schema to use for the default hi-lo sequence. - public static string GetNpgsqlHiLoSequenceSchema([NotNull] this IModel model) + public static string GetHiLoSequenceSchema([NotNull] this IModel model) => (string)model[NpgsqlAnnotationNames.HiLoSequenceSchema]; /// @@ -72,7 +72,7 @@ public static string GetNpgsqlHiLoSequenceSchema([NotNull] this IModel model) /// /// The model. /// The value to set. - public static void SetNpgsqlHiLoSequenceSchema([NotNull] this IMutableModel model, [CanBeNull] string value) + public static void SetHiLoSequenceSchema([NotNull] this IMutableModel model, [CanBeNull] string value) { Check.NullButNotEmpty(value, nameof(value)); @@ -85,7 +85,7 @@ public static void SetNpgsqlHiLoSequenceSchema([NotNull] this IMutableModel mode /// The model. /// The value to set. /// Indicates whether the configuration was specified using a data annotation. - public static void SetNpgsqlHiLoSequenceSchema( + public static void SetHiLoSequenceSchema( [NotNull] this IConventionModel model, [CanBeNull] string value, bool fromDataAnnotation = false) { Check.NullButNotEmpty(value, nameof(value)); @@ -98,7 +98,7 @@ public static void SetNpgsqlHiLoSequenceSchema( /// /// The model. /// The for the default hi-lo sequence schema. - public static ConfigurationSource? GetNpgsqlHiLoSequenceSchemaConfigurationSource([NotNull] this IConventionModel model) + public static ConfigurationSource? GetHiLoSequenceSchemaConfigurationSource([NotNull] this IConventionModel model) => model.FindAnnotation(NpgsqlAnnotationNames.HiLoSequenceSchema)?.GetConfigurationSource(); #endregion @@ -111,7 +111,7 @@ public static void SetNpgsqlHiLoSequenceSchema( /// /// The model. /// The default . - public static NpgsqlValueGenerationStrategy? GetNpgsqlValueGenerationStrategy([NotNull] this IModel model) + public static NpgsqlValueGenerationStrategy? GetValueGenerationStrategy([NotNull] this IModel model) => (NpgsqlValueGenerationStrategy?)model[NpgsqlAnnotationNames.ValueGenerationStrategy]; /// @@ -120,7 +120,7 @@ public static void SetNpgsqlHiLoSequenceSchema( /// /// The model. /// The value to set. - public static void SetNpgsqlValueGenerationStrategy([NotNull] this IMutableModel model, NpgsqlValueGenerationStrategy? value) + public static void SetValueGenerationStrategy([NotNull] this IMutableModel model, NpgsqlValueGenerationStrategy? value) => model.SetOrRemoveAnnotation(NpgsqlAnnotationNames.ValueGenerationStrategy, value); /// @@ -130,7 +130,7 @@ public static void SetNpgsqlValueGenerationStrategy([NotNull] this IMutableModel /// The model. /// The value to set. /// Indicates whether the configuration was specified using a data annotation. - public static void SetNpgsqlValueGenerationStrategy( + public static void SetValueGenerationStrategy( [NotNull] this IConventionModel model, NpgsqlValueGenerationStrategy? value, bool fromDataAnnotation = false) => model.SetOrRemoveAnnotation(NpgsqlAnnotationNames.ValueGenerationStrategy, value, fromDataAnnotation); @@ -139,7 +139,7 @@ public static void SetNpgsqlValueGenerationStrategy( /// /// The model. /// The for the default . - public static ConfigurationSource? GetNpgsqlValueGenerationStrategyConfigurationSource([NotNull] this IConventionModel model) + public static ConfigurationSource? GetValueGenerationStrategyConfigurationSource([NotNull] this IConventionModel model) => model.FindAnnotation(NpgsqlAnnotationNames.ValueGenerationStrategy)?.GetConfigurationSource(); #endregion @@ -201,19 +201,19 @@ public static IReadOnlyList PostgresRanges([NotNull] this IModel #region Database Template - public static string GetNpgsqlDatabaseTemplate([NotNull] this IModel model) + public static string GetDatabaseTemplate([NotNull] this IModel model) => (string)model[NpgsqlAnnotationNames.DatabaseTemplate]; - public static void SetNpgsqlDatabaseTemplate([NotNull] this IMutableModel model, [CanBeNull] string template) + public static void SetDatabaseTemplate([NotNull] this IMutableModel model, [CanBeNull] string template) => model.SetOrRemoveAnnotation(NpgsqlAnnotationNames.DatabaseTemplate, template); #endregion #region Tablespace - public static string GetNpgsqlTablespace([NotNull] this IModel model) + public static string GetTablespace([NotNull] this IModel model) => (string)model[NpgsqlAnnotationNames.Tablespace]; - public static void SetNpgsqlTablespace([NotNull] this IMutableModel model, [CanBeNull] string tablespace) + public static void SetTablespace([NotNull] this IMutableModel model, [CanBeNull] string tablespace) => model.SetOrRemoveAnnotation(NpgsqlAnnotationNames.Tablespace, tablespace); #endregion diff --git a/src/EFCore.PG/Extensions/NpgsqlPropertyBuilderExtensions.cs b/src/EFCore.PG/Extensions/NpgsqlPropertyBuilderExtensions.cs index c0b3b8d84..0176bccf8 100644 --- a/src/EFCore.PG/Extensions/NpgsqlPropertyBuilderExtensions.cs +++ b/src/EFCore.PG/Extensions/NpgsqlPropertyBuilderExtensions.cs @@ -44,9 +44,9 @@ public static PropertyBuilder UseHiLo( model.AddSequence(name, schema).IncrementBy = 10; } - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); - property.SetNpgsqlHiLoSequenceName(name); - property.SetNpgsqlHiLoSequenceSchema(schema); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); + property.SetHiLoSequenceName(name); + property.SetHiLoSequenceSchema(schema); return propertyBuilder; } @@ -85,8 +85,8 @@ public static IConventionSequenceBuilder HasHiLoSequence( return null; } - propertyBuilder.Metadata.SetNpgsqlHiLoSequenceName(name, fromDataAnnotation); - propertyBuilder.Metadata.SetNpgsqlHiLoSequenceSchema(schema, fromDataAnnotation); + propertyBuilder.Metadata.SetHiLoSequenceName(name, fromDataAnnotation); + propertyBuilder.Metadata.SetHiLoSequenceSchema(schema, fromDataAnnotation); return name == null ? null @@ -131,9 +131,9 @@ public static PropertyBuilder UseSerialColumn( Check.NotNull(propertyBuilder, nameof(propertyBuilder)); var property = propertyBuilder.Metadata; - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.SerialColumn); - property.SetNpgsqlHiLoSequenceName(null); - property.SetNpgsqlHiLoSequenceSchema(null); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SerialColumn); + property.SetHiLoSequenceName(null); + property.SetHiLoSequenceSchema(null); return propertyBuilder; } @@ -161,9 +161,9 @@ public static IConventionPropertyBuilder UseSerialColumn( if (propertyBuilder.CanSetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SerialColumn)) { var property = propertyBuilder.Metadata; - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.SerialColumn); - property.SetNpgsqlHiLoSequenceName(null); - property.SetNpgsqlHiLoSequenceSchema(null); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SerialColumn); + property.SetHiLoSequenceName(null); + property.SetHiLoSequenceSchema(null); return propertyBuilder; } @@ -191,9 +191,9 @@ public static PropertyBuilder UseIdentityAlwaysColumn([NotNull] this PropertyBui Check.NotNull(propertyBuilder, nameof(propertyBuilder)); var property = propertyBuilder.Metadata; - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityAlwaysColumn); - property.SetNpgsqlHiLoSequenceName(null); - property.SetNpgsqlHiLoSequenceSchema(null); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityAlwaysColumn); + property.SetHiLoSequenceName(null); + property.SetHiLoSequenceSchema(null); return propertyBuilder; } @@ -229,9 +229,9 @@ public static IConventionPropertyBuilder UseIdentityAlwaysColumn([NotNull] this if (propertyBuilder.CanSetValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityAlwaysColumn)) { var property = propertyBuilder.Metadata; - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityAlwaysColumn); - property.SetNpgsqlHiLoSequenceName(null); - property.SetNpgsqlHiLoSequenceSchema(null); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityAlwaysColumn); + property.SetHiLoSequenceName(null); + property.SetHiLoSequenceSchema(null); return propertyBuilder; } @@ -259,9 +259,9 @@ public static PropertyBuilder UseIdentityByDefaultColumn([NotNull] this Property Check.NotNull(propertyBuilder, nameof(propertyBuilder)); var property = propertyBuilder.Metadata; - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - property.SetNpgsqlHiLoSequenceName(null); - property.SetNpgsqlHiLoSequenceSchema(null); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + property.SetHiLoSequenceName(null); + property.SetHiLoSequenceSchema(null); return propertyBuilder; } @@ -298,9 +298,9 @@ public static IConventionPropertyBuilder UseIdentityByDefaultColumn([NotNull] th if (propertyBuilder.CanSetValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityByDefaultColumn)) { var property = propertyBuilder.Metadata; - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - property.SetNpgsqlHiLoSequenceName(null); - property.SetNpgsqlHiLoSequenceSchema(null); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + property.SetHiLoSequenceName(null); + property.SetHiLoSequenceSchema(null); return propertyBuilder; } @@ -360,7 +360,7 @@ public static IConventionPropertyBuilder HasValueGenerationStrategy( if (propertyBuilder.CanSetAnnotation( NpgsqlAnnotationNames.ValueGenerationStrategy, valueGenerationStrategy, fromDataAnnotation)) { - propertyBuilder.Metadata.SetNpgsqlValueGenerationStrategy(valueGenerationStrategy, fromDataAnnotation); + propertyBuilder.Metadata.SetValueGenerationStrategy(valueGenerationStrategy, fromDataAnnotation); if (valueGenerationStrategy != NpgsqlValueGenerationStrategy.SequenceHiLo) { propertyBuilder.HasHiLoSequence(null, null, fromDataAnnotation); @@ -409,7 +409,7 @@ public static PropertyBuilder ForNpgsqlHasComment( Check.NotNull(propertyBuilder, nameof(propertyBuilder)); Check.NullButNotEmpty(comment, nameof(comment)); - propertyBuilder.Metadata.SetNpgsqlComment(comment); + NpgsqlPropertyExtensions.SetComment(propertyBuilder.Metadata, comment); return propertyBuilder; } diff --git a/src/EFCore.PG/Extensions/NpgsqlPropertyExtensions.cs b/src/EFCore.PG/Extensions/NpgsqlPropertyExtensions.cs index f5eddd839..353411a32 100644 --- a/src/EFCore.PG/Extensions/NpgsqlPropertyExtensions.cs +++ b/src/EFCore.PG/Extensions/NpgsqlPropertyExtensions.cs @@ -18,7 +18,7 @@ public static class NpgsqlPropertyExtensions /// /// The property. /// The name to use for the hi-lo sequence. - public static string GetNpgsqlHiLoSequenceName([NotNull] this IProperty property) + public static string GetHiLoSequenceName([NotNull] this IProperty property) => (string)property[NpgsqlAnnotationNames.HiLoSequenceName]; /// @@ -26,7 +26,7 @@ public static string GetNpgsqlHiLoSequenceName([NotNull] this IProperty property /// /// The property. /// The sequence name to use. - public static void SetNpgsqlHiLoSequenceName([NotNull] this IMutableProperty property, [CanBeNull] string name) + public static void SetHiLoSequenceName([NotNull] this IMutableProperty property, [CanBeNull] string name) => property.SetOrRemoveAnnotation( NpgsqlAnnotationNames.HiLoSequenceName, Check.NullButNotEmpty(name, nameof(name))); @@ -37,7 +37,7 @@ public static void SetNpgsqlHiLoSequenceName([NotNull] this IMutableProperty pro /// The property. /// The sequence name to use. /// Indicates whether the configuration was specified using a data annotation. - public static void SetNpgsqlHiLoSequenceName( + public static void SetHiLoSequenceName( [NotNull] this IConventionProperty property, [CanBeNull] string name, bool fromDataAnnotation = false) => property.SetOrRemoveAnnotation( NpgsqlAnnotationNames.HiLoSequenceName, @@ -49,7 +49,7 @@ public static void SetNpgsqlHiLoSequenceName( /// /// The property. /// The for the hi-lo sequence name. - public static ConfigurationSource? GetNpgsqlHiLoSequenceNameConfigurationSource([NotNull] this IConventionProperty property) + public static ConfigurationSource? GetHiLoSequenceNameConfigurationSource([NotNull] this IConventionProperty property) => property.FindAnnotation(NpgsqlAnnotationNames.HiLoSequenceName)?.GetConfigurationSource(); /// @@ -57,7 +57,7 @@ public static void SetNpgsqlHiLoSequenceName( /// /// The property. /// The schema to use for the hi-lo sequence. - public static string GetNpgsqlHiLoSequenceSchema([NotNull] this IProperty property) + public static string GetHiLoSequenceSchema([NotNull] this IProperty property) => (string)property[NpgsqlAnnotationNames.HiLoSequenceSchema]; /// @@ -65,7 +65,7 @@ public static string GetNpgsqlHiLoSequenceSchema([NotNull] this IProperty proper /// /// The property. /// The schema to use. - public static void SetNpgsqlHiLoSequenceSchema([NotNull] this IMutableProperty property, [CanBeNull] string schema) + public static void SetHiLoSequenceSchema([NotNull] this IMutableProperty property, [CanBeNull] string schema) => property.SetOrRemoveAnnotation( NpgsqlAnnotationNames.HiLoSequenceSchema, Check.NullButNotEmpty(schema, nameof(schema))); @@ -76,7 +76,7 @@ public static void SetNpgsqlHiLoSequenceSchema([NotNull] this IMutableProperty p /// The property. /// The schema to use. /// Indicates whether the configuration was specified using a data annotation. - public static void SetNpgsqlHiLoSequenceSchema( + public static void SetHiLoSequenceSchema( [NotNull] this IConventionProperty property, [CanBeNull] string schema, bool fromDataAnnotation = false) => property.SetOrRemoveAnnotation( NpgsqlAnnotationNames.HiLoSequenceSchema, @@ -88,27 +88,27 @@ public static void SetNpgsqlHiLoSequenceSchema( /// /// The property. /// The for the hi-lo sequence schema. - public static ConfigurationSource? GetNpgsqlHiLoSequenceSchemaConfigurationSource([NotNull] this IConventionProperty property) + public static ConfigurationSource? GetHiLoSequenceSchemaConfigurationSource([NotNull] this IConventionProperty property) => property.FindAnnotation(NpgsqlAnnotationNames.HiLoSequenceSchema)?.GetConfigurationSource(); /// /// Finds the in the model to use for the hi-lo pattern. /// /// The sequence to use, or null if no sequence exists in the model. - public static ISequence FindNpgsqlHiLoSequence([NotNull] this IProperty property) + public static ISequence FindHiLoSequence([NotNull] this IProperty property) { var model = property.DeclaringEntityType.Model; - if (property.GetNpgsqlValueGenerationStrategy() != NpgsqlValueGenerationStrategy.SequenceHiLo) + if (property.GetValueGenerationStrategy() != NpgsqlValueGenerationStrategy.SequenceHiLo) { return null; } - var sequenceName = property.GetNpgsqlHiLoSequenceName() - ?? model.GetNpgsqlHiLoSequenceName(); + var sequenceName = property.GetHiLoSequenceName() + ?? model.GetHiLoSequenceName(); - var sequenceSchema = property.GetNpgsqlHiLoSequenceSchema() - ?? model.GetNpgsqlHiLoSequenceSchema(); + var sequenceSchema = property.GetHiLoSequenceSchema() + ?? model.GetHiLoSequenceSchema(); return model.FindSequence(sequenceName, sequenceSchema); } @@ -124,7 +124,7 @@ public static ISequence FindNpgsqlHiLoSequence([NotNull] this IProperty property /// /// /// The strategy, or if none was set. - public static NpgsqlValueGenerationStrategy GetNpgsqlValueGenerationStrategy([NotNull] this IProperty property) + public static NpgsqlValueGenerationStrategy GetValueGenerationStrategy([NotNull] this IProperty property) { var annotation = property[NpgsqlAnnotationNames.ValueGenerationStrategy]; if (annotation != null) @@ -142,7 +142,7 @@ public static NpgsqlValueGenerationStrategy GetNpgsqlValueGenerationStrategy([No return NpgsqlValueGenerationStrategy.None; } - return property.DeclaringEntityType.Model.GetNpgsqlValueGenerationStrategy() + return property.DeclaringEntityType.Model.GetValueGenerationStrategy() ?? NpgsqlValueGenerationStrategy.None; } @@ -151,10 +151,10 @@ public static NpgsqlValueGenerationStrategy GetNpgsqlValueGenerationStrategy([No /// /// The property. /// The strategy to use. - public static void SetNpgsqlValueGenerationStrategy( + public static void SetValueGenerationStrategy( [NotNull] this IMutableProperty property, NpgsqlValueGenerationStrategy? value) { - CheckNpgsqlValueGenerationStrategy(property, value); + CheckValueGenerationStrategy(property, value); property.SetOrRemoveAnnotation(NpgsqlAnnotationNames.ValueGenerationStrategy, value); } @@ -165,15 +165,15 @@ public static void SetNpgsqlValueGenerationStrategy( /// The property. /// The strategy to use. /// Indicates whether the configuration was specified using a data annotation. - public static void SetNpgsqlValueGenerationStrategy( + public static void SetValueGenerationStrategy( [NotNull] this IConventionProperty property, NpgsqlValueGenerationStrategy? value, bool fromDataAnnotation = false) { - CheckNpgsqlValueGenerationStrategy(property, value); + CheckValueGenerationStrategy(property, value); property.SetOrRemoveAnnotation(NpgsqlAnnotationNames.ValueGenerationStrategy, value, fromDataAnnotation); } - static void CheckNpgsqlValueGenerationStrategy(IProperty property, NpgsqlValueGenerationStrategy? value) + static void CheckValueGenerationStrategy(IProperty property, NpgsqlValueGenerationStrategy? value) { if (value != null) { @@ -202,7 +202,7 @@ static void CheckNpgsqlValueGenerationStrategy(IProperty property, NpgsqlValueGe /// /// The property. /// The for the . - public static ConfigurationSource? GetNpgsqlValueGenerationStrategyConfigurationSource( + public static ConfigurationSource? GetValueGenerationStrategyConfigurationSource( [NotNull] this IConventionProperty property) => property.FindAnnotation(NpgsqlAnnotationNames.ValueGenerationStrategy)?.GetConfigurationSource(); @@ -229,10 +229,10 @@ static bool IsIntegerForValueGeneration(this Type type) #region Comment - public static string GetNpgsqlComment([NotNull] this IProperty property) + public static string GetComment([NotNull] this IProperty property) => (string)property[NpgsqlAnnotationNames.Comment]; - public static void SetNpgsqlComment([NotNull] this IMutableProperty property, [CanBeNull] string comment) + public static void SetComment([NotNull] this IMutableProperty property, [CanBeNull] string comment) => property.SetOrRemoveAnnotation(NpgsqlAnnotationNames.Comment, comment); #endregion Comment diff --git a/src/EFCore.PG/Infrastructure/NpgsqlModelValidator.cs b/src/EFCore.PG/Infrastructure/NpgsqlModelValidator.cs index b500c24cc..492061626 100644 --- a/src/EFCore.PG/Infrastructure/NpgsqlModelValidator.cs +++ b/src/EFCore.PG/Infrastructure/NpgsqlModelValidator.cs @@ -47,7 +47,7 @@ protected virtual void ValidateIdentityVersionCompatibility([NotNull] IModel mod if (VersionAtLeast(10, 0)) return; - var strategy = model.GetNpgsqlValueGenerationStrategy(); + var strategy = model.GetValueGenerationStrategy(); if (strategy == NpgsqlValueGenerationStrategy.IdentityAlwaysColumn || strategy == NpgsqlValueGenerationStrategy.IdentityByDefaultColumn) @@ -57,7 +57,7 @@ protected virtual void ValidateIdentityVersionCompatibility([NotNull] IModel mod foreach (var property in model.GetEntityTypes().SelectMany(e => e.GetProperties())) { - var propertyStrategy = property.GetNpgsqlValueGenerationStrategy(); + var propertyStrategy = property.GetValueGenerationStrategy(); if (propertyStrategy == NpgsqlValueGenerationStrategy.IdentityAlwaysColumn || propertyStrategy == NpgsqlValueGenerationStrategy.IdentityByDefaultColumn) @@ -72,7 +72,7 @@ protected virtual void ValidateIndexIncludeProperties([NotNull] IModel model) { foreach (var index in model.GetEntityTypes().SelectMany(t => t.GetDeclaredIndexes())) { - var includeProperties = index.GetNpgsqlIncludeProperties(); + var includeProperties = index.GetIncludeProperties(); if (includeProperties?.Count > 0) { var notFound = includeProperties diff --git a/src/EFCore.PG/Metadata/Conventions/NpgsqlStoreGenerationConvention.cs b/src/EFCore.PG/Metadata/Conventions/NpgsqlStoreGenerationConvention.cs index 3d7962b6a..0823624a8 100644 --- a/src/EFCore.PG/Metadata/Conventions/NpgsqlStoreGenerationConvention.cs +++ b/src/EFCore.PG/Metadata/Conventions/NpgsqlStoreGenerationConvention.cs @@ -97,8 +97,8 @@ public override void ProcessPropertyAnnotationChanged( protected override void Validate(IConventionProperty property) { - if (property.GetNpgsqlValueGenerationStrategyConfigurationSource() != null - && property.GetNpgsqlValueGenerationStrategy() != NpgsqlValueGenerationStrategy.None) + if (property.GetValueGenerationStrategyConfigurationSource() != null + && property.GetValueGenerationStrategy() != NpgsqlValueGenerationStrategy.None) { if (property.GetDefaultValue() != null) { diff --git a/src/EFCore.PG/Metadata/Conventions/NpgsqlValueGenerationConvention.cs b/src/EFCore.PG/Metadata/Conventions/NpgsqlValueGenerationConvention.cs index bf1c7ebf6..48a8ff1f4 100644 --- a/src/EFCore.PG/Metadata/Conventions/NpgsqlValueGenerationConvention.cs +++ b/src/EFCore.PG/Metadata/Conventions/NpgsqlValueGenerationConvention.cs @@ -66,7 +66,7 @@ public override void ProcessPropertyAnnotationChanged( /// The store value generation strategy to set for the given property. public static new ValueGenerated? GetValueGenerated([NotNull] IProperty property) => RelationalValueGenerationConvention.GetValueGenerated(property) - ?? (property.GetNpgsqlValueGenerationStrategy() != NpgsqlValueGenerationStrategy.None + ?? (property.GetValueGenerationStrategy() != NpgsqlValueGenerationStrategy.None ? ValueGenerated.OnAdd : (ValueGenerated?)null); } diff --git a/src/EFCore.PG/Metadata/Conventions/NpgsqlValueGenerationStrategyConvention.cs b/src/EFCore.PG/Metadata/Conventions/NpgsqlValueGenerationStrategyConvention.cs index 953f5edab..4e9616721 100644 --- a/src/EFCore.PG/Metadata/Conventions/NpgsqlValueGenerationStrategyConvention.cs +++ b/src/EFCore.PG/Metadata/Conventions/NpgsqlValueGenerationStrategyConvention.cs @@ -50,7 +50,7 @@ public virtual void ProcessModelFinalized( foreach (var property in entityType.GetDeclaredProperties()) { // Needed for the annotation to show up in the model snapshot - var strategy = property.GetNpgsqlValueGenerationStrategy(); + var strategy = property.GetValueGenerationStrategy(); if (strategy != NpgsqlValueGenerationStrategy.None) { property.Builder.HasValueGenerationStrategy(strategy); diff --git a/src/EFCore.PG/Migrations/Internal/NpgsqlMigrationsAnnotationProvider.cs b/src/EFCore.PG/Migrations/Internal/NpgsqlMigrationsAnnotationProvider.cs index 40193e57b..ff716210f 100644 --- a/src/EFCore.PG/Migrations/Internal/NpgsqlMigrationsAnnotationProvider.cs +++ b/src/EFCore.PG/Migrations/Internal/NpgsqlMigrationsAnnotationProvider.cs @@ -18,10 +18,10 @@ public NpgsqlMigrationsAnnotationProvider([NotNull] MigrationsAnnotationProvider public override IEnumerable For(IEntityType entityType) { - if (entityType.GetNpgsqlComment() is string comment) + if (NpgsqlEntityTypeExtensions.GetComment(entityType) is string comment) yield return new Annotation(NpgsqlAnnotationNames.Comment, comment); - if (entityType.GetNpgsqlIsUnlogged()) - yield return new Annotation(NpgsqlAnnotationNames.UnloggedTable, entityType.GetNpgsqlIsUnlogged()); + if (entityType.GetIsUnlogged()) + yield return new Annotation(NpgsqlAnnotationNames.UnloggedTable, entityType.GetIsUnlogged()); if (entityType[CockroachDbAnnotationNames.InterleaveInParent] != null) yield return new Annotation(CockroachDbAnnotationNames.InterleaveInParent, entityType[CockroachDbAnnotationNames.InterleaveInParent]); foreach (var storageParamAnnotation in entityType.GetAnnotations() @@ -33,30 +33,30 @@ public override IEnumerable For(IEntityType entityType) public override IEnumerable For(IProperty property) { - if (property.GetNpgsqlValueGenerationStrategy() is NpgsqlValueGenerationStrategy npgsqlValueGenerationStrategy && + if (property.GetValueGenerationStrategy() is NpgsqlValueGenerationStrategy npgsqlValueGenerationStrategy && npgsqlValueGenerationStrategy != NpgsqlValueGenerationStrategy.None) { yield return new Annotation(NpgsqlAnnotationNames.ValueGenerationStrategy, npgsqlValueGenerationStrategy); } - if (property.GetNpgsqlComment() is string comment) + if (NpgsqlPropertyExtensions.GetComment(property) is string comment) yield return new Annotation(NpgsqlAnnotationNames.Comment, comment); } public override IEnumerable For(IIndex index) { - if (index.GetNpgsqlMethod() is string method) + if (index.GetMethod() is string method) yield return new Annotation(NpgsqlAnnotationNames.IndexMethod, method); - if (index.GetNpgsqlOperators() is IReadOnlyList operators) + if (index.GetOperators() is IReadOnlyList operators) yield return new Annotation(NpgsqlAnnotationNames.IndexOperators, operators); - if (index.GetNpgsqlCollation() is IReadOnlyList collation) + if (index.GetCollation() is IReadOnlyList collation) yield return new Annotation(NpgsqlAnnotationNames.IndexCollation, collation); - if (index.GetNpgsqlSortOrder() is IReadOnlyList sortOrder) + if (index.GetSortOrder() is IReadOnlyList sortOrder) yield return new Annotation(NpgsqlAnnotationNames.IndexSortOrder, sortOrder); - if (index.GetNpgsqlNullSortOrder() is IReadOnlyList nullSortOrder) + if (index.GetNullSortOrder() is IReadOnlyList nullSortOrder) yield return new Annotation(NpgsqlAnnotationNames.IndexNullSortOrder, nullSortOrder); - if (index.GetNpgsqlIncludeProperties() is IReadOnlyList includeProperties) + if (index.GetIncludeProperties() is IReadOnlyList includeProperties) yield return new Annotation(NpgsqlAnnotationNames.IndexInclude, includeProperties); } diff --git a/src/EFCore.PG/Migrations/NpgsqlMigrationsSqlGenerator.cs b/src/EFCore.PG/Migrations/NpgsqlMigrationsSqlGenerator.cs index f918442d0..acb6e8c81 100644 --- a/src/EFCore.PG/Migrations/NpgsqlMigrationsSqlGenerator.cs +++ b/src/EFCore.PG/Migrations/NpgsqlMigrationsSqlGenerator.cs @@ -971,7 +971,7 @@ protected override void Generate( foreach (var modificationCommand in operation.GenerateModificationCommands(model)) { var overridingSystemValue = modificationCommand.ColumnModifications.Any(m => - m.Property?.GetNpgsqlValueGenerationStrategy() == NpgsqlValueGenerationStrategy.IdentityAlwaysColumn); + m.Property?.GetValueGenerationStrategy() == NpgsqlValueGenerationStrategy.IdentityAlwaysColumn); ((NpgsqlUpdateSqlGenerator)Dependencies.UpdateSqlGenerator).AppendInsertOperation( sqlBuilder, modificationCommand, diff --git a/src/EFCore.PG/Storage/Internal/NpgsqlDatabaseCreator.cs b/src/EFCore.PG/Storage/Internal/NpgsqlDatabaseCreator.cs index 6869c0d27..bcf181b34 100644 --- a/src/EFCore.PG/Storage/Internal/NpgsqlDatabaseCreator.cs +++ b/src/EFCore.PG/Storage/Internal/NpgsqlDatabaseCreator.cs @@ -188,8 +188,8 @@ IReadOnlyList CreateCreateOperations() new NpgsqlCreateDatabaseOperation { Name = _connection.DbConnection.Database, - Template = Dependencies.Model.GetNpgsqlDatabaseTemplate(), - Tablespace = Dependencies.Model.GetNpgsqlTablespace() + Template = Dependencies.Model.GetDatabaseTemplate(), + Tablespace = Dependencies.Model.GetTablespace() } }); diff --git a/src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorCache.cs b/src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorCache.cs index d4c65f616..23d09e006 100644 --- a/src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorCache.cs +++ b/src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorCache.cs @@ -36,7 +36,7 @@ public virtual NpgsqlSequenceValueGeneratorState GetOrAddSequenceState( IRelationalConnection connection) { //var sequence = property.GetNpgsql().FindHiLoSequence(); - var sequence = property.FindNpgsqlHiLoSequence(); + var sequence = property.FindHiLoSequence(); Debug.Assert(sequence != null); diff --git a/src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorSelector.cs b/src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorSelector.cs index 65210f92f..8641ee2b5 100644 --- a/src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorSelector.cs +++ b/src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorSelector.cs @@ -44,7 +44,7 @@ public override ValueGenerator Select(IProperty property, IEntityType entityType Check.NotNull(entityType, nameof(entityType)); return property.GetValueGeneratorFactory() == null - && property.GetNpgsqlValueGenerationStrategy() == NpgsqlValueGenerationStrategy.SequenceHiLo + && property.GetValueGenerationStrategy() == NpgsqlValueGenerationStrategy.SequenceHiLo ? _sequenceFactory.Create( property, Cache.GetOrAddSequenceState(property, _connection), diff --git a/test/EFCore.PG.Tests/Metadata/NpgsqlBuilderExtensionsTest.cs b/test/EFCore.PG.Tests/Metadata/NpgsqlBuilderExtensionsTest.cs index fd8cec232..053328ba6 100644 --- a/test/EFCore.PG.Tests/Metadata/NpgsqlBuilderExtensionsTest.cs +++ b/test/EFCore.PG.Tests/Metadata/NpgsqlBuilderExtensionsTest.cs @@ -18,7 +18,7 @@ public void CockroachDbInterleaveInParent() .UseCockroachDbInterleaveInParent(typeof(Customer), new List { "col_a", "col_b" }); var entityType = modelBuilder.Model.FindEntityType(typeof(Customer)); - var interleaveInParent = entityType.GetNpgsqlCockroachDbInterleaveInParent(); + var interleaveInParent = entityType.GetCockroachDbInterleaveInParent(); Assert.Equal("my_schema", interleaveInParent.ParentTableSchema); Assert.Equal("customers", interleaveInParent.ParentTableName); diff --git a/test/EFCore.PG.Tests/Metadata/NpgsqlMetadataBuilderExtensionsTest.cs b/test/EFCore.PG.Tests/Metadata/NpgsqlMetadataBuilderExtensionsTest.cs index 7ea4874b5..4b2ecc798 100644 --- a/test/EFCore.PG.Tests/Metadata/NpgsqlMetadataBuilderExtensionsTest.cs +++ b/test/EFCore.PG.Tests/Metadata/NpgsqlMetadataBuilderExtensionsTest.cs @@ -21,16 +21,16 @@ public void Can_access_model() Assert.NotNull(builder .HasValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo)); - Assert.Equal(NpgsqlValueGenerationStrategy.SequenceHiLo, builder.Metadata.GetNpgsqlValueGenerationStrategy()); + Assert.Equal(NpgsqlValueGenerationStrategy.SequenceHiLo, builder.Metadata.GetValueGenerationStrategy()); Assert.NotNull(builder .HasValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityByDefaultColumn, fromDataAnnotation: true)); Assert.Equal( - NpgsqlValueGenerationStrategy.IdentityByDefaultColumn, builder.Metadata.GetNpgsqlValueGenerationStrategy()); + NpgsqlValueGenerationStrategy.IdentityByDefaultColumn, builder.Metadata.GetValueGenerationStrategy()); Assert.Null(builder .HasValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo)); - Assert.Equal(NpgsqlValueGenerationStrategy.IdentityByDefaultColumn, builder.Metadata.GetNpgsqlValueGenerationStrategy()); + Assert.Equal(NpgsqlValueGenerationStrategy.IdentityByDefaultColumn, builder.Metadata.GetValueGenerationStrategy()); Assert.Equal( 1, builder.Metadata.GetAnnotations().Count( @@ -43,13 +43,13 @@ public void Can_access_entity_type() var typeBuilder = CreateBuilder().Entity(typeof(Splot)); Assert.NotNull(typeBuilder.IsUnlogged()); - Assert.True(typeBuilder.Metadata.GetNpgsqlIsUnlogged()); + Assert.True(typeBuilder.Metadata.GetIsUnlogged()); Assert.NotNull(typeBuilder.IsUnlogged(false, fromDataAnnotation: true)); - Assert.False(typeBuilder.Metadata.GetNpgsqlIsUnlogged()); + Assert.False(typeBuilder.Metadata.GetIsUnlogged()); Assert.Null(typeBuilder.IsUnlogged(true)); - Assert.False(typeBuilder.Metadata.GetNpgsqlIsUnlogged()); + Assert.False(typeBuilder.Metadata.GetIsUnlogged()); Assert.Equal( 1, typeBuilder.Metadata.GetAnnotations().Count( @@ -64,13 +64,13 @@ public void Can_access_property() .Property(typeof(int), "Id"); Assert.NotNull(propertyBuilder.HasHiLoSequence("Splew", null)); - Assert.Equal("Splew", propertyBuilder.Metadata.GetNpgsqlHiLoSequenceName()); + Assert.Equal("Splew", propertyBuilder.Metadata.GetHiLoSequenceName()); Assert.NotNull(propertyBuilder.HasHiLoSequence("Splow", null, fromDataAnnotation: true)); - Assert.Equal("Splow", propertyBuilder.Metadata.GetNpgsqlHiLoSequenceName()); + Assert.Equal("Splow", propertyBuilder.Metadata.GetHiLoSequenceName()); Assert.Null(propertyBuilder.HasHiLoSequence("Splod", null)); - Assert.Equal("Splow", propertyBuilder.Metadata.GetNpgsqlHiLoSequenceName()); + Assert.Equal("Splow", propertyBuilder.Metadata.GetHiLoSequenceName()); Assert.Equal( 1, propertyBuilder.Metadata.GetAnnotations().Count( @@ -104,13 +104,13 @@ public void Can_access_index() var indexBuilder = entityTypeBuilder.HasIndex(new[] { idProperty }); Assert.NotNull(indexBuilder.HasMethod("gin")); - Assert.Equal("gin", indexBuilder.Metadata.GetNpgsqlMethod()); + Assert.Equal("gin", indexBuilder.Metadata.GetMethod()); Assert.NotNull(indexBuilder.HasMethod("gist", fromDataAnnotation: true)); - Assert.Equal("gist", indexBuilder.Metadata.GetNpgsqlMethod()); + Assert.Equal("gist", indexBuilder.Metadata.GetMethod()); Assert.Null(indexBuilder.HasMethod("gin")); - Assert.Equal("gist", indexBuilder.Metadata.GetNpgsqlMethod()); + Assert.Equal("gist", indexBuilder.Metadata.GetMethod()); Assert.Equal( 1, indexBuilder.Metadata.GetAnnotations().Count( diff --git a/test/EFCore.PG.Tests/Metadata/NpgsqlMetadataExtensionsTest.cs b/test/EFCore.PG.Tests/Metadata/NpgsqlMetadataExtensionsTest.cs index 8e519b4b6..20d1d763c 100644 --- a/test/EFCore.PG.Tests/Metadata/NpgsqlMetadataExtensionsTest.cs +++ b/test/EFCore.PG.Tests/Metadata/NpgsqlMetadataExtensionsTest.cs @@ -74,15 +74,15 @@ public void Can_get_and_set_index_method() .HasIndex(e => e.Id) .Metadata; - Assert.Null(index.GetNpgsqlMethod()); + Assert.Null(index.GetMethod()); - index.SetNpgsqlMethod("gin"); + index.SetMethod("gin"); - Assert.Equal("gin", index.GetNpgsqlMethod()); + Assert.Equal("gin", index.GetMethod()); - index.SetNpgsqlMethod(null); + index.SetMethod(null); - Assert.Null(index.GetNpgsqlMethod()); + Assert.Null(index.GetMethod()); } [ConditionalFact] @@ -231,15 +231,15 @@ public void Can_get_and_set_value_generation_on_model() var modelBuilder = GetModelBuilder(); var model = modelBuilder.Model; - Assert.Equal(NpgsqlValueGenerationStrategy.SerialColumn, model.GetNpgsqlValueGenerationStrategy()); + Assert.Equal(NpgsqlValueGenerationStrategy.SerialColumn, model.GetValueGenerationStrategy()); - model.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); + model.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); - Assert.Equal(NpgsqlValueGenerationStrategy.SequenceHiLo, model.GetNpgsqlValueGenerationStrategy()); + Assert.Equal(NpgsqlValueGenerationStrategy.SequenceHiLo, model.GetValueGenerationStrategy()); - model.SetNpgsqlValueGenerationStrategy(null); + model.SetValueGenerationStrategy(null); - Assert.Null(model.GetNpgsqlValueGenerationStrategy()); + Assert.Null(model.GetValueGenerationStrategy()); } [ConditionalFact] @@ -248,13 +248,13 @@ public void Can_get_and_set_default_sequence_name_on_model() var modelBuilder = GetModelBuilder(); var model = modelBuilder.Model; - model.SetNpgsqlHiLoSequenceName("Tasty.Snook"); + model.SetHiLoSequenceName("Tasty.Snook"); - Assert.Equal("Tasty.Snook", model.GetNpgsqlHiLoSequenceName()); + Assert.Equal("Tasty.Snook", model.GetHiLoSequenceName()); - model.SetNpgsqlHiLoSequenceName(null); + model.SetHiLoSequenceName(null); - Assert.Equal(NpgsqlModelExtensions.DefaultHiLoSequenceName, model.GetNpgsqlHiLoSequenceName()); + Assert.Equal(NpgsqlModelExtensions.DefaultHiLoSequenceName, model.GetHiLoSequenceName()); } [ConditionalFact] @@ -263,39 +263,39 @@ public void Can_get_and_set_default_sequence_schema_on_model() var modelBuilder = GetModelBuilder(); var model = modelBuilder.Model; - Assert.Null(model.GetNpgsqlHiLoSequenceSchema()); + Assert.Null(model.GetHiLoSequenceSchema()); - model.SetNpgsqlHiLoSequenceSchema("Tasty.Snook"); + model.SetHiLoSequenceSchema("Tasty.Snook"); - Assert.Equal("Tasty.Snook", model.GetNpgsqlHiLoSequenceSchema()); + Assert.Equal("Tasty.Snook", model.GetHiLoSequenceSchema()); - model.SetNpgsqlHiLoSequenceSchema(null); + model.SetHiLoSequenceSchema(null); - Assert.Null(model.GetNpgsqlHiLoSequenceSchema()); + Assert.Null(model.GetHiLoSequenceSchema()); } [ConditionalFact] public void Can_get_and_set_value_generation_on_property() { var modelBuilder = GetModelBuilder(); - modelBuilder.Model.SetNpgsqlValueGenerationStrategy(null); + modelBuilder.Model.SetValueGenerationStrategy(null); var property = modelBuilder .Entity() .Property(e => e.Id) .Metadata; - Assert.Equal(NpgsqlValueGenerationStrategy.None, property.GetNpgsqlValueGenerationStrategy()); + Assert.Equal(NpgsqlValueGenerationStrategy.None, property.GetValueGenerationStrategy()); Assert.Equal(ValueGenerated.OnAdd, property.ValueGenerated); - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); - Assert.Equal(NpgsqlValueGenerationStrategy.SequenceHiLo, property.GetNpgsqlValueGenerationStrategy()); + Assert.Equal(NpgsqlValueGenerationStrategy.SequenceHiLo, property.GetValueGenerationStrategy()); Assert.Equal(ValueGenerated.OnAdd, property.ValueGenerated); - property.SetNpgsqlValueGenerationStrategy(null); + property.SetValueGenerationStrategy(null); - Assert.Equal(NpgsqlValueGenerationStrategy.None, property.GetNpgsqlValueGenerationStrategy()); + Assert.Equal(NpgsqlValueGenerationStrategy.None, property.GetValueGenerationStrategy()); Assert.Equal(ValueGenerated.OnAdd, property.ValueGenerated); } @@ -309,15 +309,15 @@ public void Can_get_and_set_value_generation_on_nullable_property() .Property(e => e.NullableInt).ValueGeneratedOnAdd() .Metadata; - Assert.Equal(NpgsqlValueGenerationStrategy.SerialColumn, property.GetNpgsqlValueGenerationStrategy()); + Assert.Equal(NpgsqlValueGenerationStrategy.SerialColumn, property.GetValueGenerationStrategy()); - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); - Assert.Equal(NpgsqlValueGenerationStrategy.SequenceHiLo, property.GetNpgsqlValueGenerationStrategy()); + Assert.Equal(NpgsqlValueGenerationStrategy.SequenceHiLo, property.GetValueGenerationStrategy()); - property.SetNpgsqlValueGenerationStrategy(null); + property.SetValueGenerationStrategy(null); - Assert.Equal(NpgsqlValueGenerationStrategy.SerialColumn, property.GetNpgsqlValueGenerationStrategy()); + Assert.Equal(NpgsqlValueGenerationStrategy.SerialColumn, property.GetValueGenerationStrategy()); } [ConditionalFact] @@ -330,16 +330,16 @@ public void Can_get_and_set_sequence_name_on_property() .Property(e => e.Id) .Metadata; - Assert.Null(property.GetNpgsqlHiLoSequenceName()); - Assert.Null(((IProperty)property).GetNpgsqlHiLoSequenceName()); + Assert.Null(property.GetHiLoSequenceName()); + Assert.Null(((IProperty)property).GetHiLoSequenceName()); - property.SetNpgsqlHiLoSequenceName("Snook"); + property.SetHiLoSequenceName("Snook"); - Assert.Equal("Snook", property.GetNpgsqlHiLoSequenceName()); + Assert.Equal("Snook", property.GetHiLoSequenceName()); - property.SetNpgsqlHiLoSequenceName(null); + property.SetHiLoSequenceName(null); - Assert.Null(property.GetNpgsqlHiLoSequenceName()); + Assert.Null(property.GetHiLoSequenceName()); } [ConditionalFact] @@ -352,15 +352,15 @@ public void Can_get_and_set_sequence_schema_on_property() .Property(e => e.Id) .Metadata; - Assert.Null(property.GetNpgsqlHiLoSequenceSchema()); + Assert.Null(property.GetHiLoSequenceSchema()); - property.SetNpgsqlHiLoSequenceSchema("Tasty"); + property.SetHiLoSequenceSchema("Tasty"); - Assert.Equal("Tasty", property.GetNpgsqlHiLoSequenceSchema()); + Assert.Equal("Tasty", property.GetHiLoSequenceSchema()); - property.SetNpgsqlHiLoSequenceSchema(null); + property.SetHiLoSequenceSchema(null); - Assert.Null(property.GetNpgsqlHiLoSequenceSchema()); + Assert.Null(property.GetHiLoSequenceSchema()); } [ConditionalFact] @@ -375,20 +375,20 @@ public void TryGetSequence_returns_null_if_property_is_not_configured_for_sequen modelBuilder.Model.AddSequence("DaneelOlivaw"); - Assert.Null(property.FindNpgsqlHiLoSequence()); + Assert.Null(property.FindHiLoSequence()); - property.SetNpgsqlHiLoSequenceName("DaneelOlivaw"); + property.SetHiLoSequenceName("DaneelOlivaw"); - Assert.Null(property.FindNpgsqlHiLoSequence()); + Assert.Null(property.FindHiLoSequence()); - modelBuilder.Model.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + modelBuilder.Model.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - Assert.Null(property.FindNpgsqlHiLoSequence()); + Assert.Null(property.FindHiLoSequence()); - modelBuilder.Model.SetNpgsqlValueGenerationStrategy(null); - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + modelBuilder.Model.SetValueGenerationStrategy(null); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - Assert.Null(property.FindNpgsqlHiLoSequence()); + Assert.Null(property.FindHiLoSequence()); } [ConditionalFact] @@ -403,10 +403,10 @@ public void TryGetSequence_returns_sequence_property_is_marked_for_sequence_gene .Metadata; modelBuilder.Model.AddSequence("DaneelOlivaw"); - property.SetNpgsqlHiLoSequenceName("DaneelOlivaw"); - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); + property.SetHiLoSequenceName("DaneelOlivaw"); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); - Assert.Equal("DaneelOlivaw", property.FindNpgsqlHiLoSequence().Name); + Assert.Equal("DaneelOlivaw", property.FindHiLoSequence().Name); } [ConditionalFact] @@ -421,10 +421,10 @@ public void TryGetSequence_returns_sequence_property_is_marked_for_default_gener .Metadata; modelBuilder.Model.AddSequence("DaneelOlivaw"); - modelBuilder.Model.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); - property.SetNpgsqlHiLoSequenceName("DaneelOlivaw"); + modelBuilder.Model.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); + property.SetHiLoSequenceName("DaneelOlivaw"); - Assert.Equal("DaneelOlivaw", property.FindNpgsqlHiLoSequence().Name); + Assert.Equal("DaneelOlivaw", property.FindHiLoSequence().Name); } [ConditionalFact] @@ -439,10 +439,10 @@ public void TryGetSequence_returns_sequence_property_is_marked_for_sequence_gene .Metadata; modelBuilder.Model.AddSequence("DaneelOlivaw"); - modelBuilder.Model.SetNpgsqlHiLoSequenceName("DaneelOlivaw"); - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); + modelBuilder.Model.SetHiLoSequenceName("DaneelOlivaw"); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); - Assert.Equal("DaneelOlivaw", property.FindNpgsqlHiLoSequence().Name); + Assert.Equal("DaneelOlivaw", property.FindHiLoSequence().Name); } [ConditionalFact] @@ -458,10 +458,10 @@ public void .Metadata; modelBuilder.Model.AddSequence("DaneelOlivaw"); - modelBuilder.Model.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); - modelBuilder.Model.SetNpgsqlHiLoSequenceName("DaneelOlivaw"); + modelBuilder.Model.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); + modelBuilder.Model.SetHiLoSequenceName("DaneelOlivaw"); - Assert.Equal("DaneelOlivaw", property.FindNpgsqlHiLoSequence().Name); + Assert.Equal("DaneelOlivaw", property.FindHiLoSequence().Name); } [ConditionalFact] @@ -476,12 +476,12 @@ public void TryGetSequence_with_schema_returns_sequence_property_is_marked_for_s .Metadata; modelBuilder.Model.AddSequence("DaneelOlivaw", "R"); - property.SetNpgsqlHiLoSequenceName("DaneelOlivaw"); - property.SetNpgsqlHiLoSequenceSchema("R"); - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); + property.SetHiLoSequenceName("DaneelOlivaw"); + property.SetHiLoSequenceSchema("R"); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); - Assert.Equal("DaneelOlivaw", property.FindNpgsqlHiLoSequence().Name); - Assert.Equal("R", property.FindNpgsqlHiLoSequence().Schema); + Assert.Equal("DaneelOlivaw", property.FindHiLoSequence().Name); + Assert.Equal("R", property.FindHiLoSequence().Schema); } [ConditionalFact] @@ -496,12 +496,12 @@ public void TryGetSequence_with_schema_returns_sequence_model_is_marked_for_sequ .Metadata; modelBuilder.Model.AddSequence("DaneelOlivaw", "R"); - modelBuilder.Model.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); - property.SetNpgsqlHiLoSequenceName("DaneelOlivaw"); - property.SetNpgsqlHiLoSequenceSchema("R"); + modelBuilder.Model.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); + property.SetHiLoSequenceName("DaneelOlivaw"); + property.SetHiLoSequenceSchema("R"); - Assert.Equal("DaneelOlivaw", property.FindNpgsqlHiLoSequence().Name); - Assert.Equal("R", property.FindNpgsqlHiLoSequence().Schema); + Assert.Equal("DaneelOlivaw", property.FindHiLoSequence().Name); + Assert.Equal("R", property.FindHiLoSequence().Schema); } [ConditionalFact] @@ -516,12 +516,12 @@ public void TryGetSequence_with_schema_returns_sequence_property_is_marked_for_s .Metadata; modelBuilder.Model.AddSequence("DaneelOlivaw", "R"); - modelBuilder.Model.SetNpgsqlHiLoSequenceName("DaneelOlivaw"); - modelBuilder.Model.SetNpgsqlHiLoSequenceSchema("R"); - property.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); + modelBuilder.Model.SetHiLoSequenceName("DaneelOlivaw"); + modelBuilder.Model.SetHiLoSequenceSchema("R"); + property.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); - Assert.Equal("DaneelOlivaw", property.FindNpgsqlHiLoSequence().Name); - Assert.Equal("R", property.FindNpgsqlHiLoSequence().Schema); + Assert.Equal("DaneelOlivaw", property.FindHiLoSequence().Name); + Assert.Equal("R", property.FindHiLoSequence().Schema); } [ConditionalFact] @@ -536,12 +536,12 @@ public void TryGetSequence_with_schema_returns_sequence_model_is_marked_for_sequ .Metadata; modelBuilder.Model.AddSequence("DaneelOlivaw", "R"); - modelBuilder.Model.SetNpgsqlValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); - modelBuilder.Model.SetNpgsqlHiLoSequenceName("DaneelOlivaw"); - modelBuilder.Model.SetNpgsqlHiLoSequenceSchema("R"); + modelBuilder.Model.SetValueGenerationStrategy(NpgsqlValueGenerationStrategy.SequenceHiLo); + modelBuilder.Model.SetHiLoSequenceName("DaneelOlivaw"); + modelBuilder.Model.SetHiLoSequenceSchema("R"); - Assert.Equal("DaneelOlivaw", property.FindNpgsqlHiLoSequence().Name); - Assert.Equal("R", property.FindNpgsqlHiLoSequence().Schema); + Assert.Equal("DaneelOlivaw", property.FindHiLoSequence().Name); + Assert.Equal("R", property.FindHiLoSequence().Schema); } private static ModelBuilder GetModelBuilder() => NpgsqlTestHelpers.Instance.CreateConventionBuilder();