From 4174eeeecb0d71fa304ca83b1ce26432fd9035e8 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Tue, 5 Mar 2019 19:03:36 -0800 Subject: [PATCH] Release tokio-postgres v0.4.0-rc.1 --- postgres/Cargo.toml | 12 +- tokio-postgres-native-tls/Cargo.toml | 2 +- tokio-postgres-openssl/Cargo.toml | 2 +- tokio-postgres/CHANGELOG.md | 42 ++++++ tokio-postgres/Cargo.toml | 25 ++-- tokio-postgres/LICENSE-APACHE | 201 +++++++++++++++++++++++++++ tokio-postgres/LICENSE-MIT | 22 +++ tokio-postgres/src/lib.rs | 1 + 8 files changed, 283 insertions(+), 24 deletions(-) create mode 100644 tokio-postgres/CHANGELOG.md create mode 100644 tokio-postgres/LICENSE-APACHE create mode 100644 tokio-postgres/LICENSE-MIT diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml index f4ff6ebd..0057a7bc 100644 --- a/postgres/Cargo.toml +++ b/postgres/Cargo.toml @@ -9,18 +9,18 @@ default = ["runtime"] runtime = ["tokio-postgres/runtime", "tokio", "lazy_static", "log"] -"with-bit-vec-0.5" = ["tokio-postgres/with-bit-vec-0.5"] -"with-chrono-0.4" = ["tokio-postgres/with-chrono-0.4"] -"with-eui48-0.4" = ["tokio-postgres/with-eui48-0.4"] -"with-geo-types-0.4" = ["tokio-postgres/with-geo-types-0.4"] +"with-bit-vec-0_5" = ["tokio-postgres/with-bit-vec-0_5"] +"with-chrono-0_4" = ["tokio-postgres/with-chrono-0_4"] +"with-eui48-0_4" = ["tokio-postgres/with-eui48-0_4"] +"with-geo-types-0_4" = ["tokio-postgres/with-geo-types-0_4"] "with-serde_json-1" = ["tokio-postgres/with-serde_json-1"] -"with-uuid-0.7" = ["tokio-postgres/with-uuid-0.7"] +"with-uuid-0_7" = ["tokio-postgres/with-uuid-0_7"] [dependencies] bytes = "0.4" fallible-iterator = "0.1" futures = "0.1" -tokio-postgres = { version = "0.3", path = "../tokio-postgres", default-features = false } +tokio-postgres = { version = "0.4.0-rc.1", path = "../tokio-postgres", default-features = false } tokio = { version = "0.1", optional = true } lazy_static = { version = "1.0", optional = true } diff --git a/tokio-postgres-native-tls/Cargo.toml b/tokio-postgres-native-tls/Cargo.toml index 9c938348..0c7e77b2 100644 --- a/tokio-postgres-native-tls/Cargo.toml +++ b/tokio-postgres-native-tls/Cargo.toml @@ -13,7 +13,7 @@ futures = "0.1" native-tls = "0.2" tokio-io = "0.1" tokio-tls = "0.2.1" -tokio-postgres = { version = "0.3", path = "../tokio-postgres", default-features = false } +tokio-postgres = { version = "0.4.0-rc.1", path = "../tokio-postgres", default-features = false } [dev-dependencies] tokio = "0.1.7" diff --git a/tokio-postgres-openssl/Cargo.toml b/tokio-postgres-openssl/Cargo.toml index 2ce03eaf..afba5cdc 100644 --- a/tokio-postgres-openssl/Cargo.toml +++ b/tokio-postgres-openssl/Cargo.toml @@ -13,7 +13,7 @@ futures = "0.1" openssl = "0.10" tokio-io = "0.1" tokio-openssl = "0.3" -tokio-postgres = { version = "0.3", path = "../tokio-postgres", default-features = false } +tokio-postgres = { version = "0.4.0-rc.1", path = "../tokio-postgres", default-features = false } [dev-dependencies] tokio = "0.1.7" diff --git a/tokio-postgres/CHANGELOG.md b/tokio-postgres/CHANGELOG.md new file mode 100644 index 00000000..af5d42ef --- /dev/null +++ b/tokio-postgres/CHANGELOG.md @@ -0,0 +1,42 @@ +# Change Log + +## [Unreleased] + +## [v0.4.0-rc.1] - 2019-05-03 + +### Changed + +* The client API has been significantly overhauled. It now resembles `hyper`'s, with separate `Connection` and `Client` + objects. See the crate-level documentation for more details. +* Connection string configuration now fully mirrors libpq's syntax, and supports both URL-style and key-value style + strings. +* The TLS connection mode (e.g. `prefer`) is now part of the connection configuration rather than being passed in + separately. +* The Cargo features enabling `ToSql` and `FromSql` implementations for external crates are now versioned. For example, + `with-uuid` is now `with-uuid-0_7`. This enables us to add support for new major versions of the crates in parallel + without breaking backwards compatibility. +* Upgraded from `tokio-core` to `tokio`. + +### Added + +* `FromSql` implementations can now borrow from the data buffer. In particular, this means that you can deserialize + values as `&str`. The `FromSqlOwned` trait can be used as a bound to restrict code to deserializing owned values. +* Added support for channel binding with SCRAM authentication. +* Added multi-host support in connection configuration. +* The client now supports query pipelining, which can be used as a latency hiding measure. +* While the crate uses `tokio` by default, the base API can be used with any asynchronous stream type on any reactor. +* Added support for simple query requests returning row data. + +### Removed + +* The `with-openssl` feature has been removed. Use the `tokio-postgres-openssl` crate instead. +* The `with-rustc_serialize` and `with-time` features have been removed. Use `serde` and `SystemTime` or `chrono` + instead. + +## Older + +Look at the [release tags] for information about older releases. + +[Unreleased]: https://github.com/sfackler/rust-postgres/compare/tokio-postgres-v0.4.0-rc.1...master +[v0.4.0-rc.1]: https://github.com/sfackler/rust-postgres/compare/tokio-postgres-v0.3.0...tokio-postgres-v0.4.0-rc.1 +[release tags]: https://github.com/sfackler/rust-postgres/releases diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml index b9318a1c..1a6d5ef1 100644 --- a/tokio-postgres/Cargo.toml +++ b/tokio-postgres/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "tokio-postgres" -version = "0.3.0" +version = "0.4.0-rc.1" authors = ["Steven Fackler "] edition = "2018" -license = "MIT" -description = "A native PostgreSQL driver using Tokio" +license = "MIT/Apache-2.0" +description = "A native, asynchronous PostgreSQL client" repository = "https://github.com/sfackler/rust-postgres" readme = "../README.md" keywords = ["database", "postgres", "postgresql", "sql", "async"] @@ -14,14 +14,7 @@ categories = ["database"] test = false [package.metadata.docs.rs] -features = [ - "with-bit-vec-0.5", - "with-chrono-0.4", - "with-eui48-0.4", - "with-geo-0.11", - "with-serde_json-1", - "with-uuid-0.7", -] +all-features = true [badges] circle-ci = { repository = "sfackler/rust-postgres" } @@ -30,12 +23,12 @@ circle-ci = { repository = "sfackler/rust-postgres" } default = ["runtime"] runtime = ["tokio-tcp", "tokio-timer", "tokio-uds", "futures-cpupool", "lazy_static"] -"with-bit-vec-0.5" = ["bit-vec-05"] -"with-chrono-0.4" = ["chrono-04"] -"with-eui48-0.4" = ["eui48-04"] -"with-geo-types-0.4" = ["geo-types-04"] +"with-bit-vec-0_5" = ["bit-vec-05"] +"with-chrono-0_4" = ["chrono-04"] +"with-eui48-0_4" = ["eui48-04"] +"with-geo-types-0_4" = ["geo-types-04"] with-serde_json-1 = ["serde-1", "serde_json-1"] -"with-uuid-0.7" = ["uuid-07"] +"with-uuid-0_7" = ["uuid-07"] [dependencies] antidote = "1.0" diff --git a/tokio-postgres/LICENSE-APACHE b/tokio-postgres/LICENSE-APACHE new file mode 100644 index 00000000..16fe87b0 --- /dev/null +++ b/tokio-postgres/LICENSE-APACHE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/tokio-postgres/LICENSE-MIT b/tokio-postgres/LICENSE-MIT new file mode 100644 index 00000000..71803aea --- /dev/null +++ b/tokio-postgres/LICENSE-MIT @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Copyright (c) 2016 Steven Fackler + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/tokio-postgres/src/lib.rs b/tokio-postgres/src/lib.rs index b4dd6244..bb1304c5 100644 --- a/tokio-postgres/src/lib.rs +++ b/tokio-postgres/src/lib.rs @@ -101,6 +101,7 @@ //! The client works with arbitrary `AsyncRead + AsyncWrite` streams. Convenience APIs are provided to handle the //! connection process, but these are gated by the `runtime` Cargo feature, which is enabled by default. If disabled, //! all dependence on the tokio runtime is removed. +#![doc(html_root_url = "https://docs.rs/tokio-postgres/0.4.0-rc.1")] #![warn(rust_2018_idioms, clippy::all, missing_docs)] use bytes::IntoBuf;