Skip to content

Commit f2b50f5

Browse files
authored
Merge pull request #242 from schveiguy/nullableerrors
Fix nullable errors from 2.097, fix github actions failure using dub upgrade action
2 parents b379d57 + 0d73fe3 commit f2b50f5

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

.github/workflows/dub.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,17 @@ jobs:
3939
with:
4040
compiler: ${{ matrix.compiler }}
4141

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

4546
- name: Build Library
4647
run: dub build --build=release --config=library
4748

4849
# cache
49-
- uses: WebFreak001/[email protected]
50-
if: startsWith(matrix.os, 'windows')
51-
with: { store: true }
50+
#- uses: WebFreak001/[email protected]
51+
# if: startsWith(matrix.os, 'windows')
52+
# with: { store: true }
5253

5354
# Older compiler versions
5455
build-older:
@@ -87,12 +88,13 @@ jobs:
8788
with:
8889
compiler: ${{ matrix.compiler }}
8990

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

9395
- name: Build Library
9496
run: dub build --build=release --config=library
9597

9698
# cache
97-
- uses: WebFreak001/[email protected]
98-
with: { store: true }
99+
#- uses: WebFreak001/[email protected]
100+
# with: { store: true }

integration-tests/source/mysql/test/integration.d

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ unittest
630630
auto val2 = 2;
631631
stmt = cn.prepare("SELECT * FROM manytypes WHERE i = ? AND f = ?");
632632
stmt.setArgs(val1, val2);
633-
row = cn.queryRow(stmt);
633+
row = cn.queryRow(stmt).get;
634634
}
635635
assert(row[0] == 1);
636636
assert(row[1] == 2);
@@ -1058,8 +1058,8 @@ unittest
10581058
// Test queryRow
10591059
nullableRow = cn.queryRow(selectSQL);
10601060
assert(!nullableRow.isNull);
1061-
assert(nullableRow[0] == 11);
1062-
assert(nullableRow[1] == "aaa");
1061+
assert(nullableRow.get[0] == 11);
1062+
assert(nullableRow.get[1] == "aaa");
10631063
// Were all results correctly purged? Can I still issue another command?
10641064
cn.query(selectSQL).array;
10651065

@@ -1069,8 +1069,8 @@ unittest
10691069
// Test prepared queryRow
10701070
nullableRow = cn.queryRow(prepared);
10711071
assert(!nullableRow.isNull);
1072-
assert(nullableRow[0] == 11);
1073-
assert(nullableRow[1] == "aaa");
1072+
assert(nullableRow.get[0] == 11);
1073+
assert(nullableRow.get[1] == "aaa");
10741074
// Were all results correctly purged? Can I still issue another command?
10751075
cn.query(selectSQL).array;
10761076

0 commit comments

Comments
 (0)