Release/0.7.0 alpha.2

Cargo.toml

@@ -23,7 +23,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.7.0-alpha.1"
+version = "0.7.0-alpha.2"
 license = "MIT OR Apache-2.0"
 edition = "2021"
 repository = "https://github.com/launchbadge/sqlx"
@@ -114,17 +114,17 @@ regexp = ["sqlx-sqlite?/regexp"]
 
 [workspace.dependencies]
 # Core Crates
-sqlx-core = { version = "=0.7.0-alpha.1", path = "sqlx-core" }
-sqlx-macros-core = { version = "=0.7.0-alpha.1", path = "sqlx-macros-core" }
-sqlx-macros = { version = "=0.7.0-alpha.1", path = "sqlx-macros" }
+sqlx-core = { version = "=0.7.0-alpha.2", path = "sqlx-core" }
+sqlx-macros-core = { version = "=0.7.0-alpha.2", path = "sqlx-macros-core" }
+sqlx-macros = { version = "=0.7.0-alpha.2", path = "sqlx-macros" }
 
 # Driver crates
-sqlx-mysql = { version = "=0.7.0-alpha.1", path = "sqlx-mysql" }
-sqlx-postgres = { version = "=0.7.0-alpha.1", path = "sqlx-postgres" }
-sqlx-sqlite = { version = "=0.7.0-alpha.1", path = "sqlx-sqlite" }
+sqlx-mysql = { version = "=0.7.0-alpha.2", path = "sqlx-mysql" }
+sqlx-postgres = { version = "=0.7.0-alpha.2", path = "sqlx-postgres" }
+sqlx-sqlite = { version = "=0.7.0-alpha.2", path = "sqlx-sqlite" }
 
 # Facade crate (for reference from sqlx-cli)
-sqlx = { version = "=0.7.0-alpha.1", path = "." }
+sqlx = { version = "=0.7.0-alpha.2", path = "." }
 
 # Common type integrations shared by multiple driver crates.
 # These are optional unless enabled in a workspace crate.
@@ -150,8 +150,8 @@ features = ["time", "net", "sync", "fs", "io-util", "rt"]
 default-features = false
 
 [dependencies]
-sqlx-core = { version = "=0.7.0-alpha.1", path = "sqlx-core", features = ["offline", "migrate"], default-features = false }
-sqlx-macros = { version = "=0.7.0-alpha.1", path = "sqlx-macros", default-features = false, optional = true }
+sqlx-core = { workspace = true, features = ["offline", "migrate"], default-features = false }
+sqlx-macros = { workspace = true, default-features = false, optional = true }
 
 sqlx-mysql = { workspace = true, optional = true }
 sqlx-postgres = { workspace = true, optional = true }

README.md

@@ -117,6 +117,9 @@ with C, those interactions are `unsafe`.
 
 SQLx is compatible with the [`async-std`], [`tokio`] and [`actix`] runtimes; and, the [`native-tls`] and [`rustls`] TLS backends. When adding the dependency, you must chose a runtime feature that is `runtime` + `tls`.
 
