Skip to content

Commit 6e68c10

Browse files
committed
revert fork patches
1 parent 02336be commit 6e68c10

28 files changed

+166
-2061
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v3
2121
- uses: sfackler/actions/rustup@master
2222
- uses: sfackler/actions/rustfmt@master
23-
23+
2424
clippy:
2525
name: clippy
2626
runs-on: ubuntu-latest
@@ -55,7 +55,7 @@ jobs:
5555
- run: docker compose up -d
5656
- uses: sfackler/actions/rustup@master
5757
with:
58-
version: 1.77.0
58+
version: 1.64.0
5959
- run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
6060
id: rust-version
6161
- uses: actions/cache@v3

README.md

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,46 @@
1-
# Materialize fork of Rust-Postgres
1+
# Rust-Postgres
22

3-
This repo serves as a staging area for Materialize patches to the
4-
[rust-postgres] client before they are accepted upstream.
3+
PostgreSQL support for Rust.
54

6-
There are no releases from this fork. The [MaterializeInc/materialize]
7-
repository simply pins a recent commit from the `master` branch. Other projects
8-
are welcome to do the same. The `master` branch is never force pushed. Upstream
9-
changes are periodically into `master` via `git merge`.
5+
## postgres [![Latest Version](https://img.shields.io/crates/v/postgres.svg)](https://crates.io/crates/postgres)
106

11-
## Adding a new patch
7+
[Documentation](https://docs.rs/postgres)
128

13-
Develop your patch against the master branch of the upstream [rust-postgres]
14-
project. Open a PR with your changes. If your PR is not merged quickly, open the
15-
same PR against this repository and request a review from a Materialize
16-
engineer.
9+
A native, synchronous PostgreSQL client.
1710

18-
The long-term goal is to get every patch merged upstream.
11+
## tokio-postgres [![Latest Version](https://img.shields.io/crates/v/tokio-postgres.svg)](https://crates.io/crates/tokio-postgres)
1912

20-
## Integrating upstream changes
13+
[Documentation](https://docs.rs/tokio-postgres)
2114

22-
```shell
23-
git clone https://github.com/MaterializeInc/rust-postgres.git
24-
git remote add upstream https://github.com/sfackler/rust-postgres.git
25-
git checkout master
26-
git pull
27-
git checkout -b integrate-upstream
28-
git fetch upstream
29-
git merge upstream/master
30-
# Resolve any conflicts, then open a PR against this repository with the merge commit.
31-
```
15+
A native, asynchronous PostgreSQL client.
3216

33-
[rust-postgres]: https://github.com/sfackler/rust-postgres
34-
[MaterializeInc/materialize]: https://github.com/MaterializeInc/materialize
17+
## postgres-types [![Latest Version](https://img.shields.io/crates/v/postgres-types.svg)](https://crates.io/crates/postgres-types)
18+
19+
[Documentation](https://docs.rs/postgres-types)
20+
21+
Conversions between Rust and Postgres types.
22+
23+
## postgres-native-tls [![Latest Version](https://img.shields.io/crates/v/postgres-native-tls.svg)](https://crates.io/crates/postgres-native-tls)
24+
25+
[Documentation](https://docs.rs/postgres-native-tls)
26+
27+
TLS support for postgres and tokio-postgres via native-tls.
28+
29+
## postgres-openssl [![Latest Version](https://img.shields.io/crates/v/postgres-openssl.svg)](https://crates.io/crates/postgres-openssl)
30+
31+
[Documentation](https://docs.rs/postgres-openssl)
32+
33+
TLS support for postgres and tokio-postgres via openssl.
34+
35+
# Running test suite
36+
37+
The test suite requires postgres to be running in the correct configuration. The easiest way to do this is with docker:
38+
39+
1. Install `docker` and `docker-compose`.
40+
1. On ubuntu: `sudo apt install docker.io docker-compose`.
41+
1. Make sure your user has permissions for docker.
42+
1. On ubuntu: ``sudo usermod -aG docker $USER``
43+
1. Change to top-level directory of `rust-postgres` repo.
44+
1. Run `docker-compose up -d`.
45+
1. Run `cargo test`.
46+
1. Run `docker-compose stop`.

docker/sql_setup.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ port = 5433
6464
ssl = on
6565
ssl_cert_file = 'server.crt'
6666
ssl_key_file = 'server.key'
67-
wal_level = logical
6867
EOCONF
6968

7069
cat > "$PGDATA/pg_hba.conf" <<-EOCONF
@@ -83,7 +82,6 @@ host all ssl_user ::0/0 reject
8382
8483
# IPv4 local connections:
8584
host all postgres 0.0.0.0/0 trust
86-
host replication postgres 0.0.0.0/0 trust
8785
# IPv6 local connections:
8886
host all postgres ::0/0 trust
8987
# Unix socket connections:

0 commit comments

Comments
 (0)