Skip to content

Commit 91fc6d1

Browse files
droyaddroyad
authored
Merge branch 'main' into other-deps
2 parents 9800718 + 313d48b commit 91fc6d1

File tree

7 files changed

+31
-24
lines changed

7 files changed

+31
-24
lines changed

‎src/Tests/ApprovalFiles/NoPublicApiChanges.Run.approved.cs‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
1-
[assembly: System.CLSCompliantAttribute(true)]
2-
[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
3-
[assembly: System.Runtime.InteropServices.GuidAttribute("abcc04cc-0bd3-421e-9ae4-9fd0e4f4ef04")]
4-
1+
[assembly: System.CLSCompliant(true)]
2+
[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/DbUp/dbup-redshift.git")]
3+
[assembly: System.Runtime.InteropServices.ComVisible(false)]
4+
[assembly: System.Runtime.InteropServices.Guid("abcc04cc-0bd3-421e-9ae4-9fd0e4f4ef04")]
5+
[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v8.0", FrameworkDisplayName=".NET 8.0")]
56
public static class RedshiftExtensions
67
{
78
public static DbUp.Builder.UpgradeEngineBuilder JournalToRedshiftTable(this DbUp.Builder.UpgradeEngineBuilder builder, string schema, string table) { }
89
public static DbUp.Builder.UpgradeEngineBuilder RedshiftDatabase(DbUp.Engine.Transactions.IConnectionManager connectionManager) { }
9-
public static DbUp.Builder.UpgradeEngineBuilder RedshiftDatabase(this DbUp.Builder.SupportedDatabases supported, string connectionString) { }
1010
public static DbUp.Builder.UpgradeEngineBuilder RedshiftDatabase(this DbUp.Builder.SupportedDatabases supported, DbUp.Engine.Transactions.IConnectionManager connectionManager) { }
11+
public static DbUp.Builder.UpgradeEngineBuilder RedshiftDatabase(this DbUp.Builder.SupportedDatabases supported, string connectionString) { }
1112
public static DbUp.Builder.UpgradeEngineBuilder RedshiftDatabase(DbUp.Engine.Transactions.IConnectionManager connectionManager, string schema) { }
12-
public static DbUp.Builder.UpgradeEngineBuilder RedshiftDatabase(this DbUp.Builder.SupportedDatabases supported, string connectionString, string schema) { }
1313
public static void RedshiftDatabase(this DbUp.SupportedDatabasesForEnsureDatabase supported, string connectionString) { }
14+
public static DbUp.Builder.UpgradeEngineBuilder RedshiftDatabase(this DbUp.Builder.SupportedDatabases supported, string connectionString, string schema) { }
1415
public static void RedshiftDatabase(this DbUp.SupportedDatabasesForEnsureDatabase supported, string connectionString, DbUp.Engine.Output.IUpgradeLog logger) { }
1516
}
1617
namespace DbUp.Redshift
1718
{
18-
public class RedshiftConnectionManager : DbUp.Engine.Transactions.DatabaseConnectionManager, DbUp.Engine.Transactions.IConnectionManager
19+
public class RedshiftConnectionManager : DbUp.Engine.Transactions.DatabaseConnectionManager
1920
{
2021
public RedshiftConnectionManager(string connectionString) { }
2122
public override System.Collections.Generic.IEnumerable<string> SplitScriptIntoCommands(string scriptContents) { }
2223
}
23-
public class RedshiftObjectParser : DbUp.Support.SqlObjectParser, DbUp.Engine.ISqlObjectParser
24+
public class RedshiftObjectParser : DbUp.Support.SqlObjectParser
2425
{
2526
public RedshiftObjectParser() { }
2627
}
@@ -29,17 +30,17 @@ public class RedshiftPreprocessor : DbUp.Engine.IScriptPreprocessor
2930
public RedshiftPreprocessor() { }
3031
public string Process(string contents) { }
3132
}
32-
public class RedshiftScriptExecutor : DbUp.Support.ScriptExecutor, DbUp.Engine.IScriptExecutor
33+
public class RedshiftScriptExecutor : DbUp.Support.ScriptExecutor
3334
{
3435
public RedshiftScriptExecutor(System.Func<DbUp.Engine.Transactions.IConnectionManager> connectionManagerFactory, System.Func<DbUp.Engine.Output.IUpgradeLog> log, string schema, System.Func<bool> variablesEnabled, System.Collections.Generic.IEnumerable<DbUp.Engine.IScriptPreprocessor> scriptPreprocessors, System.Func<DbUp.Engine.IJournal> journalFactory) { }
3536
protected override void ExecuteCommandsWithinExceptionHandler(int index, DbUp.Engine.SqlScript script, System.Action excuteCommand) { }
3637
protected override string GetVerifySchemaSql(string schema) { }
3738
}
38-
public class RedshiftTableJournal : DbUp.Support.TableJournal, DbUp.Engine.IJournal
39+
public class RedshiftTableJournal : DbUp.Support.TableJournal
3940
{
4041
public RedshiftTableJournal(System.Func<DbUp.Engine.Transactions.IConnectionManager> connectionManager, System.Func<DbUp.Engine.Output.IUpgradeLog> logger, string schema, string tableName) { }
4142
protected override string CreateSchemaTableSql(string quotedPrimaryKeyName) { }
4243
protected override string GetInsertJournalEntrySql(string scriptName, string applied) { }
4344
protected override string GetJournalEntriesSql() { }
4445
}
45-
}
46+
}

‎src/Tests/Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
<ItemGroup>
1515
<ProjectReference Include="..\dbup-redshift\dbup-redshift.csproj" />
16-
<PackageReference Include="DbUp.Tests.Common" Version="6.0.0-beta.146" />
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
18-
<PackageReference Include="xunit" Version="2.9.2" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
16+
<PackageReference Include="DbUp.Tests.Common" Version="6.0.15" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
18+
<PackageReference Include="xunit" Version="2.9.3" />
19+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
</PackageReference>

‎src/dbup-redshift/RedshiftConnectionManager.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Collections.Generic;
1+
using System.Collections.Generic;
22
using System.Linq;
33
using System.Text.RegularExpressions;
44
using DbUp.Engine.Transactions;
@@ -20,10 +20,7 @@ public RedshiftConnectionManager(string connectionString)
2020
{
2121
}
2222

23-
/// <summary>
24-
/// Splits the statements in the script using the ";" character.
25-
/// </summary>
26-
/// <param name="scriptContents">The contents of the script to split.</param>
23+
/// <inheritdoc/>
2724
public override IEnumerable<string> SplitScriptIntoCommands(string scriptContents)
2825
{
2926
var scriptStatements =

‎src/dbup-redshift/RedshiftObjectParser.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using DbUp.Support;
1+
using DbUp.Support;
22

33
namespace DbUp.Redshift
44
{
@@ -7,6 +7,9 @@ namespace DbUp.Redshift
77
/// </summary>
88
public class RedshiftObjectParser : SqlObjectParser
99
{
10+
/// <summary>
11+
/// Initializes a new instance of the <see cref="RedshiftObjectParser"/> class.
12+
/// </summary>
1013
public RedshiftObjectParser() : base("\"", "\"")
1114
{
1215
}

‎src/dbup-redshift/RedshiftScriptExecutor.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using DbUp.Engine;
44
using DbUp.Engine.Output;
@@ -30,10 +30,12 @@ public RedshiftScriptExecutor(Func<IConnectionManager> connectionManagerFactory,
3030

3131
}
3232

33+
/// <inheritdoc/>
3334
protected override string GetVerifySchemaSql(string schema)
3435
=> $@"CREATE SCHEMA IF NOT EXISTS {schema}";
3536

3637

38+
/// <inheritdoc/>
3739
protected override void ExecuteCommandsWithinExceptionHandler(int index, SqlScript script, Action excuteCommand)
3840
{
3941
try

‎src/dbup-redshift/RedshiftTableJournal.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using DbUp.Engine;
33
using DbUp.Engine.Output;
44
using DbUp.Engine.Transactions;
@@ -24,16 +24,19 @@ public RedshiftTableJournal(Func<IConnectionManager> connectionManager, Func<IUp
2424
{
2525
}
2626

27+
/// <inheritdoc/>
2728
protected override string GetInsertJournalEntrySql(string @scriptName, string @applied)
2829
{
2930
return $"insert into {FqSchemaTableName} (ScriptName, Applied) values ({@scriptName}, {@applied})";
3031
}
3132

33+
/// <inheritdoc/>
3234
protected override string GetJournalEntriesSql()
3335
{
3436
return $"select ScriptName from {FqSchemaTableName} order by ScriptName";
3537
}
3638

39+
/// <inheritdoc/>
3740
protected override string CreateSchemaTableSql(string quotedPrimaryKeyName)
3841
{
3942
return

‎src/dbup-redshift/dbup-redshift.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<Description>DbUp makes it easy to deploy and upgrade SQL Server databases. This package adds Amazon Redshift support.</Description>
@@ -12,6 +12,7 @@
1212
<Product>dbup_redshift</Product>
1313
<PackageId>dbup-redshift</PackageId>
1414
<PackageIcon>dbup-icon.png</PackageIcon>
15+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1516
</PropertyGroup>
1617

1718
<PropertyGroup Condition="'$(CI)' == 'true'">

0 commit comments

Comments
 (0)