Skip to content

Commit f22622f

Browse files
schveiguyschveiguy
authored
Merge pull request #261 from schveiguy/safeupdate2
Safe update
2 parents c6b4d8d + 23c6474 commit f22622f

Some content is hidden

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

41 files changed

+6504
-4724
lines changed

‎.github/workflows/dub.yml

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
compiler:
2727
- dmd-latest
2828
- ldc-latest
29+
- dmd-2.098.1
30+
- dmd-2.097.2
2931
- dmd-2.096.1
30-
- dmd-2.095.1
31-
- dmd-2.094.2
32-
- ldc-1.25.1 # eq to dmd v2.095.1
33-
- ldc-1.24.0 # eq to dmd v2.094.1
32+
- ldc-1.28.1 # eq to dmd v2.098.1
33+
- ldc-1.27.1 # eq to dmd v2.097.2
3434
steps:
3535
- uses: actions/checkout@v2
3636

@@ -39,17 +39,16 @@ jobs:
3939
with:
4040
compiler: ${{ matrix.compiler }}
4141

42-
# Note: this is not needed, because vanilla mysql-natve has no dependencies
43-
#- name: Upgrade dub dependencies
44-
# uses: WebFreak001/[email protected]
42+
- name: Upgrade dub dependencies
43+
uses: WebFreak001/[email protected]
4544

4645
- name: Build Library
4746
run: dub build --build=release --config=library
4847

4948
# cache
50-
#- uses: WebFreak001/[email protected]
51-
# if: startsWith(matrix.os, 'windows')
52-
# with: { store: true }
49+
- uses: WebFreak001/dub-upgrade@v0.1.1
50+
if: startsWith(matrix.os, 'windows')
51+
with: { store: true }
5352

5453
# Older compiler versions
5554
build-older:
@@ -59,6 +58,8 @@ jobs:
5958
matrix:
6059
os: [ ubuntu-latest, windows-latest ] # don't bother with macos-latest
6160
compiler:
61+
- dmd-2.095.1
62+
- dmd-2.094.2
6263
- dmd-2.093.1
6364
- dmd-2.092.1
6465
- dmd-2.091.1
@@ -68,15 +69,18 @@ jobs:
6869
- dmd-2.087.1
6970
- dmd-2.086.1
7071
- dmd-2.085.1
71-
- dmd-2.084.1
72-
- dmd-2.083.1
73-
- dmd-2.082.1
74-
- dmd-2.081.2
75-
- dmd-2.080.1
72+
# These compilers do not work with dub for downloading taggedalgebraic
73+
#- dmd-2.084.1
74+
#- dmd-2.083.1
75+
#- dmd-2.082.1
76+
#- dmd-2.081.2
77+
#- dmd-2.080.1
78+
- ldc-1.27.1 # eq to dmd v2.097.2
79+
- ldc-1.26.0 # eq to dmd v2.096.1
80+
- ldc-1.25.1 # eq to dmd v2.095.1
81+
- ldc-1.24.0 # eq to dmd v2.094.1
7682
- ldc-1.23.0 # eq to dmd v2.093.1
7783
- ldc-1.22.0 # eq to dmd v2.092.1
78-
- ldc-1.21.0 # eq to dmd v2.091.1
79-
- ldc-1.20.1 # eq to dmd v2.090.1
8084
- ldc-1.19.0 # eq to dmd v2.089.1
8185
runs-on: ${{ matrix.os }}
8286

@@ -88,13 +92,12 @@ jobs:
8892
with:
8993
compiler: ${{ matrix.compiler }}
9094

91-
# Note: this is not needed, because vanilla mysql-natve has no dependencies
92-
#- name: Upgrade dub dependencies
93-
# uses: WebFreak001/[email protected]
95+
- name: Upgrade dub dependencies
96+
uses: WebFreak001/[email protected]
9497

9598
- name: Build Library
9699
run: dub build --build=release --config=library
97100

98101
# cache
99-
#- uses: WebFreak001/[email protected]
100-
# with: { store: true }
102+
- uses: WebFreak001/dub-upgrade@v0.1.1
103+
with: { store: true }

‎.github/workflows/integration-testing.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ jobs:
8686
compiler:
8787
- dmd-latest
8888
- ldc-latest
89-
- dmd-2.095.1
90-
- dmd-2.094.2
91-
- ldc-1.25.1 # eq to dmd v2.095.1
92-
- ldc-1.24.0 # eq to dmd v2.094.1
89+
- dmd-2.098.1
90+
- dmd-2.097.2
91+
- ldc-1.28.1 # eq to dmd v2.098.1
92+
- ldc-1.27.0 # eq to dmd v2.097.2
9393

9494
runs-on: ubuntu-20.04
9595

@@ -157,10 +157,10 @@ jobs:
157157
compiler:
158158
- dmd-latest
159159
- ldc-latest
160-
- dmd-2.095.1
161-
- dmd-2.094.2
162-
- ldc-1.25.1 # eq to dmd v2.095.1
163-
- ldc-1.24.0 # eq to dmd v2.094.1
160+
- dmd-2.098.1
161+
- dmd-2.097.2
162+
- ldc-1.28.1 # eq to dmd v2.098.1
163+
- ldc-1.27.0 # eq to dmd v2.097.2
164164

165165
runs-on: ubuntu-20.04
166166

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ dub.selections.json
77
*.lib
88
*.dll
99
*.exe
10+
.*.swp
1011
/bin
1112
/testConnectionStr.txt
1213

‎SAFE_MIGRATION.md

Lines changed: 186 additions & 0 deletions
Large diffs are not rendered by default.

‎ddoc/macros.ddoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ Macros:
66
DOLLAR = $
77
COLON = :
88
EM = $(B $(I $0) )
9-
9+
1010
TYPE_MAPPINGS = See the $(LINK2 $(DDOX_ROOT_DIR)/mysql.html, MySQL/D Type Mappings tables)
11-
11+
SAFE_MIGRATION = See the $(LINK2 https://github.com/mysql-d/mysql-native/blob/master/SAFE_MIGRATION.md, Safe Migration) document for more details.
12+
1213
STD_DATETIME_DATE = $(D_INLINECODE $(LINK2 https://dlang.org/phobos/std_datetime_date.html#$0, $0))
1314
STD_EXCEPTION = $(D_INLINECODE $(LINK2 https://dlang.org/phobos/std_exception.html#$0, $0))
1415
STD_FILE = $(D_INLINECODE $(LINK2 https://dlang.org/phobos/std_file.html#$0, $0))

‎dub.sdl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
name "mysql-native"
22
description "A native MySQL driver implementation based on Steve Teale's original"
33
license "BSL-1.0"
4-
copyright "Copyright (c) 2011-2021 Steve Teale, James W. Oliphant, Simen Endsjø, Sönke Ludwig, Sergey Shamov, Nick Sabalausky, and Steven Schveighoffer"
4+
copyright "Copyright (c) 2011-2022 Steve Teale, James W. Oliphant, Simen Endsjø, Sönke Ludwig, Sergey Shamov, Nick Sabalausky, and Steven Schveighoffer"
55
authors "Steve Teale" "James W. Oliphant" "Simen Endsjø" "Sönke Ludwig" "Sergey Shamov" "Nick Sabalausky" "Steven Schveighoffer"
66

77
dependency "vibe-core" version=">=1.16.0" optional=true
8+
dependency "taggedalgebraic" version=">=0.11.22"
89

910
toolchainRequirements frontend=">=2.068"
1011

0 commit comments

Comments
 (0)