+NOTE: these examples are for the coming 0.7 release, which is currently in an alpha cycle.
+For the last stable release, 0.6.2, see [the previous verison of this document](https://github.com/launchbadge/sqlx/blob/v0.6.2/README.md).
+
 [`async-std`]: https://github.com/async-rs/async-std
 [`tokio`]: https://github.com/tokio-rs/tokio
 [`actix`]: https://github.com/actix/actix-net
@@ -129,18 +132,18 @@ SQLx is compatible with the [`async-std`], [`tokio`] and [`actix`] runtimes; and
 # PICK ONE OF THE FOLLOWING:
 
 # tokio (no TLS)
-sqlx = { version = "0.6", features = [ "runtime-tokio" ] }
+sqlx = { version = "0.7", features = [ "runtime-tokio" ] }
 # tokio + native-tls
-sqlx = { version = "0.6", features = [ "runtime-tokio", "tls-native" ] }
+sqlx = { version = "0.7", features = [ "runtime-tokio", "tls-native" ] }
 # tokio + rustls
-sqlx = { version = "0.6", features = [ "runtime-tokio", "tls-rustls" ] }
+sqlx = { version = "0.7", features = [ "runtime-tokio", "tls-rustls" ] }
 
 # async-std (no TLS)
-sqlx = { version = "0.6", features = [ "runtime-async-std" ] }
+sqlx = { version = "0.7", features = [ "runtime-async-std" ] }
 # async-std + native-tls
-sqlx = { version = "0.6", features = [ "runtime-async-std", "tls-native" ] }
+sqlx = { version = "0.7", features = [ "runtime-async-std", "tls-native" ] }
 # async-std + rustls
-sqlx = { version = "0.6", features = [ "runtime-async-std", "tls-rustls" ] }
+sqlx = { version = "0.7", features = [ "runtime-async-std", "tls-rustls" ] }
 ```
 
 #### Cargo Feature Flags
@@ -153,25 +156,17 @@ be removed in the future.
 
 -   `runtime-async-std`: Use the `async-std` runtime without enabling a TLS backend.
 
--   `runtime-async-std-native-tls`: Use the `async-std` runtime and `native-tls` TLS backend.
+-   `runtime-async-std-native-tls`: Use the `async-std` runtime and `native-tls` TLS backend (SOFT-DEPRECATED).
 
--   `runtime-async-std-rustls`: Use the `async-std` runtime and `rustls` TLS backend.
+-   `runtime-async-std-rustls`: Use the `async-std` runtime and `rustls` TLS backend (SOFT-DEPRECATED).
 
 -   `runtime-tokio`: Use the `tokio` runtime without enabling a TLS backend.
 
--   `runtime-tokio-native-tls`: Use the `tokio` runtime and `native-tls` TLS backend.
-
--   `runtime-tokio-rustls`: Use the `tokio` runtime and `rustls` TLS backend.
-
--   `runtime-actix`: Use the `actix` runtime without enabling a TLS backend.
-
--   `runtime-actix-native-tls`: Use the `actix` runtime and `native-tls` TLS backend.
+-   `runtime-tokio-native-tls`: Use the `tokio` runtime and `native-tls` TLS backend (SOFT-DEPRECATED).
 
--   `runtime-actix-rustls`: Use the `actix` runtime and `rustls` TLS backend.
+-   `runtime-tokio-rustls`: Use the `tokio` runtime and `rustls` TLS backend (SOFT-DEPRECATED).
 
     - Actix-web is fully compatible with Tokio and so a separate runtime feature is no longer needed.
-      The above three features exist only for backwards compatibility, and are in fact merely aliases to their 
-      `runtime-tokio` counterparts.
 
 -   `tls-native`: Use the `native-tls` TLS backend (OpenSSL on *nix, SChannel on Windows, Secure Transport on macOS).
 
@@ -199,8 +194,6 @@ be removed in the future.
 
 -   `bstr`: Add support for `bstr::BString`.
 
--   `git2`: Add support for `git2::Oid`.
-
 -   `bigdecimal`: Add support for `NUMERIC` using the `bigdecimal` crate.
 
 -   `decimal`: Add support for `NUMERIC` using the `rust_decimal` crate.
@@ -209,8 +202,7 @@ be removed in the future.
 
 -   `json`: Add support for `JSON` and `JSONB` (in postgres) using the `serde_json` crate.
 
--   `offline`: Enables building the macros in offline mode when a live database is not available (such as CI). 
-    -   Requires `sqlx-cli` installed to use. See [sqlx-cli/README.md][readme-offline].
+-   Offline mode is now always enabled. See [sqlx-cli/README.md][readme-offline].
 
 [readme-offline]: sqlx-cli/README.md#enable-building-in-offline-mode-with-query
 
@@ -238,21 +230,8 @@ See the `examples/` folder for more in-depth usage.
 
 ### Quickstart
 
-```toml
-[dependencies]
-# PICK ONE:
-# Async-std:
-sqlx = { version = "0.6", features = [  "runtime-async-std-native-tls", "postgres" ] }
-async-std = { version = "1", features = [ "attributes" ] }
-
-# Tokio:
-sqlx = { version = "0.6", features = [ "runtime-tokio-native-tls" , "postgres" ] }
-tokio = { version = "1", features = ["full"] }
-
-# Actix-web:
-sqlx = { version = "0.6", features = [ "runtime-actix-native-tls" , "postgres" ] }
-actix-web = "4"
-```
+NOTE: these examples are for the coming 0.7.0 release, which is currently in an alpha cycle.
+For the last stable release, 0.6.2, see [the previous verison of this document](https://github.com/launchbadge/sqlx/blob/v0.6.2/README.md).
 
 ```rust
 use sqlx::postgres::PgPoolOptions;

sqlx-core/src/any/connection/executor.rs

@@ -1,7 +1,4 @@
-use crate::any::{
-    Any, AnyColumn, AnyConnection, AnyQueryResult, AnyRow, AnyStatement, AnyTypeInfo,
-};
-use crate::database::Database;
+use crate::any::{Any, AnyConnection, AnyQueryResult, AnyRow, AnyStatement, AnyTypeInfo};
 use crate::describe::Describe;
 use crate::error::Error;
 use crate::executor::{Execute, Executor};
@@ -57,23 +54,3 @@ impl<'c> Executor<'c> for &'c mut AnyConnection {
         self.backend.describe(sql)
     }
 }
