diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 998b106..5b0e728 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,10 +19,12 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Setup dotnet 8.0 - uses: actions/setup-dotnet@v1 + - name: Setup dotnet + uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: | + 8.0.x + 10.0.x - name: Build and Test run: ./Build.ps1 shell: pwsh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4be0954..014bd61 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,10 +16,12 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Setup dotnet 8.0 - uses: actions/setup-dotnet@v1 + - name: Setup dotnet + uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: | + 8.0.x + 10.0.x - name: Build and Test run: ./Build.ps1 shell: pwsh diff --git a/Respawn.DatabaseTests/EmptyDbTests.cs b/Respawn.DatabaseTests/EmptyDbTests.cs index 009a993..8777ff2 100644 --- a/Respawn.DatabaseTests/EmptyDbTests.cs +++ b/Respawn.DatabaseTests/EmptyDbTests.cs @@ -1,6 +1,5 @@ using System.Threading.Tasks; using Microsoft.Data.SqlClient; -using Respawn.Graph; using Testcontainers.MsSql; using Xunit; using Xunit.Abstractions; @@ -8,7 +7,6 @@ namespace Respawn.DatabaseTests { using System; - using System.Linq; using NPoco; using Shouldly; diff --git a/Respawn.DatabaseTests/MySqlTests.cs b/Respawn.DatabaseTests/MySqlTests.cs index 5ad306c..7786951 100644 --- a/Respawn.DatabaseTests/MySqlTests.cs +++ b/Respawn.DatabaseTests/MySqlTests.cs @@ -372,11 +372,5 @@ public async Task ShouldResetSequencesAndIdentities() _database.ExecuteScalar("SELECT AUTO_INCREMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'MySqlTests' AND TABLE_NAME = 'a';").ShouldBe(1); } - public void Dispose() - { - _connection.Close(); - _connection.Dispose(); - } - } } diff --git a/Respawn.DatabaseTests/PostgresTests.cs b/Respawn.DatabaseTests/PostgresTests.cs index 039f601..aad8209 100644 --- a/Respawn.DatabaseTests/PostgresTests.cs +++ b/Respawn.DatabaseTests/PostgresTests.cs @@ -68,7 +68,7 @@ public async Task DisposeAsync() await _sqlContainer.DisposeAsync(); } - [SkipOnCI] + [Fact] public async Task ShouldDeleteData() { await _database.ExecuteAsync("create table \"foo\" (value int)"); @@ -86,7 +86,7 @@ public async Task ShouldDeleteData() _database.ExecuteScalar("SELECT COUNT(1) FROM \"foo\"").ShouldBe(0); } - [SkipOnCI] + [Fact] public async Task ShouldIgnoreTables() { await _database.ExecuteAsync("create table foo (Value int)"); @@ -108,7 +108,7 @@ public async Task ShouldIgnoreTables() _database.ExecuteScalar("SELECT COUNT(1) FROM bar").ShouldBe(0); } - [SkipOnCI] + [Fact] public async Task ShouldIgnoreTablesIfSchemaSpecified() { await _database.ExecuteAsync("create schema eggs"); @@ -131,7 +131,7 @@ public async Task ShouldIgnoreTablesIfSchemaSpecified() _database.ExecuteScalar("SELECT COUNT(1) FROM eggs.bar").ShouldBe(0); } - [SkipOnCI] + [Fact] public async Task ShouldIncludeTables() { await _database.ExecuteAsync("create table foo (Value int)"); @@ -153,7 +153,7 @@ public async Task ShouldIncludeTables() _database.ExecuteScalar("SELECT COUNT(1) FROM bar").ShouldBe(100); } - [SkipOnCI] + [Fact] public async Task ShouldIncludeTablesIfSchemaSpecified() { await _database.ExecuteAsync("create schema eggs"); @@ -176,7 +176,7 @@ public async Task ShouldIncludeTablesIfSchemaSpecified() _database.ExecuteScalar("SELECT COUNT(1) FROM eggs.bar").ShouldBe(100); } - [SkipOnCI] + [Fact] public async Task ShouldHandleRelationships() { await _database.ExecuteAsync("create table foo (value int, primary key (value))"); @@ -209,7 +209,7 @@ public async Task ShouldHandleRelationships() _database.ExecuteScalar("SELECT COUNT(1) FROM baz").ShouldBe(0); } - [SkipOnCI] + [Fact] public async Task ShouldHandleCircularRelationships() { await _database.ExecuteAsync("create table parent (id int primary key, childid int NULL)"); @@ -244,7 +244,7 @@ public async Task ShouldHandleCircularRelationships() _database.ExecuteScalar("SELECT COUNT(1) FROM child").ShouldBe(0); } - [SkipOnCI] + [Fact] public async Task ShouldHandleSelfRelationships() { await _database.ExecuteAsync("create table foo (id int primary key, parentid int NULL)"); @@ -272,7 +272,7 @@ public async Task ShouldHandleSelfRelationships() _database.ExecuteScalar("SELECT COUNT(1) FROM foo").ShouldBe(0); } - [SkipOnCI] + [Fact] public async Task ShouldHandleComplexCycles() { await _database.ExecuteAsync("create table a (id int primary key, b_id int NULL)"); @@ -326,7 +326,7 @@ public async Task ShouldHandleComplexCycles() } - [SkipOnCI] + [Fact] public async Task ShouldExcludeSchemas() { await _database.ExecuteAsync("create schema a"); @@ -350,7 +350,7 @@ public async Task ShouldExcludeSchemas() _database.ExecuteScalar("SELECT COUNT(1) FROM b.bar").ShouldBe(0); } - [SkipOnCI] + [Fact] public async Task ShouldIncludeSchemas() { await _database.ExecuteAsync("create schema a"); @@ -374,7 +374,7 @@ public async Task ShouldIncludeSchemas() _database.ExecuteScalar("SELECT COUNT(1) FROM b.bar").ShouldBe(0); } - [SkipOnCI] + [Fact] public async Task ShouldResetSequencesAndIdentities() { await _database.ExecuteAsync("CREATE TABLE a (id INT GENERATED ALWAYS AS IDENTITY, value SERIAL)"); diff --git a/Respawn.DatabaseTests/Respawn.DatabaseTests.csproj b/Respawn.DatabaseTests/Respawn.DatabaseTests.csproj index 0da14ac..b3c2766 100644 --- a/Respawn.DatabaseTests/Respawn.DatabaseTests.csproj +++ b/Respawn.DatabaseTests/Respawn.DatabaseTests.csproj @@ -1,7 +1,7 @@ - net8.0 + net8.0;net10.0 $(NoWarn);NU1902;NU1903;NU1904 diff --git a/Respawn.sln b/Respawn.sln index b477839..5e60821 100644 --- a/Respawn.sln +++ b/Respawn.sln @@ -13,7 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Build.ps1 = Build.ps1 .github\workflows\ci.yml = .github\workflows\ci.yml Directory.Build.props = Directory.Build.props - docker-compose.yml = docker-compose.yml informix-server\my_post.sh = informix-server\my_post.sh informix-server\onconfig = informix-server\onconfig Push.ps1 = Push.ps1 diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index a30093f..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,68 +0,0 @@ -version: '3' - - -services: - postgres-db: - image: postgres - restart: always - environment: - POSTGRES_USER: docker - POSTGRES_PASSWORD: Password12! - ports: - - 8081:5432 - mysql-db: - image: mysql:5.7 - restart: always - environment: - MYSQL_ROOT_PASSWORD: testytest - ports: - - 8082:3306 -# oracle: -# image: truevoly/oracle-12c -# restart: always -# ports: -# - 8080:8080 -# - 10521:1521 - informix: - image: ibmcom/informix-developer-database:14.10.FC5DE - restart: always - tty: true - user: root - environment: - LICENSE: accept - ONCONFIG_FILE: onconfig - RUN_FILE_PRE_INIT: my_post.sh - ports: - - 9088:9088 - - 9089:9089 - - 27017:27017 - - 27018:27018 - - 27883:27883 - privileged: true - volumes: - - ./informix-server:/opt/ibm/config - db2: - image: icr.io/db2_community/db2:latest - restart: always - tty: true - environment: - TO_CREATE_SAMPLEDB: false - UPDATEAVAIL: NO - ENABLE_ORACLE_COMPATIBILITY: false - BLU: false - DBNAME: SAMPLEDB - DB2INST1_PASSWORD: password - DB2INSTANCE: db2inst1 - LICENSE: accept - DBPORT: 50000 - STORAGE_DIR: /database - ports: - - 50000:50000 - privileged: true - volumes: - - ./db2-server:/database - adminer: - image: adminer - restart: always - ports: - - 8083:8083