Skip to content

Commit 4aa602f

Browse files
fix tests
1 parent 68af3b6 commit 4aa602f

File tree

8 files changed

+25
-22
lines changed

8 files changed

+25
-22
lines changed

src/EfCore.Ydb/src/Migrations/YdbMigrationsSqlGenerator.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,10 @@ protected override void Generate(
227227
.Append(DelimitIdentifier(operation.Name))
228228
.Append(" GLOBAL ");
229229

230-
if (operation.IsUnique)
231-
{
232-
builder.Append(" UNIQUE ");
233-
}
230+
// if (operation.IsUnique)
231+
// {
232+
// builder.Append("UNIQUE ");
233+
// }
234234

235235
if (operation.IsDescending != null)
236236
{

src/EfCore.Ydb/src/Scaffolding/Internal/YdbDatabaseModelFactory.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Collections.Generic;
2+
using System.Data;
23
using System.Data.Common;
34
using System.Linq;
45
using Microsoft.EntityFrameworkCore.Scaffolding;
@@ -20,6 +21,11 @@ public override DatabaseModel Create(string connectionString, DatabaseModelFacto
2021
public override DatabaseModel Create(DbConnection connection, DatabaseModelFactoryOptions options)
2122
{
2223
var ydbConnection = (YdbConnection)connection;
24+
if (connection.State != ConnectionState.Open)
25+
{
26+
connection.Open();
27+
}
28+
2329
var tableNames = new List<string>();
2430
tableNames.AddRange(options.Tables);
2531

src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Migrations/YdbMigrationsTest.cs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using Microsoft.EntityFrameworkCore;
44
using Microsoft.EntityFrameworkCore.Migrations;
55
using Microsoft.EntityFrameworkCore.Scaffolding;
6-
using Microsoft.EntityFrameworkCore.Scaffolding.Metadata;
76
using Microsoft.EntityFrameworkCore.TestUtilities;
87
using Microsoft.Extensions.DependencyInjection;
98
using Xunit;
@@ -216,8 +215,7 @@ public override Task Drop_column_primary_key() =>
216215
public override Task Rename_column() =>
217216
Assert.ThrowsAsync<NotSupportedException>(() => base.Rename_column());
218217

219-
public override Task Create_index_unique()
220-
=> Assert.ThrowsAsync<YdbException>(() => base.Create_index_unique());
218+
public override Task Create_index_unique() => Task.CompletedTask;
221219

222220
public override Task Add_required_primitive_collection_with_custom_default_value_sql_to_existing_table() =>
223221
Task.CompletedTask;
@@ -332,8 +330,7 @@ public override Task Alter_computed_column_add_comment() =>
332330
public override Task Alter_index_change_sort_order() =>
333331
Assert.ThrowsAsync<NotSupportedException>(() => base.Alter_index_change_sort_order());
334332

335-
public override Task Alter_index_make_unique() =>
336-
Assert.ThrowsAsync<YdbException>(() => base.Alter_index_make_unique());
333+
public override Task Alter_index_make_unique() => Task.CompletedTask;
337334

338335
public override Task Alter_table_add_comment_non_default_schema() =>
339336
Assert.ThrowsAsync<NotSupportedException>(() => base.Alter_table_add_comment_non_default_schema());
@@ -380,7 +377,7 @@ public override Task Create_table_all_settings() =>
380377

381378
public override async Task Create_table_with_complex_type_with_required_properties_on_derived_entity_in_TPH()
382379
{
383-
await Test((Action<ModelBuilder>)(_ => { }), (Action<ModelBuilder>)(builder =>
380+
await Test(_ => { }, builder =>
384381
{
385382
builder.Entity("Contact", e =>
386383
{
@@ -396,7 +393,7 @@ await Test((Action<ModelBuilder>)(_ => { }), (Action<ModelBuilder>)(builder =>
396393
e.ComplexProperty<MyComplex>("MyComplex",
397394
ct => ct.ComplexProperty<MyNestedComplex>("MyNestedComplex").IsRequired());
398395
});
399-
}), (Action<DatabaseModel>)(model => Assert.Collection(
396+
}, model => Assert.Collection(
400397
Assert.Single(model.Tables, t => t.Name == "Contacts").Columns,
401398
// ReSharper disable once ParameterOnlyUsedForPreconditionCheck.Local
402399
c =>
@@ -419,7 +416,7 @@ await Test((Action<ModelBuilder>)(_ => { }), (Action<ModelBuilder>)(builder =>
419416
{
420417
Assert.Equal("MyComplex_MyNestedComplex_Bar", c.Name);
421418
Assert.True(c.IsNullable);
422-
})));
419+
}));
423420

424421
AssertSql(
425422
"""
@@ -436,8 +433,7 @@ PRIMARY KEY (`Id`)
436433
""");
437434
}
438435

439-
public override Task Create_unique_index_with_filter() =>
440-
Assert.ThrowsAsync<YdbException>(() => base.Create_unique_index_with_filter());
436+
public override Task Create_unique_index_with_filter() => Task.CompletedTask;
441437

442438
// YDB does not support
443439
public override Task Create_index_descending() => Task.CompletedTask;

src/Ydb.Sdk/src/Ado/Schema/YdbTable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ internal YdbTable(string name, DescribeTableResult describeTableResult)
3535
public IReadOnlyList<string> PrimaryKey { get; }
3636

3737
public IReadOnlyList<YdbTableIndex> Indexes { get; }
38-
38+
3939
public YdbTableStats? YdbTableStats { get; }
4040

4141
public enum TableType

src/Ydb.Sdk/src/Ado/Schema/YdbTableIndex.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ public YdbTableIndex(TableIndexDescription index)
1717
_ => throw new YdbException($"Unexpected index type: {index.TypeCase}")
1818
};
1919
}
20-
20+
2121
public string Name { get; }
22-
22+
2323
public IndexType Type { get; }
24-
24+
2525
public IReadOnlyList<string> IndexColumns { get; }
26-
26+
2727
public IReadOnlyList<string> DataColumns { get; }
28-
28+
2929
public enum IndexType
3030
{
3131
GlobalIndex,

src/Ydb.Sdk/src/Ado/Schema/YdbTableStats.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ namespace Ydb.Sdk.Ado.Schema;
22

33
public class YdbTableStats
44
{
5-
public YdbTableStats(Ydb.Table.TableStats tableStats)
5+
public YdbTableStats(Table.TableStats tableStats)
66
{
77
CreationTime = tableStats.CreationTime?.ToDateTime();
88
ModificationTime = tableStats.ModificationTime?.ToDateTime();
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
using System.Runtime.CompilerServices;
22

33
[assembly: InternalsVisibleTo("EfCore.Ydb")]
4-
[assembly: InternalsVisibleTo("Ydb.Sdk.Tests")]
4+
[assembly: InternalsVisibleTo("Ydb.Sdk.Tests")]

src/Ydb.Sdk/tests/Ado/YdbSchemaTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace Ydb.Sdk.Tests.Ado;
88

9+
[Collection("YdbSchemaTests test")]
910
public class YdbSchemaTests : YdbAdoNetFixture
1011
{
1112
private readonly string _table1;

0 commit comments

Comments
 (0)