-
-fn map_describe<DB: Database>(info: Describe<DB>) -> Describe<Any>
-where
-    AnyTypeInfo: From<DB::TypeInfo>,
-    AnyColumn: From<DB::Column>,
-{
-    let parameters = match info.parameters {
-        None => None,
-        Some(Either::Right(num)) => Some(Either::Right(num)),
-        Some(Either::Left(params)) => {
-            Some(Either::Left(params.into_iter().map(Into::into).collect()))
-        }
-    };
-
-    Describe {
-        parameters,
-        nullable: info.nullable,
-        columns: info.columns.into_iter().map(Into::into).collect(),
-    }
-}

sqlx-core/src/any/connection/mod.rs

@@ -10,7 +10,6 @@ pub use backend::AnyConnectionBackend;
 use crate::transaction::Transaction;
 
 mod backend;
-mod establish;
 mod executor;
 
 /// A connection to _any_ SQLx database.
@@ -33,7 +32,14 @@ impl AnyConnection {
         self.backend.name()
     }
 
-    pub(crate) fn connect<DB: Database>(
+    pub(crate) fn connect(options: &AnyConnectOptions) -> BoxFuture<'_, crate::Result<Self>> {
+        Box::pin(async {
+            let driver = crate::any::driver::from_url(&options.database_url)?;
+            (driver.connect)(options).await
+        })
+    }
+
+    pub(crate) fn connect_with_db<DB: Database>(
         options: &AnyConnectOptions,
     ) -> BoxFuture<'_, crate::Result<Self>>
     where

sqlx-core/src/any/driver.rs

@@ -1,21 +1,12 @@
 use crate::any::connection::AnyConnectionBackend;
-use crate::any::{
-    Any, AnyArguments, AnyConnectOptions, AnyConnection, AnyQueryResult, AnyRow, AnyStatement,
-    AnyTypeInfo,
-};
+use crate::any::{AnyConnectOptions, AnyConnection};
 use crate::common::DebugFn;
 use crate::connection::Connection;
 use crate::database::Database;
-use crate::describe::Describe;
-use crate::error::BoxDynError;
-use crate::transaction::Transaction;
 use crate::Error;
-use either::Either;
 use futures_core::future::BoxFuture;
