From b48be59aa7ce6908f5fa072ca7cb58ed0ca6068a Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Thu, 26 Oct 2017 12:12:34 -0500 Subject: [PATCH] minor data updates --- src/FilterLists.Data/Models/Contracts/IBaseEntity.cs | 2 +- src/FilterLists.Data/Models/Implementations/BaseEntity.cs | 4 ++-- .../InitializeNewTableBaseEntityDefaults.sql | 8 ++------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/FilterLists.Data/Models/Contracts/IBaseEntity.cs b/src/FilterLists.Data/Models/Contracts/IBaseEntity.cs index 06c2aa280..b78844b56 100644 --- a/src/FilterLists.Data/Models/Contracts/IBaseEntity.cs +++ b/src/FilterLists.Data/Models/Contracts/IBaseEntity.cs @@ -5,7 +5,7 @@ namespace FilterLists.Data.Models.Contracts public interface IBaseEntity { long Id { get; set; } - DateTime AddedDateUtc { get; set; } + DateTime CreatedDateUtc { get; set; } DateTime? ModifiedDateUtc { get; set; } } } \ No newline at end of file diff --git a/src/FilterLists.Data/Models/Implementations/BaseEntity.cs b/src/FilterLists.Data/Models/Implementations/BaseEntity.cs index aab5bd41b..c91950392 100644 --- a/src/FilterLists.Data/Models/Implementations/BaseEntity.cs +++ b/src/FilterLists.Data/Models/Implementations/BaseEntity.cs @@ -15,9 +15,9 @@ public abstract class BaseEntity : IBaseEntity public long Id { get; set; } [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - [JsonIgnore] [DefaultValue("CURRENT_TIMESTAMP")] - public DateTime AddedDateUtc { get; set; } + [JsonIgnore] + public DateTime CreatedDateUtc { get; set; } [DatabaseGenerated(DatabaseGeneratedOption.Computed)] [JsonIgnore] diff --git a/src/FilterLists.Data/Stored Procedures/InitializeNewTableBaseEntityDefaults.sql b/src/FilterLists.Data/Stored Procedures/InitializeNewTableBaseEntityDefaults.sql index a0f8c9aad..108b1fed1 100644 --- a/src/FilterLists.Data/Stored Procedures/InitializeNewTableBaseEntityDefaults.sql +++ b/src/FilterLists.Data/Stored Procedures/InitializeNewTableBaseEntityDefaults.sql @@ -1,12 +1,8 @@ --TODO: Possibly convert to stored procedure ALTER TABLE - filterlistsdata.List MODIFY COLUMN AddedDateUtc DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL; + filterlistsdata.FilterList MODIFY COLUMN CreatedDateUtc DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL; ALTER TABLE - filterlistsdata.List MODIFY COLUMN ModifiedDateUtc DATETIME DEFAULT NULL; -ALTER TABLE - filterlistsdata.TableCsv MODIFY COLUMN AddedDateUtc DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL; -ALTER TABLE - filterlistsdata.TableCsv MODIFY COLUMN ModifiedDateUtc DATETIME DEFAULT NULL; + filterlistsdata.FilterList MODIFY COLUMN ModifiedDateUtc DATETIME DEFAULT NULL; ON UPDATE CURRENT_TIMESTAMP; \ No newline at end of file