Skip to content

Commit c6a3c95

Browse files
committed
fix issues of backporting
1 parent 3ef844d commit c6a3c95

3 files changed

Lines changed: 12 additions & 30 deletions

File tree

Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/DriverFactory.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ private static SqlDriver CreateDriverInstance(string connectionString, Version v
122122
5 when version.Minor == 1 => new v5_1.Driver(coreServerInfo),
123123
5 when version.Minor == 5 => new v5_5.Driver(coreServerInfo),
124124
5 when version.Minor == 6 => new v5_6.Driver(coreServerInfo),
125-
_ => new v5_6.Driver(coreServerInfo)
125+
5 when version.Minor == 7 => new v5_7.Driver(coreServerInfo),
126+
_ => new v5_7.Driver(coreServerInfo)
126127
};
127128
}
128129

Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/v5_7/Translator.cs

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2022 Xtensive LLC.
1+
// Copyright (C) 2025 Xtensive LLC.
22
// This code is distributed under MIT license terms.
33
// See the License.txt file in the project root for more information.
44
// Created by: Alexey Kulakov
@@ -8,29 +8,10 @@
88
using Xtensive.Sql.Compiler;
99
using Xtensive.Sql.Dml;
1010

11-
namespace Xtensive.Sql.Drivers.MySql.v8_0
11+
namespace Xtensive.Sql.Drivers.MySql.v5_7
1212
{
13-
internal class Translator : v5_7.Translator
13+
internal class Translator : v5_6.Translator
1414
{
15-
/// <inheritdoc/>
16-
public override void Translate(IOutput output, SqlLockType lockType)
17-
{
18-
var forShare = lockType.Supports(SqlLockType.Shared);
19-
var forUpdate = lockType.SupportsAny(SqlLockType.Update | SqlLockType.Exclusive);
20-
21-
if (!forShare && !forUpdate) {
22-
throw new NotSupportedException($"Lock '{lockType.ToString(true)}' is not supported.");
23-
}
24-
25-
_ = output
26-
.Append(forShare ? "FOR SHARE" : "FOR UPDATE")
27-
.Append(lockType.Supports(SqlLockType.SkipLocked)
28-
? " SKIP LOCKED"
29-
: lockType.Supports(SqlLockType.ThrowIfLocked)
30-
? " NOWAIT"
31-
: string.Empty);
32-
}
33-
3415
// Constructors
3516

3617
public Translator(SqlDriver driver)

Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/v5_7/TypeMapper.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
// Copyright (C) 2003-2010 Xtensive LLC.
2-
// All rights reserved.
3-
// For conditions of distribution and use, see license.
4-
// Created by: Alena Mikshina
5-
// Created: 2013.12.30
1+
// Copyright (C) 2022 Xtensive LLC.
2+
// This code is distributed under MIT license terms.
3+
// See the License.txt file in the project root for more information.
4+
// Created by: Alexey Kulakov
5+
// Created: 2022.02.03
66

7-
namespace Xtensive.Sql.Drivers.MySql.v5_6
7+
namespace Xtensive.Sql.Drivers.MySql.v5_7
88
{
9-
internal class TypeMapper : v5_5.TypeMapper
9+
internal class TypeMapper : v5_6.TypeMapper
1010
{
1111
// Constructors
1212

0 commit comments

Comments
 (0)