Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fork everything as prisma-postgres #1

Open
wants to merge 3 commits into
base: pgbouncer-mode
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ members = [
"postgres-derive",
"postgres-derive-test",
"postgres-native-tls",
"postgres-openssl",
"postgres-protocol",
"postgres-types",
"tokio-postgres",
Expand Down
28 changes: 12 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,38 +1,34 @@
# Rust-Postgres
[![CircleCI](https://circleci.com/gh/sfackler/rust-postgres.svg?style=shield)](https://circleci.com/gh/sfackler/rust-postgres)

PostgreSQL support for Rust.
PostgreSQL support for Rust. This version adds a new config option for
pgbouncer, allowing prepared statement use on pgbouncer's transaction mode. If
you don't need this, you're much better off with the [original
crate](https://crates.io/crates/postgres).

## postgres [![Latest Version](https://img.shields.io/crates/v/postgres.svg)](https://crates.io/crates/postgres)
## postgres [![Latest Version](https://img.shields.io/crates/v/prisma-postgres.svg)](https://crates.io/crates/prisma-postgres)

[Documentation](https://docs.rs/postgres)
[Documentation](https://docs.rs/prisma-postgres)

A native, synchronous PostgreSQL client.

## tokio-postgres [![Latest Version](https://img.shields.io/crates/v/tokio-postgres.svg)](https://crates.io/crates/tokio-postgres)
## tokio-postgres [![Latest Version](https://img.shields.io/crates/v/tokio-postgres.svg)](https://crates.io/crates/prisma-tokio-postgres)

[Documentation](https://docs.rs/tokio-postgres)
[Documentation](https://docs.rs/prisma-tokio-postgres)

A native, asynchronous PostgreSQL client.

## postgres-types [![Latest Version](https://img.shields.io/crates/v/postgres-types.svg)](https://crates.io/crates/postgres-types)
## postgres-types [![Latest Version](https://img.shields.io/crates/v/postgres-types.svg)](https://crates.io/crates/prisma-postgres-types)

[Documentation](https://docs.rs/postgres-types)
[Documentation](https://docs.rs/prisma-postgres-types)

Conversions between Rust and Postgres types.

## postgres-native-tls [![Latest Version](https://img.shields.io/crates/v/postgres-native-tls.svg)](https://crates.io/crates/postgres-native-tls)
## postgres-native-tls [![Latest Version](https://img.shields.io/crates/v/postgres-native-tls.svg)](https://crates.io/crates/prisma-postgres-native-tls)

[Documentation](https://docs.rs/postgres-native-tls)
[Documentation](https://docs.rs/prisma-postgres-native-tls)

TLS support for postgres and tokio-postgres via native-tls.

## postgres-openssl [![Latest Version](https://img.shields.io/crates/v/postgres-openssl.svg)](https://crates.io/crates/postgres-openssl)

[Documentation](https://docs.rs/postgres-openssl)

TLS support for postgres and tokio-postgres via openssl.

# Running test suite

The test suite requires postgres to be running in the correct configuration. The easiest way to do this is with docker:
Expand Down
8 changes: 4 additions & 4 deletions postgres-derive-test/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "postgres-derive-test"
name = "prisma-postgres-derive-test"
version = "0.1.0"
authors = ["Steven Fackler <[email protected]>"]
authors = ["Steven Fackler <[email protected]>", "Julius de Bruijn <[email protected]>"]
edition = "2018"

[dev-dependencies]
trybuild = "1.0"

postgres-types = { path = "../postgres-types", features = ["derive"] }
postgres = { path = "../postgres" }
prisma-postgres-types = { path = "../postgres-types", features = ["derive"] }
prisma-postgres = { path = "../postgres" }
6 changes: 3 additions & 3 deletions postgres-derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "postgres-derive"
name = "prisma-postgres-derive"
version = "0.4.0"
authors = ["Steven Fackler <sfackler@palantir.com>"]
authors = ["Steven Fackler <sfackler@gmail.com>", "Julius de Bruijn <[email protected]>"]
license = "MIT/Apache-2.0"
edition = "2018"
description = "An internal crate used by postgres-types"
repository = "https://github.com/sfackler/rust-postgres"
repository = "https://github.com/pimeys/rust-postgres"

[lib]
proc-macro = true
Expand Down
15 changes: 6 additions & 9 deletions postgres-native-tls/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
[package]
name = "postgres-native-tls"
version = "0.5.0"
authors = ["Steven Fackler <[email protected]>"]
authors = ["Steven Fackler <[email protected]>", "Julius de Bruijn <[email protected]>"]
edition = "2018"
license = "MIT/Apache-2.0"
description = "TLS support for tokio-postgres via native-tls"
repository = "https://github.com/sfackler/rust-postgres"
description = "TLS support for prisma-tokio-postgres via native-tls"
repository = "https://github.com/pimeys/rust-postgres"
readme = "../README.md"

[badges]
circle-ci = { repository = "sfackler/rust-postgres" }

[features]
default = ["runtime"]
runtime = ["tokio-postgres/runtime"]
runtime = ["prisma-tokio-postgres/runtime"]

[dependencies]
futures = "0.3"
native-tls = "0.2"
tokio = "1.0"
tokio-native-tls = "0.3"
tokio-postgres = { version = "0.7.0", path = "../tokio-postgres", default-features = false }
prisma-tokio-postgres = { version = "0.7.0", path = "../tokio-postgres", default-features = false }

[dev-dependencies]
tokio = { version = "1.0", features = ["full"] }
postgres = { version = "0.19.0", path = "../postgres" }
prisma-postgres = { version = "0.19.0", path = "../postgres" }
37 changes: 0 additions & 37 deletions postgres-openssl/CHANGELOG.md

This file was deleted.

27 changes: 0 additions & 27 deletions postgres-openssl/Cargo.toml

This file was deleted.

1 change: 0 additions & 1 deletion postgres-openssl/LICENSE-APACHE

This file was deleted.

1 change: 0 additions & 1 deletion postgres-openssl/LICENSE-MIT

This file was deleted.

Loading