Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
Nhibernate-Core
提交
a0bc61f3
N
Nhibernate-Core
项目概览
jobily
/
Nhibernate-Core
9 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
N
Nhibernate-Core
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
a0bc61f3
编写于
8月 13, 2023
作者:
F
Frédéric Delaporte
浏览文件
操作
浏览文件
下载
差异文件
Merge 5.4.5 in master
上级
4308ec9f
7681611b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
49 addition
and
13 deletion
+49
-13
releasenotes.txt
releasenotes.txt
+30
-1
src/NHibernate/Cfg/Configuration.cs
src/NHibernate/Cfg/Configuration.cs
+19
-12
未找到文件。
releasenotes.txt
浏览文件 @
a0bc61f3
Build 5.4.4
Build 5.4.5
=============================
Release notes - NHibernate - Version 5.4.5
2 issues were resolved in this release.
** Task
* #3408 Release 5.4.4
* #3407 Release Merge 5.3.19 in 5.4.x
Build 5.4.4
=============================
Release notes - NHibernate - Version 5.4.4
...
...
@@ -282,6 +295,22 @@ Release notes - NHibernate - Version 5.4.0
* #2242 Test case for NH-3972 - SQL error when selecting a column of a subclass when sibling classes have a column of the same name
Build 5.3.19
=============================
Release notes - NHibernate - Version 5.3.19
2 issues were resolved in this release.
** Bug
* #3397 GenerateSchemaCreationScript creates many identical dialect instances
** Task
* #3405 Release 5.3.19
Build 5.3.18
=============================
...
...
src/NHibernate/Cfg/Configuration.cs
浏览文件 @
a0bc61f3
...
...
@@ -246,10 +246,14 @@ private class StaticDialectMappingWrapper : IMapping
{
private
readonly
IMapping
_mapping
;
public
StaticDialectMappingWrapper
(
IMapping
mapping
)
public
StaticDialectMappingWrapper
(
IMapping
mapping
):
this
(
mapping
,
mapping
.
Dialect
)
{
}
public
StaticDialectMappingWrapper
(
IMapping
mapping
,
Dialect
.
Dialect
dialect
)
{
_mapping
=
mapping
;
Dialect
=
mapping
.
D
ialect
;
Dialect
=
d
ialect
;
}
public
IType
GetIdentifierType
(
string
className
)
...
...
@@ -941,11 +945,12 @@ public string[] GenerateSchemaCreationScript(Dialect.Dialect dialect)
var
script
=
new
List
<
string
>();
var
staticDialectMapping
=
new
StaticDialectMappingWrapper
(
mapping
,
dialect
);
foreach
(
var
table
in
TableMappings
)
{
if
(
table
.
IsPhysicalTable
&&
IncludeAction
(
table
.
SchemaActions
,
SchemaAction
.
Export
))
{
script
.
Add
(
table
.
SqlCreateString
(
dialect
,
m
apping
,
defaultCatalog
,
defaultSchema
));
script
.
Add
(
table
.
SqlCreateString
(
dialect
,
staticDialectM
apping
,
defaultCatalog
,
defaultSchema
));
script
.
AddRange
(
table
.
SqlCommentStrings
(
dialect
,
defaultCatalog
,
defaultSchema
));
}
}
...
...
@@ -958,7 +963,7 @@ public string[] GenerateSchemaCreationScript(Dialect.Dialect dialect)
{
foreach
(
var
uk
in
table
.
UniqueKeyIterator
)
{
string
constraintString
=
uk
.
SqlCreateString
(
dialect
,
m
apping
,
defaultCatalog
,
defaultSchema
);
string
constraintString
=
uk
.
SqlCreateString
(
dialect
,
staticDialectM
apping
,
defaultCatalog
,
defaultSchema
);
if
(
constraintString
!=
null
)
{
script
.
Add
(
constraintString
);
...
...
@@ -968,7 +973,7 @@ public string[] GenerateSchemaCreationScript(Dialect.Dialect dialect)
foreach
(
var
index
in
table
.
IndexIterator
)
{
script
.
Add
(
index
.
SqlCreateString
(
dialect
,
m
apping
,
defaultCatalog
,
defaultSchema
));
script
.
Add
(
index
.
SqlCreateString
(
dialect
,
staticDialectM
apping
,
defaultCatalog
,
defaultSchema
));
}
if
(
dialect
.
SupportsForeignKeyConstraintInAlterTable
)
...
...
@@ -977,7 +982,7 @@ public string[] GenerateSchemaCreationScript(Dialect.Dialect dialect)
{
if
(
fk
.
IsGenerated
(
dialect
)
&&
IncludeAction
(
fk
.
ReferencedTable
.
SchemaActions
,
SchemaAction
.
Export
))
{
script
.
Add
(
fk
.
SqlCreateString
(
dialect
,
m
apping
,
defaultCatalog
,
defaultSchema
));
script
.
Add
(
fk
.
SqlCreateString
(
dialect
,
staticDialectM
apping
,
defaultCatalog
,
defaultSchema
));
}
}
}
...
...
@@ -994,7 +999,7 @@ public string[] GenerateSchemaCreationScript(Dialect.Dialect dialect)
{
if
(
auxDbObj
.
AppliesToDialect
(
dialect
))
{
script
.
Add
(
auxDbObj
.
SqlCreateString
(
dialect
,
m
apping
,
defaultCatalog
,
defaultSchema
));
script
.
Add
(
auxDbObj
.
SqlCreateString
(
dialect
,
staticDialectM
apping
,
defaultCatalog
,
defaultSchema
));
}
}
...
...
@@ -2364,6 +2369,7 @@ public string[] GenerateSchemaUpdateScript(Dialect.Dialect dialect, IDatabaseMet
var
defaultSchema
=
GetQuotedDefaultSchema
(
dialect
);
var
script
=
new
List
<
string
>(
50
);
var
staticDialectMapping
=
new
StaticDialectMappingWrapper
(
mapping
,
dialect
);
foreach
(
var
table
in
TableMappings
)
{
if
(
table
.
IsPhysicalTable
&&
IncludeAction
(
table
.
SchemaActions
,
SchemaAction
.
Update
))
...
...
@@ -2372,11 +2378,11 @@ public string[] GenerateSchemaUpdateScript(Dialect.Dialect dialect, IDatabaseMet
table
.
Catalog
??
defaultCatalog
,
table
.
IsQuoted
);
if
(
tableInfo
==
null
)
{
script
.
Add
(
table
.
SqlCreateString
(
dialect
,
m
apping
,
defaultCatalog
,
defaultSchema
));
script
.
Add
(
table
.
SqlCreateString
(
dialect
,
staticDialectM
apping
,
defaultCatalog
,
defaultSchema
));
}
else
{
string
[]
alterDDL
=
table
.
SqlAlterStrings
(
dialect
,
m
apping
,
tableInfo
,
defaultCatalog
,
defaultSchema
);
string
[]
alterDDL
=
table
.
SqlAlterStrings
(
dialect
,
staticDialectM
apping
,
tableInfo
,
defaultCatalog
,
defaultSchema
);
script
.
AddRange
(
alterDDL
);
}
...
...
@@ -2404,7 +2410,7 @@ public string[] GenerateSchemaUpdateScript(Dialect.Dialect dialect, IDatabaseMet
&&
(!(
dialect
is
MySQLDialect
)
||
tableInfo
.
GetIndexMetadata
(
fk
.
Name
)
==
null
));
if
(
create
)
{
script
.
Add
(
fk
.
SqlCreateString
(
dialect
,
m
apping
,
defaultCatalog
,
defaultSchema
));
script
.
Add
(
fk
.
SqlCreateString
(
dialect
,
staticDialectM
apping
,
defaultCatalog
,
defaultSchema
));
}
}
}
...
...
@@ -2414,7 +2420,7 @@ public string[] GenerateSchemaUpdateScript(Dialect.Dialect dialect, IDatabaseMet
{
if
(
tableInfo
==
null
||
tableInfo
.
GetIndexMetadata
(
index
.
Name
)
==
null
)
{
script
.
Add
(
index
.
SqlCreateString
(
dialect
,
m
apping
,
defaultCatalog
,
defaultSchema
));
script
.
Add
(
index
.
SqlCreateString
(
dialect
,
staticDialectM
apping
,
defaultCatalog
,
defaultSchema
));
}
}
}
...
...
@@ -2440,6 +2446,7 @@ public void ValidateSchema(Dialect.Dialect dialect, IDatabaseMetadata databaseMe
{
SecondPassCompile
();
var
staticDialectMapping
=
new
StaticDialectMappingWrapper
(
mapping
,
dialect
);
var
defaultCatalog
=
GetQuotedDefaultCatalog
(
dialect
);
var
defaultSchema
=
GetQuotedDefaultSchema
(
dialect
);
...
...
@@ -2466,7 +2473,7 @@ public void ValidateSchema(Dialect.Dialect dialect, IDatabaseMetadata databaseMe
}
else
{
validationErrors
.
AddRange
(
table
.
ValidateColumns
(
dialect
,
m
apping
,
tableInfo
));
validationErrors
.
AddRange
(
table
.
ValidateColumns
(
dialect
,
staticDialectM
apping
,
tableInfo
));
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录