Skip to content

Commit 8429f2e

Browse files
committed
Merge remote-tracking branch 'origin/main' into sqlx-toml
# Conflicts: # Cargo.lock # Cargo.toml # sqlx-cli/src/database.rs # sqlx-cli/src/lib.rs # sqlx-mysql/src/connection/executor.rs
2 parents 1b0c64a + 277dd36 commit 8429f2e

Some content is hidden

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

61 files changed

+1983
-994
lines changed

.github/pull_request_template.md

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,50 @@
1+
<!--
2+
PR AUTHOR INSTRUCTIONS; PLEASE READ.
3+
4+
Give your pull request an accurate and descriptive title. It should mention what component(s) or database driver(s) it touches.
5+
Pull requests with undescriptive or inaccurate titles *may* be closed or have their titles changed before merging.
6+
7+
Fill out the fields below.
8+
9+
All pull requests *must* pass CI to be merged. Check your pull request frequently for build failures until all checks pass.
10+
Address build failures by pushing new commits or amending existing ones. Feel free to ask for help if you get stuck.
11+
If a failure seems spurious (timeout or cache failure), you may push a new commit to re-run it.
12+
13+
After addressing review comments, re-request review to show that you are ready for your PR to be looked at again.
14+
15+
Pull requests which sit for a long time with broken CI or unaddressed review comments will be closed to clear the backlog.
16+
If this happens, you are welcome to open a new pull request, but please be sure to address the feedback you have received previously.
17+
18+
Bug fixes should include a regression test which fails before the fix and passes afterwards. If this is infeasible, please explain why.
19+
20+
New features *should* include unit or integration tests in the appropriate folders. Database specific tests should go in `tests/<database>`.
21+
22+
Note that unsolicited pull requests implementing large or complex changes may not be reviwed right away.
23+
Maintainer time and energy is limited and massive unsolicited pull requests require an outsized effort to review.
24+
25+
To make the best use of your time and ours, search for and participate in existing discussion on the issue tracker before opening a pull request.
26+
The solution you came up with may have already been rejected or postponed due to other work needing to be done first,
27+
or there may be a pending solution going down a different direction that you hadn't considered.
28+
29+
Pull requests that take existing discussion into account are the most likely to be merged.
30+
31+
Delete this block comment before submission to show that you have read and understand these instructions.
32+
-->
33+
134
### Does your PR solve an issue?
2-
### Delete this text and add "fixes #(issue number)"
35+
Delete this text and add "fixes #(issue number)".
36+
37+
Do *not* just list issue numbers here as they will not be automatically closed on merging this pull request unless prefixed with "fixes" or "closes".
38+
39+
### Is this a breaking change?
40+
Delete this text and answer yes/no and explain.
41+
42+
If yes, this pull request will need to wait for the next major release (`0.{x + 1}.0`)
43+
44+
Behavior changes _can_ be breaking if significant enough.
45+
Consider [Hyrum's Law](https://www.hyrumslaw.com/):
46+
47+
> With a sufficient number of users of an API,
48+
> it does not matter what you promise in the contract:
49+
> all observable behaviors of your system
50+
> will be depended on by somebody.

.github/workflows/sqlx.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ jobs:
3939
- run: >
4040
cargo clippy
4141
--no-default-features
42-
--features all-databases,_unstable-all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }},macros
42+
--features all-databases,_unstable-all-types,sqlite-preupdate-hook,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }},macros
4343
-- -D warnings
4444
4545
# Run beta for new warnings but don't break the build.
4646
# Use a subdirectory of `target` to avoid clobbering the cache.
4747
- run: >
4848
cargo +beta clippy
4949
--no-default-features
50-
--features all-databases,_unstable-all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }},macros
50+
--features all-databases,_unstable-all-types,sqlite-preupdate-hook,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }},macros
5151
--target-dir target/beta/
5252
5353
check-minimal-versions:
@@ -140,7 +140,7 @@ jobs:
140140
- run: >
141141
cargo test
142142
--no-default-features
143-
--features any,macros,${{ matrix.linking }},_unstable-all-types,runtime-${{ matrix.runtime }}
143+
--features any,macros,${{ matrix.linking }},${{ matrix.linking == 'sqlite' && 'sqlite-preupdate-hook,' || ''}}_unstable-all-types,runtime-${{ matrix.runtime }}
144144
--
145145
--test-threads=1
146146
env:

0 commit comments

Comments
 (0)