Skip to content

Commit eac5612

Browse files
committed
Merge branch '6.0' into 7.0
# Conflicts: # .github/workflows/dispatched-firebird-tests.yml # .github/workflows/dispatched-mssql-tests.yml # .github/workflows/dispatched-mysql5-tests.yml # .github/workflows/dispatched-pgsql10-tests.yml # .github/workflows/dispatched-pgsql9-tests.yml # .github/workflows/dispatched-sqlite-tests.yml
2 parents d16f88d + 2d5066b commit eac5612

File tree

6 files changed

+12
-24
lines changed

6 files changed

+12
-24
lines changed

.github/workflows/dispatched-mysql5-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
run_main: true
5959
run_sql: true
6060
run_extensions: true
61-
publish_raw_results: false
61+
publish_raw_results: true
6262

6363
test_on_mysql56:
6464
name: Tests on MySQL 5.6

.github/workflows/dispatched-pgsql9-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
run_main: true
7777
run_sql: true
7878
run_extensions: true
79-
publish_raw_results: false
79+
publish_raw_results: true
8080

8181
test_on_pgsql92:
8282
name: Tests on PostgreSQL 9.2
@@ -96,7 +96,7 @@ jobs:
9696
run_main: true
9797
run_sql: true
9898
run_extensions: true
99-
publish_raw_results: false
99+
publish_raw_results: true
100100

101101
test_on_pgsql96:
102102
name: Tests on PostgreSQL 9.6
@@ -116,4 +116,4 @@ jobs:
116116
run_main: true
117117
run_sql: true
118118
run_extensions: true
119-
publish_raw_results: false
119+
publish_raw_results: true
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM firebirdsql/firebird:3.0.10
22

3+
RUN echo "WireCrypt = Disabled" >> /opt/firebird/firebird.conf
4+
35
COPY init-firebird-instance.sh /docker-entrypoint-initdb.d/
46

5-
RUN chmod +x /docker-entrypoint-initdb.d/init-firebird-instance.sh
7+
RUN chmod +x /docker-entrypoint-initdb.d/init-firebird-instance.sh

Orm/Xtensive.Orm.Tests.Sql/MySQL/Sakila.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace Xtensive.Orm.Tests.Sql.MySQL
2222
public abstract class Sakila
2323
{
2424
private readonly string sakilaDataBackupPath = Path.Combine(
25-
Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @"MySQL\SakilaDb\sakila-data.sql");
25+
Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @"MySQL/SakilaDb/sakila-data.sql");
2626

2727
protected ConnectionInfo ConnectionInfo = TestConnectionInfoProvider.GetConnectionInfo();
2828
protected SqlDriver SqlDriver;

Orm/Xtensive.Orm.Tests.Sql/Sqlite/ChinookSchemaCreator.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2019 Xtensive LLC.
1+
// Copyright (C) 2019 Xtensive LLC.
22
// All rights reserved.
33
// For conditions of distribution and use, see license.
44
// Created by: Alexey Kulakov
@@ -28,6 +28,7 @@ private class XmlTable
2828

2929
public void DropSchemaContent(SqlConnection connection, Schema defaultSchema)
3030
{
31+
DropViews(connection, defaultSchema);
3132
DropTables(connection, defaultSchema);
3233
}
3334

Orm/Xtensive.Orm/Sql/Compiler/SqlTranslator.cs

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -268,22 +268,6 @@ public virtual string Translate(SqlCompilerContext context, SqlArray node, Array
268268
}
269269
}
270270

271-
// Type itemType = node.ItemType;
272-
// object[] values = node.GetValues();
273-
// int count = values.Length;
274-
// if (count==0)
275-
// return "(NULL)";
276-
// var buffer = new string[count];
277-
// for (int index = 0; index < count; index++)
278-
// buffer[index] = Translate(context, (SqlLiteral) SqlDml.Literal(values[index], itemType));
279-
// if (count==1)
280-
// return "(" + buffer[0] + ")";
281-
//
282-
// buffer[0] = "(" + buffer[0];
283-
// buffer[count - 1] += ")";
284-
// return String.Join(RowItemDelimiter, buffer);
285-
// }
286-
287271
public virtual string Translate(SqlCompilerContext context, SqlAssignment node, NodeSection section)
288272
{
289273
switch (section) {
@@ -1826,8 +1810,9 @@ public virtual string BuildBatch(string[] statements)
18261810
{
18271811
if (statements.Length==0)
18281812
return string.Empty;
1813+
var statementEndingLength = BatchItemDelimiter.Length + NewLine.Length;
18291814
var expectedLength = BatchBegin.Length + BatchEnd.Length +
1830-
statements.Sum(statement => statement.Length + BatchItemDelimiter.Length + NewLine.Length);
1815+
statements.Sum(statement => statement.Length + statementEndingLength);
18311816
var builder = new StringBuilder(expectedLength);
18321817
builder.Append(BatchBegin);
18331818
foreach (var statement in statements) {

0 commit comments

Comments
 (0)