Skip to content

Commit 5b3da00

Browse files
committed
Extend Oracle support. Improve vector support. Cleanup a lot of duplicated operation handling. Fix test assumptions. Also test with older engins on github
1 parent 716c5a1 commit 5b3da00

543 files changed

Lines changed: 30379 additions & 9860 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ csharp_style_namespace_declarations = file_scoped:suggestion
2323
# IDE0130: Namespace does not match folder structure
2424
dotnet_style_namespace_match_folder = false
2525

26-
# CS1574: XML comment has cref attribute that could not be resolved
27-
dotnet_diagnostic.CS1574.severity = none
28-
2926
# IDE0057: Use range operator
3027
csharp_style_prefer_range_operator = false
3128

@@ -53,30 +50,36 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
5350

5451
dotnet_naming_symbols.interface.applicable_kinds = interface
5552
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
56-
dotnet_naming_symbols.interface.required_modifiers =
53+
dotnet_naming_symbols.interface.required_modifiers =
5754

5855
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
5956
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
60-
dotnet_naming_symbols.types.required_modifiers =
57+
dotnet_naming_symbols.types.required_modifiers =
6158

6259
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
6360
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
64-
dotnet_naming_symbols.non_field_members.required_modifiers =
61+
dotnet_naming_symbols.non_field_members.required_modifiers =
6562

6663
# Naming styles
6764

6865
dotnet_naming_style.begins_with_i.required_prefix = I
69-
dotnet_naming_style.begins_with_i.required_suffix =
70-
dotnet_naming_style.begins_with_i.word_separator =
66+
dotnet_naming_style.begins_with_i.required_suffix =
67+
dotnet_naming_style.begins_with_i.word_separator =
7168
dotnet_naming_style.begins_with_i.capitalization = pascal_case
7269

73-
dotnet_naming_style.pascal_case.required_prefix =
74-
dotnet_naming_style.pascal_case.required_suffix =
75-
dotnet_naming_style.pascal_case.word_separator =
70+
dotnet_naming_style.pascal_case.required_prefix =
71+
dotnet_naming_style.pascal_case.required_suffix =
72+
dotnet_naming_style.pascal_case.word_separator =
7673
dotnet_naming_style.pascal_case.capitalization = pascal_case
7774

78-
dotnet_naming_style.pascal_case.required_prefix =
79-
dotnet_naming_style.pascal_case.required_suffix =
80-
dotnet_naming_style.pascal_case.word_separator =
75+
dotnet_naming_style.pascal_case.required_prefix =
76+
dotnet_naming_style.pascal_case.required_suffix =
77+
dotnet_naming_style.pascal_case.word_separator =
8178
dotnet_naming_style.pascal_case.capitalization = pascal_case
8279
dotnet_style_operator_placement_when_wrapping = beginning_of_line
80+
81+
# IDE0008: Use explicit type
82+
dotnet_diagnostic.IDE0008.severity = none
83+
84+
# IDE0022: Use block body for method
85+
dotnet_diagnostic.IDE0022.severity = none

.github/workflows/build-older.yml

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: older engines
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
paths:
7+
- '**.cs'
8+
- '**.csproj'
9+
- '**.yml'
10+
11+
pull_request:
12+
paths:
13+
- '**.cs'
14+
- '**.csproj'
15+
- '**.yml'
16+
17+
workflow_dispatch:
18+
19+
env:
20+
REPODB_MYSQL_CONSTR_SYS: "Server=127.0.0.1;Port=43306;Database=sys;User ID=root;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;"
21+
REPODB_ORACLE_CONSTR_MASTER: "Data Source=127.0.0.1:41521/APPDB;User Id=system;Password=ddd53e85-b15e-4da8;"
22+
REPODB_POSTGRESQL_CONSTR_POSTGRESDB: "Server=127.0.0.1;Port=45432;Database=postgres;User Id=postgres;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;"
23+
REPODB_SQLSERVER_CONSTR_MASTER: "Server=tcp:127.0.0.1,41433;Database=master;User ID=sa;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;TrustServerCertificate=True;"
24+
25+
jobs:
26+
build:
27+
runs-on: ubuntu-latest
28+
29+
# Services. See docker-compose.yml
30+
services:
31+
mysql:
32+
image: mysql:8.0
33+
ports:
34+
- 127.0.0.1:43306:3306
35+
env:
36+
MYSQL_ROOT_PASSWORD: ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2
37+
38+
oracle:
39+
image: gvenzl/oracle-xe:18
40+
ports:
41+
- 127.0.0.1:41521:1521
42+
- 127.0.0.1:45500:5500
43+
env:
44+
ORACLE_PASSWORD: ddd53e85-b15e-4da8
45+
ORACLE_ALLOW_REMOTE: true
46+
47+
postgresql:
48+
image: postgres:14-alpine
49+
ports:
50+
- 127.0.0.1:45432:5432
51+
env:
52+
POSTGRES_PASSWORD: ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2
53+
54+
sqlserver:
55+
image: mcr.microsoft.com/mssql/server:2019-latest
56+
ports:
57+
- 127.0.0.1:41433:1433
58+
env:
59+
ACCEPT_EULA: true
60+
MSSQL_SA_PASSWORD: ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2
61+
62+
steps:
63+
- name: Check out repository code
64+
uses: actions/checkout@v6
65+
66+
- name: Setup DotNet Versions
67+
uses: actions/setup-dotnet@v5
68+
with:
69+
dotnet-version: |
70+
10.0.x
71+
72+
- name: build
73+
run: dotnet build -c Release
74+
75+
- name: Run tests for .Net 10.0 against older version
76+
run: dotnet test -c Release -f net10.0 --no-build --report-github --report-github-summary-include-passed=false

