Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make YesSqlOptions configurable from configuration provider #16079

Merged
merged 10 commits into from
May 18, 2024
5 changes: 4 additions & 1 deletion .github/workflows/functional_all_db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
test/OrchardCore.Tests.Functional/cms-tests/cypress/screenshots
src/OrchardCore.Cms.Web/App_Data/logs
retention-days: 3

test_functional_cms_postgresql:
name: Functional Tests - CMS Postgres
runs-on: ubuntu-latest
Expand All @@ -91,6 +91,7 @@ jobs:
env:
OrchardCore__ConnectionString: "User ID=postgres;Password=admin;Host=postgres;Port=5432;Database=app;"
OrchardCore__DatabaseProvider: "Postgres"
OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
Piedone marked this conversation as resolved.
Show resolved Hide resolved
steps:
- uses: actions/checkout@v4
# We need to install dotnet in the docker container.
Expand Down Expand Up @@ -128,6 +129,7 @@ jobs:
env:
OrchardCore__ConnectionString: "server=mysql;uid=root;pwd=test123;database=test"
OrchardCore__DatabaseProvider: "MySql"
OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
steps:
- uses: actions/checkout@v4
# We need to install dotnet in the docker container.
Expand Down Expand Up @@ -164,6 +166,7 @@ jobs:
env:
OrchardCore__ConnectionString: "Server=mssql;Database=tempdb;User Id=sa;Password=Password12!;Encrypt=False"
OrchardCore__DatabaseProvider: "SqlConnection"
OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
steps:
- uses: actions/checkout@v4
# We need to install dotnet in the docker container.
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/mac_unit_test_ci.yml
Piedone marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ jobs:
name: Unit Tests
steps:
- uses: actions/checkout@v4
- name: Build
run: dotnet build -c Release -warnaserror /p:TreatWarningsAsErrors=true /p:RunAnalyzers=true
- name: Run Test
run: dotnet test -c Release --no-restore --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
env:
OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
- name: Build and test
run: |
dotnet build -c Release -warnaserror /p:TreatWarningsAsErrors=true /p:RunAnalyzers=true
dotnet test -c Release --no-restore --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
2 changes: 0 additions & 2 deletions .github/workflows/main_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ jobs:
- name: Unit Tests
run: |
dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
env:
OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
- name: Functional Tests
if: matrix.os == 'ubuntu-latest'
run: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/pr_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ jobs:
- name: Unit Tests
run: |
dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
env:
OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
- name: Functional Tests
if: matrix.os == 'ubuntu-latest'
run: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/preview_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ jobs:
if: steps.check-publish.outputs.should-publish == 'true'
run: |
dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
env:
OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
- name: Functional Tests
if: steps.check-publish.outputs.should-publish == 'true'
run: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/release_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ jobs:
- name: Unit Tests
run: |
dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
env:
OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
- name: Functional Tests
if: matrix.os == 'ubuntu-latest'
run: |
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Cms.Web/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
// "DefaultTableNameSeparator": "_", // Table name separator, one or multiple '_', "NULL" means no separator, defaults to '_'.
// "DefaultIdentityColumnSize": "Int64" // Identity column size, 'Int32' or 'Int64', defaults to 'Int64'.
//},
// See https://docs.orchardcore.net/en/latest/reference/core/Data/#database-table to configure database table presets used before a given tenant is setup.
// See https://docs.orchardcore.net/en/latest/reference/core/Data/#configuring-yessql to configure YesSql.
//"OrchardCore_YesSql": {
// "CommandsPageSize": 500,
// "QueryGatingEnabled": true,
Expand Down
Loading