Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
Efcore.Pg
提交
1d6d8414
E
Efcore.Pg
项目概览
jobily
/
Efcore.Pg
大约 1 年 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
Efcore.Pg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1d6d8414
编写于
7月 07, 2023
作者:
S
Shay Rojansky
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Tiny test tweaks
上级
6f18809e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
25 deletion
+17
-25
test/EFCore.PG.FunctionalTests/Migrations/MigrationsNpgsqlTest.cs
...ore.PG.FunctionalTests/Migrations/MigrationsNpgsqlTest.cs
+4
-4
test/EFCore.PG.FunctionalTests/Scaffolding/NpgsqlDatabaseModelFactoryTest.cs
...tionalTests/Scaffolding/NpgsqlDatabaseModelFactoryTest.cs
+10
-18
test/EFCore.PG.Tests/Design/Internal/NpgsqlAnnotationCodeGeneratorTest.cs
...ests/Design/Internal/NpgsqlAnnotationCodeGeneratorTest.cs
+3
-3
未找到文件。
test/EFCore.PG.FunctionalTests/Migrations/MigrationsNpgsqlTest.cs
浏览文件 @
1d6d8414
...
@@ -1994,7 +1994,7 @@ public virtual async Task Create_index_with_include()
...
@@ -1994,7 +1994,7 @@ public virtual async Task Create_index_with_include()
{
{
var
table
=
Assert
.
Single
(
model
.
Tables
);
var
table
=
Assert
.
Single
(
model
.
Tables
);
var
index
=
Assert
.
Single
(
table
.
Indexes
);
var
index
=
Assert
.
Single
(
table
.
Indexes
);
Assert
.
Equal
(
1
,
index
.
Columns
.
Count
);
Assert
.
Single
(
index
.
Columns
);
Assert
.
Contains
(
table
.
Columns
.
Single
(
c
=>
c
.
Name
==
"Name"
),
index
.
Columns
);
Assert
.
Contains
(
table
.
Columns
.
Single
(
c
=>
c
.
Name
==
"Name"
),
index
.
Columns
);
// Scaffolding included/covered properties is currently blocked, see #2194
// Scaffolding included/covered properties is currently blocked, see #2194
...
@@ -2038,7 +2038,7 @@ public virtual async Task Create_index_with_include_and_filter()
...
@@ -2038,7 +2038,7 @@ public virtual async Task Create_index_with_include_and_filter()
var
table
=
Assert
.
Single
(
model
.
Tables
);
var
table
=
Assert
.
Single
(
model
.
Tables
);
var
index
=
Assert
.
Single
(
table
.
Indexes
);
var
index
=
Assert
.
Single
(
table
.
Indexes
);
Assert
.
Equal
(
@"(""Name"" IS NOT NULL)"
,
index
.
Filter
);
Assert
.
Equal
(
@"(""Name"" IS NOT NULL)"
,
index
.
Filter
);
Assert
.
Equal
(
1
,
index
.
Columns
.
Count
);
Assert
.
Single
(
index
.
Columns
);
Assert
.
Contains
(
table
.
Columns
.
Single
(
c
=>
c
.
Name
==
"Name"
),
index
.
Columns
);
Assert
.
Contains
(
table
.
Columns
.
Single
(
c
=>
c
.
Name
==
"Name"
),
index
.
Columns
);
// Scaffolding included/covered properties is currently blocked, see #2194
// Scaffolding included/covered properties is currently blocked, see #2194
...
@@ -2082,7 +2082,7 @@ public virtual async Task Create_index_unique_with_include()
...
@@ -2082,7 +2082,7 @@ public virtual async Task Create_index_unique_with_include()
var
table
=
Assert
.
Single
(
model
.
Tables
);
var
table
=
Assert
.
Single
(
model
.
Tables
);
var
index
=
Assert
.
Single
(
table
.
Indexes
);
var
index
=
Assert
.
Single
(
table
.
Indexes
);
Assert
.
True
(
index
.
IsUnique
);
Assert
.
True
(
index
.
IsUnique
);
Assert
.
Equal
(
1
,
index
.
Columns
.
Count
);
Assert
.
Single
(
index
.
Columns
);
Assert
.
Contains
(
table
.
Columns
.
Single
(
c
=>
c
.
Name
==
"Name"
),
index
.
Columns
);
Assert
.
Contains
(
table
.
Columns
.
Single
(
c
=>
c
.
Name
==
"Name"
),
index
.
Columns
);
// Scaffolding included/covered properties is currently blocked, see #2194
// Scaffolding included/covered properties is currently blocked, see #2194
...
@@ -2128,7 +2128,7 @@ public virtual async Task Create_index_unique_with_include_and_filter()
...
@@ -2128,7 +2128,7 @@ public virtual async Task Create_index_unique_with_include_and_filter()
var
index
=
Assert
.
Single
(
table
.
Indexes
);
var
index
=
Assert
.
Single
(
table
.
Indexes
);
Assert
.
True
(
index
.
IsUnique
);
Assert
.
True
(
index
.
IsUnique
);
Assert
.
Equal
(
@"(""Name"" IS NOT NULL)"
,
index
.
Filter
);
Assert
.
Equal
(
@"(""Name"" IS NOT NULL)"
,
index
.
Filter
);
Assert
.
Equal
(
1
,
index
.
Columns
.
Count
);
Assert
.
Single
(
index
.
Columns
);
Assert
.
Contains
(
table
.
Columns
.
Single
(
c
=>
c
.
Name
==
"Name"
),
index
.
Columns
);
Assert
.
Contains
(
table
.
Columns
.
Single
(
c
=>
c
.
Name
==
"Name"
),
index
.
Columns
);
// Scaffolding included/covered properties is currently blocked, see #2194
// Scaffolding included/covered properties is currently blocked, see #2194
...
...
test/EFCore.PG.FunctionalTests/Scaffolding/NpgsqlDatabaseModelFactoryTest.cs
浏览文件 @
1d6d8414
...
@@ -186,7 +186,7 @@ public void Filter_schemas()
...
@@ -186,7 +186,7 @@ public void Filter_schemas()
// ReSharper disable once PossibleNullReferenceException
// ReSharper disable once PossibleNullReferenceException
Assert
.
Equal
(
"K2"
,
table
.
Name
);
Assert
.
Equal
(
"K2"
,
table
.
Name
);
Assert
.
Equal
(
2
,
table
.
Columns
.
Count
);
Assert
.
Equal
(
2
,
table
.
Columns
.
Count
);
Assert
.
Equal
(
1
,
table
.
UniqueConstraints
.
Count
);
Assert
.
Single
(
table
.
UniqueConstraints
);
Assert
.
Empty
(
table
.
ForeignKeys
);
Assert
.
Empty
(
table
.
ForeignKeys
);
},
},
"""
"""
...
@@ -209,7 +209,7 @@ public void Filter_tables()
...
@@ -209,7 +209,7 @@ public void Filter_tables()
// ReSharper disable once PossibleNullReferenceException
// ReSharper disable once PossibleNullReferenceException
Assert
.
Equal
(
"K2"
,
table
.
Name
);
Assert
.
Equal
(
"K2"
,
table
.
Name
);
Assert
.
Equal
(
2
,
table
.
Columns
.
Count
);
Assert
.
Equal
(
2
,
table
.
Columns
.
Count
);
Assert
.
Equal
(
1
,
table
.
UniqueConstraints
.
Count
);
Assert
.
Single
(
table
.
UniqueConstraints
);
Assert
.
Empty
(
table
.
ForeignKeys
);
Assert
.
Empty
(
table
.
ForeignKeys
);
},
},
"""
"""
...
@@ -232,7 +232,7 @@ public void Filter_tables_with_qualified_name()
...
@@ -232,7 +232,7 @@ public void Filter_tables_with_qualified_name()
// ReSharper disable once PossibleNullReferenceException
// ReSharper disable once PossibleNullReferenceException
Assert
.
Equal
(
"K.2"
,
table
.
Name
);
Assert
.
Equal
(
"K.2"
,
table
.
Name
);
Assert
.
Equal
(
2
,
table
.
Columns
.
Count
);
Assert
.
Equal
(
2
,
table
.
Columns
.
Count
);
Assert
.
Equal
(
1
,
table
.
UniqueConstraints
.
Count
);
Assert
.
Single
(
table
.
UniqueConstraints
);
Assert
.
Empty
(
table
.
ForeignKeys
);
Assert
.
Empty
(
table
.
ForeignKeys
);
},
},
"""
"""
...
@@ -256,7 +256,7 @@ public void Filter_tables_with_schema_qualified_name1()
...
@@ -256,7 +256,7 @@ public void Filter_tables_with_schema_qualified_name1()
// ReSharper disable once PossibleNullReferenceException
// ReSharper disable once PossibleNullReferenceException
Assert
.
Equal
(
"K2"
,
table
.
Name
);
Assert
.
Equal
(
"K2"
,
table
.
Name
);
Assert
.
Equal
(
2
,
table
.
Columns
.
Count
);
Assert
.
Equal
(
2
,
table
.
Columns
.
Count
);
Assert
.
Equal
(
1
,
table
.
UniqueConstraints
.
Count
);
Assert
.
Single
(
table
.
UniqueConstraints
);
Assert
.
Empty
(
table
.
ForeignKeys
);
Assert
.
Empty
(
table
.
ForeignKeys
);
},
},
"""
"""
...
@@ -281,7 +281,7 @@ public void Filter_tables_with_schema_qualified_name2()
...
@@ -281,7 +281,7 @@ public void Filter_tables_with_schema_qualified_name2()
// ReSharper disable once PossibleNullReferenceException
// ReSharper disable once PossibleNullReferenceException
Assert
.
Equal
(
"K.2"
,
table
.
Name
);
Assert
.
Equal
(
"K.2"
,
table
.
Name
);
Assert
.
Equal
(
2
,
table
.
Columns
.
Count
);
Assert
.
Equal
(
2
,
table
.
Columns
.
Count
);
Assert
.
Equal
(
1
,
table
.
UniqueConstraints
.
Count
);
Assert
.
Single
(
table
.
UniqueConstraints
);
Assert
.
Empty
(
table
.
ForeignKeys
);
Assert
.
Empty
(
table
.
ForeignKeys
);
},
},
"""
"""
...
@@ -306,7 +306,7 @@ public void Filter_tables_with_schema_qualified_name3()
...
@@ -306,7 +306,7 @@ public void Filter_tables_with_schema_qualified_name3()
// ReSharper disable once PossibleNullReferenceException
// ReSharper disable once PossibleNullReferenceException
Assert
.
Equal
(
"K.2"
,
table
.
Name
);
Assert
.
Equal
(
"K.2"
,
table
.
Name
);
Assert
.
Equal
(
2
,
table
.
Columns
.
Count
);
Assert
.
Equal
(
2
,
table
.
Columns
.
Count
);
Assert
.
Equal
(
1
,
table
.
UniqueConstraints
.
Count
);
Assert
.
Single
(
table
.
UniqueConstraints
);
Assert
.
Empty
(
table
.
ForeignKeys
);
Assert
.
Empty
(
table
.
ForeignKeys
);
},
},
"""
"""
...
@@ -331,7 +331,7 @@ public void Filter_tables_with_schema_qualified_name4()
...
@@ -331,7 +331,7 @@ public void Filter_tables_with_schema_qualified_name4()
// ReSharper disable once PossibleNullReferenceException
// ReSharper disable once PossibleNullReferenceException
Assert
.
Equal
(
"K2"
,
table
.
Name
);
Assert
.
Equal
(
"K2"
,
table
.
Name
);
Assert
.
Equal
(
2
,
table
.
Columns
.
Count
);
Assert
.
Equal
(
2
,
table
.
Columns
.
Count
);
Assert
.
Equal
(
1
,
table
.
UniqueConstraints
.
Count
);
Assert
.
Single
(
table
.
UniqueConstraints
);
Assert
.
Empty
(
table
.
ForeignKeys
);
Assert
.
Empty
(
table
.
ForeignKeys
);
},
},
"""
"""
...
@@ -1060,12 +1060,7 @@ public void System_columns_are_not_created()
...
@@ -1060,12 +1060,7 @@ public void System_columns_are_not_created()
""",
""",
Enumerable
.
Empty
<
string
>(),
Enumerable
.
Empty
<
string
>(),
Enumerable
.
Empty
<
string
>(),
Enumerable
.
Empty
<
string
>(),
dbModel
=>
dbModel
=>
Assert
.
Single
(
dbModel
.
Tables
.
Single
().
Columns
),
{
var
columns
=
dbModel
.
Tables
.
Single
().
Columns
;
Assert
.
Equal
(
1
,
columns
.
Count
);
},
@"DROP TABLE ""SystemColumnsTable"""
);
@"DROP TABLE ""SystemColumnsTable"""
);
#
endregion
#
endregion
...
@@ -2027,11 +2022,8 @@ public void Bug453()
...
@@ -2027,11 +2022,8 @@ public void Bug453()
""",
""",
Enumerable
.
Empty
<
string
>(),
Enumerable
.
Empty
<
string
>(),
Enumerable
.
Empty
<
string
>(),
Enumerable
.
Empty
<
string
>(),
dbModel
=>
// Enum columns are left out of the model for now (a warning is logged).
{
dbModel
=>
Assert
.
Single
(
dbModel
.
Tables
.
Single
(
t
=>
t
.
Name
==
"foo"
).
Columns
),
// Enum columns are left out of the model for now (a warning is logged).
Assert
.
Equal
(
1
,
dbModel
.
Tables
.
Single
(
t
=>
t
.
Name
==
"foo"
).
Columns
.
Count
);
},
"""
"""
DROP
TABLE
bar
;
DROP
TABLE
bar
;
DROP
TABLE
foo
;
DROP
TABLE
foo
;
...
...
test/EFCore.PG.Tests/Design/Internal/NpgsqlAnnotationCodeGeneratorTest.cs
浏览文件 @
1d6d8414
...
@@ -39,7 +39,7 @@ public void GenerateFluentApi_value_generation()
...
@@ -39,7 +39,7 @@ public void GenerateFluentApi_value_generation()
var
result
=
generator
.
GenerateFluentApiCalls
(
property
,
property
.
GetAnnotations
().
ToDictionary
(
a
=>
a
.
Name
,
a
=>
a
))
var
result
=
generator
.
GenerateFluentApiCalls
(
property
,
property
.
GetAnnotations
().
ToDictionary
(
a
=>
a
.
Name
,
a
=>
a
))
.
Single
();
.
Single
();
Assert
.
Equal
(
nameof
(
NpgsqlPropertyBuilderExtensions
.
UseIdentityByDefaultColumn
),
result
.
Method
);
Assert
.
Equal
(
nameof
(
NpgsqlPropertyBuilderExtensions
.
UseIdentityByDefaultColumn
),
result
.
Method
);
Assert
.
E
qual
(
0
,
result
.
Arguments
.
Count
);
Assert
.
E
mpty
(
result
.
Arguments
);
property
=
entity
.
GetProperties
().
Single
(
p
=>
p
.
Name
==
"IdentityAlways"
);
property
=
entity
.
GetProperties
().
Single
(
p
=>
p
.
Name
==
"IdentityAlways"
);
annotations
=
property
.
GetAnnotations
().
ToDictionary
(
a
=>
a
.
Name
,
a
=>
a
);
annotations
=
property
.
GetAnnotations
().
ToDictionary
(
a
=>
a
.
Name
,
a
=>
a
);
...
@@ -47,7 +47,7 @@ public void GenerateFluentApi_value_generation()
...
@@ -47,7 +47,7 @@ public void GenerateFluentApi_value_generation()
Assert
.
Contains
(
annotations
,
kv
=>
kv
.
Key
==
NpgsqlAnnotationNames
.
ValueGenerationStrategy
);
Assert
.
Contains
(
annotations
,
kv
=>
kv
.
Key
==
NpgsqlAnnotationNames
.
ValueGenerationStrategy
);
result
=
generator
.
GenerateFluentApiCalls
(
property
,
annotations
).
Single
();
result
=
generator
.
GenerateFluentApiCalls
(
property
,
annotations
).
Single
();
Assert
.
Equal
(
nameof
(
NpgsqlPropertyBuilderExtensions
.
UseIdentityAlwaysColumn
),
result
.
Method
);
Assert
.
Equal
(
nameof
(
NpgsqlPropertyBuilderExtensions
.
UseIdentityAlwaysColumn
),
result
.
Method
);
Assert
.
E
qual
(
0
,
result
.
Arguments
.
Count
);
Assert
.
E
mpty
(
result
.
Arguments
);
property
=
entity
.
GetProperties
().
Single
(
p
=>
p
.
Name
==
"Serial"
);
property
=
entity
.
GetProperties
().
Single
(
p
=>
p
.
Name
==
"Serial"
);
annotations
=
property
.
GetAnnotations
().
ToDictionary
(
a
=>
a
.
Name
,
a
=>
a
);
annotations
=
property
.
GetAnnotations
().
ToDictionary
(
a
=>
a
.
Name
,
a
=>
a
);
...
@@ -56,7 +56,7 @@ public void GenerateFluentApi_value_generation()
...
@@ -56,7 +56,7 @@ public void GenerateFluentApi_value_generation()
result
=
generator
.
GenerateFluentApiCalls
(
property
,
property
.
GetAnnotations
().
ToDictionary
(
a
=>
a
.
Name
,
a
=>
a
))
result
=
generator
.
GenerateFluentApiCalls
(
property
,
property
.
GetAnnotations
().
ToDictionary
(
a
=>
a
.
Name
,
a
=>
a
))
.
Single
();
.
Single
();
Assert
.
Equal
(
nameof
(
NpgsqlPropertyBuilderExtensions
.
UseSerialColumn
),
result
.
Method
);
Assert
.
Equal
(
nameof
(
NpgsqlPropertyBuilderExtensions
.
UseSerialColumn
),
result
.
Method
);
Assert
.
E
qual
(
0
,
result
.
Arguments
.
Count
);
Assert
.
E
mpty
(
result
.
Arguments
);
property
=
entity
.
GetProperties
().
Single
(
p
=>
p
.
Name
==
"None"
);
property
=
entity
.
GetProperties
().
Single
(
p
=>
p
.
Name
==
"None"
);
annotations
=
property
.
GetAnnotations
().
ToDictionary
(
a
=>
a
.
Name
,
a
=>
a
);
annotations
=
property
.
GetAnnotations
().
ToDictionary
(
a
=>
a
.
Name
,
a
=>
a
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录