Merge pull request #9 from DbUp/release/6.0.0

Release 6.0
DbUp · Dec 17, 2024 · 3cd696e · 3cd696e
2 parents d488659 + 8371cd1
commit 3cd696e
Show file tree

Hide file tree

Showing 18 changed files with 77 additions and 193 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,77 +2,12 @@ name: CI
 
 on:
   push:
+    branches:
+      - '**' # Ignores pushes of tags
   pull_request:
   workflow_dispatch:
 
 jobs:
   build:
-    runs-on: windows-latest  # Use Ubuntu in v5.0
-
-    env:
-      DOTNET_NOLOGO: true
-      DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Avoid pre-populating the NuGet package cache
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # all
-
-      - name: Setup .NET 2.0 # Remove in v5.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 2.0.x
-
-      - name: Setup .NET 8.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 8.0.x
-
-      - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v0
-        with:
-          versionSpec: '5.x'
-
-      - name: Run GitVersion
-        id: gitversion
-        uses: gittools/actions/gitversion/execute@v0
-
-      - name: Display SemVer
-        run: |
-            echo "SemVer: $env:GitVersion_SemVer"
-          
-      - name: Add DbUp NuGet Source
-        run: dotnet nuget add source --name DbUp --username DbUp --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text https://nuget.pkg.github.com/DbUp/index.json
-
-      - name: Restore
-        run: dotnet restore
-        working-directory: src
-
-      - name: Build
-        run: dotnet build -c Release --no-restore /p:Version=$env:GitVersion_SemVer
-        working-directory: src
-
-      - name: Test
-        run: dotnet test --no-build -c Release --logger trx --logger "console;verbosity=detailed" --results-directory ../artifacts
-        working-directory: src
-
-      - name: Pack
-        run: dotnet pack --no-build -c Release -o ../artifacts /p:Version=$env:GitVersion_SemVer
-        working-directory: src
-
-      - name: Push NuGet packages to GitHub Packages ⬆️
-        working-directory: artifacts
-        run: dotnet nuget push *.nupkg --api-key ${{ secrets.GITHUB_TOKEN }} --source "https://nuget.pkg.github.com/DbUp/index.json"
-
-      - name: Push NuGet packages to NuGet ⬆️
-        if: ${{ steps.gitversion.outputs.preReleaseLabel == '' }}
-        working-directory: artifacts
-        run: dotnet nuget push *.nupkg --api-key ${{ secrets.NUGET_APIKEY }} --source https://api.nuget.org/v3/index.json
-
-      - name: Test Report 🧪
-        uses: dorny/test-reporter@v1
-        if: ${{ always() }}
-        with:
-          name: Tests
-          path: artifacts/*.trx
-          reporter: dotnet-trx
+    name: Build
+    uses: DbUp/Universe/.github/workflows/build.yml@main
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -0,0 +1,12 @@
+name: Publish DbUp Packages to NuGet
+
+on:
+  release:
+    types: [ published ]
+  workflow_dispatch:
+
+jobs:
+  publish:
+    name: Publish Package
+    uses: DbUp/Universe/.github/workflows/publish-release.yml@main
+    secrets: inherit
diff --git a/.github/workflows/test-report.yml b/.github/workflows/test-report.yml
@@ -0,0 +1,12 @@
+name: Test Report
+run-name: Generate Test Report for run `${{ github.event.workflow_run.run_number }}` branch `${{ github.event.workflow_run.head_branch }}`
+
+on:
+  workflow_run:
+    workflows: ["CI", "build"]
+    types: [completed]
+
+jobs:
+  report:
+    name: Test Report 🧪
+    uses: DbUp/Universe/.github/workflows/test-report.yml@main
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -10,18 +10,4 @@
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TF_BUILD)' == 'true' Or '$(CI)' == 'true'">
-
-    <!-- Perform a deterministic build, so our binaries aren't impacted by build server environmental factors (e.g. file paths). -->
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-
-    <!-- Embed source files that are not tracked by the source control manager in the PDB -->
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-
-    <!-- Recommended: Embed symbols containing Source Link in the main file (exe/dll) -->
-    <DebugType>embedded</DebugType>
-
-  </PropertyGroup>
-
 </Project>
diff --git a/...portTests.VerifyBasicSupport.verified.txt → ...portTests.VerifyBasicSupport.approved.txt b/...portTests.VerifyBasicSupport.verified.txt → ...portTests.VerifyBasicSupport.approved.txt
@@ -1,11 +1,11 @@
 DB Operation: Open connection
 Info:         Beginning database upgrade
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from user_tables where table_name = 'SCHEMAVERSIONS'
 DB Operation: Dispose command
 Info:         Journal table does not exist
 Info:         Executing Database Server script 'Script0001.sql'
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from user_tables where table_name = 'SCHEMAVERSIONS'
 DB Operation: Dispose command
 Info:         Creating the "schemaversions" table

diff --git a/...JournalCreationIfNameChanged.verified.txt → ...JournalCreationIfNameChanged.approved.txt b/...JournalCreationIfNameChanged.verified.txt → ...JournalCreationIfNameChanged.approved.txt
@@ -1,11 +1,11 @@
 DB Operation: Open connection
 Info:         Beginning database upgrade
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from user_tables where table_name = 'TESTSCHEMAVERSIONS'
 DB Operation: Dispose command
 Info:         Journal table does not exist
 Info:         Executing Database Server script 'Script0001.sql'
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from user_tables where table_name = 'TESTSCHEMAVERSIONS'
 DB Operation: Dispose command
 Info:         Creating the "test"."TestSchemaVersions" table

diff --git a/....VerifyVariableSubstitutions.verified.txt → ....VerifyVariableSubstitutions.approved.txt b/....VerifyVariableSubstitutions.verified.txt → ....VerifyVariableSubstitutions.approved.txt
@@ -1,11 +1,11 @@
 DB Operation: Open connection
 Info:         Beginning database upgrade
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from user_tables where table_name = 'SCHEMAVERSIONS'
 DB Operation: Dispose command
 Info:         Journal table does not exist
 Info:         Executing Database Server script 'Script0001.sql'
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from user_tables where table_name = 'SCHEMAVERSIONS'
 DB Operation: Dispose command
 Info:         Creating the "schemaversions" table

diff --git a/src/Tests/ApprovalFiles/NoPublicApiChanges.Run.DotNet.verified.cs b/src/Tests/ApprovalFiles/NoPublicApiChanges.Run.DotNet.verified.cs
diff --git a/...es/NoPublicApiChanges.Run.Net.verified.cs → ...lFiles/NoPublicApiChanges.Run.approved.cs b/...es/NoPublicApiChanges.Run.Net.verified.cs → ...lFiles/NoPublicApiChanges.Run.approved.cs
@@ -33,6 +33,7 @@ protected override void ReadCustomStatement() { }
     }
     public static class OracleExtensions
     {
+        public static DbUp.Builder.UpgradeEngineBuilder JournalToOracleTable(this DbUp.Builder.UpgradeEngineBuilder builder, string schema, string table) { }
         public static DbUp.Builder.UpgradeEngineBuilder OracleDatabase(DbUp.Engine.Transactions.IConnectionManager connectionManager) { }
         [System.ObsoleteAttribute("Use OracleDatabaseWithDefaultDelimiter, OracleDatabaseWithSemicolonDelimiter or the OracleDatabase with the delimiter parameter instead, see https://github.com/DbUp/DbUp/pull/335")]
         public static DbUp.Builder.UpgradeEngineBuilder OracleDatabase(this DbUp.Builder.SupportedDatabases supported, string connectionString) { }

diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net8</TargetFrameworks>
+    <TargetFramework>net8</TargetFramework>
     <AssemblyName>Tests</AssemblyName>
     <RootNamespace>DbUp.Oracle.Tests</RootNamespace>
-    <!--    <ImplicitUsings>enable</ImplicitUsings> Can't use implict usings with net46 -->
+    <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\dbup-oracle\dbup-oracle.csproj"/>
-    <PackageReference Include="DbUp.Tests.Common" Version="5.0.37"/>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-    <PackageReference Include="xunit" Version="2.6.6"/>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="DbUp.Tests.Common" Version="6.0.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/dbup-oracle.sln b/src/dbup-oracle.sln
@@ -23,6 +23,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{77157734-01D
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		dbup-oracle.sln.DotSettings = dbup-oracle.sln.DotSettings
+		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
 Global

diff --git a/src/dbup-oracle.sln.DotSettings b/src/dbup-oracle.sln.DotSettings
@@ -5,5 +5,8 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQ/@EntryIndexedValue">SQ</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String>
 	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String></wpf:ResourceDictionary>
diff --git a/src/dbup-oracle/OracleCommandReader.cs b/src/dbup-oracle/OracleCommandReader.cs
@@ -20,7 +20,8 @@ public class OracleCommandReader : SqlCommandReader
         /// Hook to support custom statements
         /// </summary>
         protected override bool IsCustomStatement => TryPeek(DelimiterKeyword.Length, out var statement) &&
-                                                     string.Equals(DelimiterKeyword, statement, StringComparison.OrdinalIgnoreCase);
+                                                     string.Equals(DelimiterKeyword, statement, StringComparison.OrdinalIgnoreCase) &&
+                                                     string.IsNullOrEmpty(GetCurrentCommandTextFromBuffer());
 
         /// <summary>
         /// Read a custom statement

diff --git a/src/dbup-oracle/OracleCustomDelimiterCommandReader.cs b/src/dbup-oracle/OracleCustomDelimiterCommandReader.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using DbUp.Support;
 
@@ -20,7 +20,8 @@ public OracleCustomDelimiterCommandReader(string sqlText, char delimiter) : base
         /// </summary>
         protected override bool IsCustomStatement
             => TryPeek(DelimiterKeyword.Length - 1, out var statement) &&
-               string.Equals(DelimiterKeyword, CurrentChar + statement, StringComparison.OrdinalIgnoreCase);
+               string.Equals(DelimiterKeyword, CurrentChar + statement, StringComparison.OrdinalIgnoreCase) &&
+               string.IsNullOrEmpty(GetCurrentCommandTextFromBuffer());
 
         /// <summary>
         /// Read a custom statement

diff --git a/src/dbup-oracle/OracleExtensions.cs b/src/dbup-oracle/OracleExtensions.cs
@@ -170,6 +170,19 @@ public static UpgradeEngineBuilder OracleDatabase(IConnectionManager connectionM
             builder.WithPreprocessor(new OraclePreprocessor());
             return builder;
         }
+
+        /// <summary>
+        /// Tracks the list of executed scripts in an Oracle table.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="schema">The schema.</param>
+        /// <param name="table">The table.</param>
+        /// <returns></returns>
+        public static UpgradeEngineBuilder JournalToOracleTable(this UpgradeEngineBuilder builder, string schema, string table)
+        {
+            builder.Configure(c => c.Journal = new OracleTableJournal(() => c.ConnectionManager, () => c.Log, schema, table));
+            return builder;
+        }
     }
 #pragma warning restore IDE0060 // Remove unused parameter
 }
diff --git a/src/dbup-oracle/OracleScriptExecutor.cs b/src/dbup-oracle/OracleScriptExecutor.cs
@@ -47,10 +47,10 @@ protected override void ExecuteCommandsWithinExceptionHandler(int index, SqlScri
             }
             catch (OracleException exception)
             {
-                Log().WriteInformation("Oracle exception has occurred in script: '{0}'", script.Name);
+                Log().LogInformation("Oracle exception has occurred in script: '{0}'", script.Name);
                 // OracleException.Number is the actual oracle error code
-                Log().WriteError("Script block number: {0}; Oracle error code: {1}; Message: {2}", index, exception.Number, exception.Message);
-                Log().WriteError(exception.ToString());
+                Log().LogError("Script block number: {0}; Oracle error code: {1}; Message: {2}", index, exception.Number, exception.Message);
+                Log().LogError(exception.ToString());
                 throw;
             }
         }