diff --git a/DBPatch/sqlScripts/SystemX.DB.CPMeta_Create.sql b/DBPatch/sqlScripts/SystemX.DB.CPMeta_Create.sql index 6b7c6bc..1ae9811 100644 --- a/DBPatch/sqlScripts/SystemX.DB.CPMeta_Create.sql +++ b/DBPatch/sqlScripts/SystemX.DB.CPMeta_Create.sql @@ -53,7 +53,7 @@ END GO PRINT N'$(DatabaseName) 데이터베이스를 만드는 중...' GO -CREATE DATABASE [$(DatabaseName)] COLLATE Korean_Wansung_CI_AS +CREATE DATABASE [$(DatabaseName)] COLLATE SQL_Latin1_General_CP1_CI_AS GO USE [$(DatabaseName)]; @@ -243,11 +243,11 @@ IF fulltextserviceproperty(N'IsFulltextInstalled') = 1 GO -PRINT N'테이블 [dbo].[tWbmsMeta]을(를) 만드는 중...'; +PRINT N'테이블 [dbo].[tWbms]을(를) 만드는 중...'; GO -CREATE TABLE [dbo].[tWbmsMeta] ( +CREATE TABLE [dbo].[tWbms] ( [cProductID] NVARCHAR (50) NOT NULL, [cMacAddress] NVARCHAR (50) NULL, [cType] NVARCHAR (20) NULL, diff --git a/DBPatch/sqlScripts/dacpac/SystemX.DB.AccountDB.dacpac b/DBPatch/sqlScripts/dacpac/SystemX.DB.AccountDB.dacpac index c3fd36a..083cc69 100644 Binary files a/DBPatch/sqlScripts/dacpac/SystemX.DB.AccountDB.dacpac and b/DBPatch/sqlScripts/dacpac/SystemX.DB.AccountDB.dacpac differ diff --git a/DBPatch/sqlScripts/dacpac/SystemX.DB.CPMeta.dacpac b/DBPatch/sqlScripts/dacpac/SystemX.DB.CPMeta.dacpac index c4c34c3..d3db354 100644 Binary files a/DBPatch/sqlScripts/dacpac/SystemX.DB.CPMeta.dacpac and b/DBPatch/sqlScripts/dacpac/SystemX.DB.CPMeta.dacpac differ diff --git a/DBPatch/sqlScripts/dacpac/SystemX.DB.CPXV2.dacpac b/DBPatch/sqlScripts/dacpac/SystemX.DB.CPXV2.dacpac index 5aed60d..5e37354 100644 Binary files a/DBPatch/sqlScripts/dacpac/SystemX.DB.CPXV2.dacpac and b/DBPatch/sqlScripts/dacpac/SystemX.DB.CPXV2.dacpac differ diff --git a/DBPatch/sqlScripts/dacpac/SystemX.DB.CPXV2Log.dacpac b/DBPatch/sqlScripts/dacpac/SystemX.DB.CPXV2Log.dacpac index 1ab7f29..4ccf6d5 100644 Binary files a/DBPatch/sqlScripts/dacpac/SystemX.DB.CPXV2Log.dacpac and b/DBPatch/sqlScripts/dacpac/SystemX.DB.CPXV2Log.dacpac differ diff --git a/DBPatch/sqlScripts/dacpac/SystemX.DB.UniqueKeyDB.dacpac b/DBPatch/sqlScripts/dacpac/SystemX.DB.UniqueKeyDB.dacpac index bfb4397..2ec36d3 100644 Binary files a/DBPatch/sqlScripts/dacpac/SystemX.DB.UniqueKeyDB.dacpac and b/DBPatch/sqlScripts/dacpac/SystemX.DB.UniqueKeyDB.dacpac differ diff --git a/DBPatch/sqlScripts/dacpac/SystemX.DB.VPKI_DataDB.dacpac b/DBPatch/sqlScripts/dacpac/SystemX.DB.VPKI_DataDB.dacpac index fe24750..8bdc1ac 100644 Binary files a/DBPatch/sqlScripts/dacpac/SystemX.DB.VPKI_DataDB.dacpac and b/DBPatch/sqlScripts/dacpac/SystemX.DB.VPKI_DataDB.dacpac differ diff --git a/Projects/DLL/SystemX.Core.DB.dll b/Projects/DLL/SystemX.Core.DB.dll index 76df2a2..eb449b6 100644 Binary files a/Projects/DLL/SystemX.Core.DB.dll and b/Projects/DLL/SystemX.Core.DB.dll differ diff --git a/Projects/DLL/SystemX.Core.dll b/Projects/DLL/SystemX.Core.dll index f65683e..edd1a49 100644 Binary files a/Projects/DLL/SystemX.Core.dll and b/Projects/DLL/SystemX.Core.dll differ diff --git a/Projects/SystemX.Core/SystemX.Core.DB/SystemX.DB.CPMeta/SystemX.DB.CPMeta.sqlproj b/Projects/SystemX.Core/DB/SystemX.DB.CPMeta/SystemX.DB.CPMeta.sqlproj similarity index 91% rename from Projects/SystemX.Core/SystemX.Core.DB/SystemX.DB.CPMeta/SystemX.DB.CPMeta.sqlproj rename to Projects/SystemX.Core/DB/SystemX.DB.CPMeta/SystemX.DB.CPMeta.sqlproj index def6caf..1683211 100644 --- a/Projects/SystemX.Core/SystemX.Core.DB/SystemX.DB.CPMeta/SystemX.DB.CPMeta.sqlproj +++ b/Projects/SystemX.Core/DB/SystemX.DB.CPMeta/SystemX.DB.CPMeta.sqlproj @@ -6,14 +6,14 @@ SystemX.DB.CPMeta 2.0 4.1 - {17ab3eb0-6388-401f-96df-e45ba58a548e} + {dcc476ba-1dec-4649-b9b7-67ec2a3ab39d} Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider Database SystemX.DB.CPMeta SystemX.DB.CPMeta - 1042,CI + 1033, CI BySchemaAndSchemaType True v4.7.2 @@ -23,7 +23,6 @@ True True True - Korean_Wansung_CI_AS bin\Release\ @@ -47,7 +46,6 @@ true prompt 4 - False 11.0 @@ -60,10 +58,9 @@ - - + xcopy /y $(ProjectDir)$(OutputPath)$(TargetName)_Create.sql $(SolutionDir)..\..\DBPatch\sqlScripts\ diff --git a/Projects/SystemX.Core/SystemX.Core.DB/SystemX.DB.CPMeta/dbo/Tables/tWbmsMeta.sql b/Projects/SystemX.Core/DB/SystemX.DB.CPMeta/dbo/tWbmsMeta.sql similarity index 90% rename from Projects/SystemX.Core/SystemX.Core.DB/SystemX.DB.CPMeta/dbo/Tables/tWbmsMeta.sql rename to Projects/SystemX.Core/DB/SystemX.DB.CPMeta/dbo/tWbmsMeta.sql index 2e56216..a4b2495 100644 --- a/Projects/SystemX.Core/SystemX.Core.DB/SystemX.DB.CPMeta/dbo/Tables/tWbmsMeta.sql +++ b/Projects/SystemX.Core/DB/SystemX.DB.CPMeta/dbo/tWbmsMeta.sql @@ -1,4 +1,4 @@ -CREATE TABLE [dbo].[tWbmsMeta] +CREATE TABLE [dbo].[tWbms] ( [cProductID] NVARCHAR(50) NOT NULL, [cMacAddress] NVARCHAR(50) NULL, diff --git a/Projects/SystemX.Core/SystemX.Core.DB/CPMeta/Context/CPMetaContext.cs b/Projects/SystemX.Core/SystemX.Core.DB/CPMeta/Context/CPMetaContext.cs index 1a39e52..a0bf7c5 100644 --- a/Projects/SystemX.Core/SystemX.Core.DB/CPMeta/Context/CPMetaContext.cs +++ b/Projects/SystemX.Core/SystemX.Core.DB/CPMeta/Context/CPMetaContext.cs @@ -11,11 +11,13 @@ public partial class CPMetaContext : DbContext { } - public virtual DbSet tWbmsMeta { get; set; } + public virtual DbSet tWbms { get; set; } protected override void OnModelCreating(ModelBuilder modelBuilder) { - modelBuilder.Entity(entity => + modelBuilder.UseCollation("SQL_Latin1_General_CP1_CI_AS"); + + modelBuilder.Entity(entity => { entity.HasKey(e => e.cProductID).HasName("PK_cProductKey"); diff --git a/Projects/SystemX.Core/SystemX.Core.DB/CPMeta/Tables/tWbmsMetum.cs b/Projects/SystemX.Core/SystemX.Core.DB/CPMeta/Tables/tWbm.cs similarity index 91% rename from Projects/SystemX.Core/SystemX.Core.DB/CPMeta/Tables/tWbmsMetum.cs rename to Projects/SystemX.Core/SystemX.Core.DB/CPMeta/Tables/tWbm.cs index 204a420..acb6f87 100644 --- a/Projects/SystemX.Core/SystemX.Core.DB/CPMeta/Tables/tWbmsMetum.cs +++ b/Projects/SystemX.Core/SystemX.Core.DB/CPMeta/Tables/tWbm.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; namespace SystemX.Core.DB; -public partial class tWbmsMetum +public partial class tWbm { public string cProductID { get; set; } = null!; diff --git a/Projects/SystemX.Core/SystemX.Core.sln b/Projects/SystemX.Core/SystemX.Core.sln index 85ea2bc..2a90afd 100644 --- a/Projects/SystemX.Core/SystemX.Core.sln +++ b/Projects/SystemX.Core/SystemX.Core.sln @@ -19,7 +19,7 @@ Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "SystemX.DB.CPXV2", "DB\Syst EndProject Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "SystemX.DB.CPXV2Log", "DB\SystemX.DB.CPXV2Log\SystemX.DB.CPXV2Log.sqlproj", "{D9439C52-76B5-4908-9B0D-43D1F52EC942}" EndProject -Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "SystemX.DB.CPMeta", "SystemX.Core.DB\SystemX.DB.CPMeta\SystemX.DB.CPMeta.sqlproj", "{17AB3EB0-6388-401F-96DF-E45BA58A548E}" +Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "SystemX.DB.CPMeta", "DB\SystemX.DB.CPMeta\SystemX.DB.CPMeta.sqlproj", "{DCC476BA-1DEC-4649-B9B7-67EC2A3AB39D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -65,12 +65,12 @@ Global {D9439C52-76B5-4908-9B0D-43D1F52EC942}.Release|Any CPU.ActiveCfg = Release|Any CPU {D9439C52-76B5-4908-9B0D-43D1F52EC942}.Release|Any CPU.Build.0 = Release|Any CPU {D9439C52-76B5-4908-9B0D-43D1F52EC942}.Release|Any CPU.Deploy.0 = Release|Any CPU - {17AB3EB0-6388-401F-96DF-E45BA58A548E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17AB3EB0-6388-401F-96DF-E45BA58A548E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17AB3EB0-6388-401F-96DF-E45BA58A548E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {17AB3EB0-6388-401F-96DF-E45BA58A548E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17AB3EB0-6388-401F-96DF-E45BA58A548E}.Release|Any CPU.Build.0 = Release|Any CPU - {17AB3EB0-6388-401F-96DF-E45BA58A548E}.Release|Any CPU.Deploy.0 = Release|Any CPU + {DCC476BA-1DEC-4649-B9B7-67EC2A3AB39D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DCC476BA-1DEC-4649-B9B7-67EC2A3AB39D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DCC476BA-1DEC-4649-B9B7-67EC2A3AB39D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {DCC476BA-1DEC-4649-B9B7-67EC2A3AB39D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DCC476BA-1DEC-4649-B9B7-67EC2A3AB39D}.Release|Any CPU.Build.0 = Release|Any CPU + {DCC476BA-1DEC-4649-B9B7-67EC2A3AB39D}.Release|Any CPU.Deploy.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -81,7 +81,7 @@ Global {5D374F06-D9FA-4159-BC84-1F3CA506F50E} = {C8D5274F-AC00-46C7-1F8D-E88E81087A52} {3A2D7552-9C12-489F-8A0B-330E000C860D} = {C8D5274F-AC00-46C7-1F8D-E88E81087A52} {D9439C52-76B5-4908-9B0D-43D1F52EC942} = {C8D5274F-AC00-46C7-1F8D-E88E81087A52} - {17AB3EB0-6388-401F-96DF-E45BA58A548E} = {C8D5274F-AC00-46C7-1F8D-E88E81087A52} + {DCC476BA-1DEC-4649-B9B7-67EC2A3AB39D} = {C8D5274F-AC00-46C7-1F8D-E88E81087A52} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A26A3BD0-2161-41FA-949A-DEA966E8F798}