.github/workflows/build.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818

1919
env:
2020
REPODB_MYSQL_CONSTR_SYS: "Server=127.0.0.1;Port=43306;Database=sys;User ID=root;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;"
21-
REPODB_ORACLE_CONSTR_MASTER: "Data Source=127.0.0.1:41521/FREEPDB1;User Id=system;Password=oracle;"
21+
REPODB_ORACLE_CONSTR_MASTER: "Data Source=127.0.0.1:41521/APPDB;User Id=system;Password=ddd53e85-b15e-4da8;"
2222
REPODB_POSTGRESQL_CONSTR_POSTGRESDB: "Server=127.0.0.1;Port=45432;Database=postgres;User Id=postgres;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;"
2323
REPODB_SQLSERVER_CONSTR_MASTER: "Server=tcp:127.0.0.1,41433;Database=master;User ID=sa;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;TrustServerCertificate=True;"
2424

@@ -36,16 +36,16 @@ jobs:
3636
MYSQL_ROOT_PASSWORD: ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2
3737

3838
oracle:
39-
image: gvenzl/oracle-free:23-slim-faststart
39+
image: gvenzl/oracle-free:slim-faststart
4040
ports:
4141
- 127.0.0.1:41521:1521
4242
- 127.0.0.1:45500:5500
4343
env:
44-
ORACLE_PASSWORD: "oracle"
45-
ORACLE_ALLOW_REMOTE: "true"
44+
ORACLE_PASSWORD: ddd53e85-b15e-4da8
45+
ORACLE_ALLOW_REMOTE: true
4646

4747
postgresql:
48-
image: postgres:17-alpine
48+
image: pgvector/pgvector:pg18
4949
ports:
5050
- 127.0.0.1:45432:5432
5151
env:
@@ -88,8 +88,7 @@ jobs:
8888
run: dotnet pack -c Release -p:Version="${{ steps.version.outputs.version }}" -p:PackagePrefix=AmpScm. -o release
8989

9090
- name: Package nupkg files
91-
uses: actions/upload-artifact@v4
91+
uses: actions/upload-artifact@v6
9292
with:
9393
name: release
9494
path: release/*nupkg
95-

Directory.Packages.props

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,43 +5,46 @@
55
<NoWarn>$(NoWarn);NU1507</NoWarn>
66
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
77
<PublishRepositoryUrl>true</PublishRepositoryUrl>
8+
<PackageReleaseNotes>https://github.com/AmpScm/RepoDb/releases</PackageReleaseNotes>
9+
<PackageReadmeFile>README.md</PackageReadmeFile>
810
</PropertyGroup>
911
<ItemGroup>
1012
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
11-
<PackageVersion Include="Dapper" Version="2.1.66" />
13+
<PackageVersion Include="Dapper" Version="2.1.72" />
1214
<PackageVersion Include="Dapper.Contrib" Version="2.0.78" />
1315
<PackageVersion Include="GitHubActionsTestLogger" Version="3.0.1" />
14-
<PackageVersion Include="linq2db" Version="5.4.1.9" />
15-
<PackageVersion Include="linq2db.PostgreSQL" Version="5.4.1.9" />
16-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.3" />
16+
<PackageVersion Include="linq2db" Version="6.2.0" />
17+
<PackageVersion Include="linq2db.PostgreSQL" Version="6.2.0" />
18+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.5" />
1719
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
1820
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" />
1921
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
2022
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
2123
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.4" />
22-
<PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.0" />
24+
<PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.5" />
2325
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.16" />
2426
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.18" />
25-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.103" />
27+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.201" />
2628
<PackageVersion Include="Microsoft.SqlServer.Types" Version="170.1000.7" />
2729
<PackageVersion Include="Moq" Version="4.20.72" />
2830
<PackageVersion Include="MSTest" Version="4.1.0" />
2931
<PackageVersion Include="MSTest.TestFramework" Version="4.1.0" />
30-
<PackageVersion Include="MySql.Data" Version="9.4.0" />
32+
<PackageVersion Include="MySql.Data" Version="9.6.0" />
3133
<PackageVersion Include="MySqlConnector" Version="2.5.0" />
3234
<PackageVersion Include="NHibernate" Version="5.6.0" />
3335
<PackageVersion Include="Npgsql" Version="8.0.8" />
3436
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
3537
<PackageVersion Include="Oracle.ManagedDataAccess" Version="23.26.100" />
3638
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="23.26.100" />
39+
<PackageVersion Include="Pgvector" Version="0.3.2" />
3740
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
3841
<PackageVersion Include="System.Data.Common" Version="4.3.0" />
3942
<PackageVersion Include="System.Data.SQLite.Core" Version="1.0.119" />
4043
<PackageVersion Include="System.Dynamic.Runtime" Version="4.3.0" />
4144
<PackageVersion Include="System.Memory" Version="4.6.3" />
42-
<PackageVersion Include="System.Text.Json" Version="10.0.3" />
45+
<PackageVersion Include="System.Text.Json" Version="10.0.5" />
4346
</ItemGroup>
44-
<ItemGroup>
47+
<ItemGroup Condition="'$(BuildingInsideVisualStudio)' != 'true'">
4548
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
4649
</ItemGroup>
4750
</Project>

0 commit comments

Comments
 (0)