-use futures_core::stream::BoxStream;
 use once_cell::sync::OnceCell;
 use std::fmt::{Debug, Formatter};
-use std::marker::PhantomData;
 use url::Url;
 
 static DRIVERS: OnceCell<&'static [AnyDriver]> = OnceCell::new();
@@ -52,7 +43,7 @@ impl AnyDriver {
         Self {
             name: DB::NAME,
             url_schemes: DB::URL_SCHEMES,
-            connect: DebugFn(AnyConnection::connect::<DB>),
+            connect: DebugFn(AnyConnection::connect_with_db::<DB>),
             migrate_database: None,
         }
     }

sqlx-core/src/any/migrate.rs

@@ -1,10 +1,8 @@
 use crate::any::driver;
-use crate::any::kind::AnyKind;
 use crate::any::{Any, AnyConnection};
 use crate::error::Error;
 use crate::migrate::{AppliedMigration, Migrate, MigrateDatabase, MigrateError, Migration};
 use futures_core::future::BoxFuture;
-use std::str::FromStr;
 use std::time::Duration;
 
 impl MigrateDatabase for Any {

sqlx-core/src/any/mod.rs

@@ -69,8 +69,7 @@ where
 {
     fn encode_by_ref(&self, buf: &mut AnyArgumentBuffer<'q>) -> crate::encode::IsNull {
         if let Some(value) = self {
-            value.encode_by_ref(buf);
-            crate::encode::IsNull::No
+            value.encode_by_ref(buf)
         } else {
             buf.0.push(AnyValueKind::Null);
             crate::encode::IsNull::Yes

sqlx-core/src/any/options.rs

@@ -45,7 +45,7 @@ impl ConnectOptions for AnyConnectOptions {
 
     #[inline]
     fn connect(&self) -> BoxFuture<'_, Result<AnyConnection, Error>> {
-        Box::pin(AnyConnection::establish(self))
+        AnyConnection::connect(self)
     }
 
     fn log_statements(mut self, level: LevelFilter) -> Self {

sqlx-core/src/any/value.rs

@@ -1,14 +1,8 @@
 use std::borrow::Cow;
-use std::marker::PhantomData;
-use std::num::TryFromIntError;
 
-use crate::any::error::mismatched_types;
 use crate::any::{Any, AnyTypeInfo, AnyTypeInfoKind};
 use crate::database::{Database, HasValueRef};
-use crate::decode::Decode;
-use crate::error::{BoxDynError, Error};
-use crate::io::Encode;
-use crate::type_info::TypeInfo;
+use crate::error::BoxDynError;
 use crate::types::Type;
 use crate::value::{Value, ValueRef};
 

sqlx-core/src/net/tls/mod.rs

@@ -77,7 +77,7 @@ where
     #[cfg(feature = "_tls-native-tls")]
     return Ok(with_socket.with_socket(tls_native_tls::handshake(socket, config).await?));
 
-    #[cfg(feature = "_tls-rustls")]
+    #[cfg(all(feature = "_tls-rustls", not(feature = "_tls-native-tls")))]
     return Ok(with_socket.with_socket(tls_rustls::handshake(socket, config).await?));
 
     #[cfg(not(any(feature = "_tls-native-tls", feature = "_tls-rustls")))]

sqlx-core/src/net/tls/tls_rustls.rs

@@ -1,5 +1,4 @@
 use futures_util::future;
-use rustls::{Certificate, PrivateKey};
 use std::io::{self, BufReader, Cursor, Read, Write};
 use std::sync::Arc;
 use std::task::{Context, Poll};
@@ -13,7 +12,7 @@ use rustls::{
 use crate::error::Error;
 use crate::io::ReadBuf;
 use crate::net::tls::util::StdSocket;
-use crate::net::tls::{CertificateInput, TlsConfig};
+use crate::net::tls::TlsConfig;
 use crate::net::Socket;
 
 pub struct RustlsSocket<S: Socket> {