Merge branch 'master' into support-offline-workspaces

Author: jgrund

Cargo.toml

@@ -26,7 +26,7 @@ categories = [ "database", "asynchronous" ]
 authors = [
     "Ryan Leckey <[email protected]>", # [email protected]
     "Austin Bonander <[email protected]>", # [email protected]
-    "Chloe Ross <[email protected]>", # zach@launchbadge.com
+    "Chloe Ross <[email protected]>", # chloe@launchbadge.com
     "Daniel Akhterov <[email protected]>", # [email protected]
 ]
 

README.md

@@ -148,6 +148,8 @@ sqlx = { version = "0.4.0-beta.1", default-features = false, features = [ "runti
 
  * `bigdecimal`: Add support for `NUMERIC` using the `bigdecimal` crate.
 
+ * `decimal`: Add support for `NUMERIC` using the `rust_decimal` crate.
+
  * `ipnetwork`: Add support for `INET` and `CIDR` (in postgres) using the `ipnetwork` crate.
 
  * `json`: Add support for `JSON` and `JSONB` (in postgres) using the `serde_json` crate.

sqlx-core/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 authors = [
     "Ryan Leckey <[email protected]>",
     "Austin Bonander <[email protected]>",
-    "Zachery Gyurkovitz <zgyurkovitz@gmail.com>",
+    "Chloe Ross <orangesnowfox@gmail.com>",
     "Daniel Akhterov <[email protected]>",
 ]
 

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

@@ -74,7 +74,6 @@ impl PgConnection {
 
             if let MessageFormat::ReadyForQuery = message.format {
                 self.handle_ready_for_query(message)?;
-                break;
             }
         }
 

sqlx-core/src/postgres/type_info.rs

@@ -755,6 +755,10 @@ impl TypeInfo for PgTypeInfo {
     fn is_null(&self) -> bool {
         false
     }
+
+    fn is_void(&self) -> bool {
+        matches!(self.0, PgType::Void)
+    }
 }
 
 impl PartialEq<PgCustomType> for PgCustomType {

sqlx-core/src/sqlite/connection/establish.rs

@@ -1,20 +1,21 @@
-use std::io;
-use std::ptr::{null, null_mut};
-
-use libsqlite3_sys::{
-    sqlite3_busy_timeout, sqlite3_extended_result_codes, sqlite3_open_v2, SQLITE_OK,
-    SQLITE_OPEN_CREATE, SQLITE_OPEN_MEMORY, SQLITE_OPEN_NOMUTEX, SQLITE_OPEN_PRIVATECACHE,
-    SQLITE_OPEN_READONLY, SQLITE_OPEN_READWRITE,
-};
-use sqlx_rt::blocking;
-
 use crate::error::Error;
 use crate::sqlite::connection::handle::ConnectionHandle;
 use crate::sqlite::statement::StatementWorker;
 use crate::{
     common::StatementCache,
     sqlite::{SqliteConnectOptions, SqliteConnection, SqliteError},
 };
+use libsqlite3_sys::{
+    sqlite3_busy_timeout, sqlite3_extended_result_codes, sqlite3_open_v2, SQLITE_OK,
+    SQLITE_OPEN_CREATE, SQLITE_OPEN_MEMORY, SQLITE_OPEN_NOMUTEX, SQLITE_OPEN_PRIVATECACHE,
+    SQLITE_OPEN_READONLY, SQLITE_OPEN_READWRITE,
+};
+use sqlx_rt::blocking;
+use std::io;
+use std::{
+    convert::TryFrom,
+    ptr::{null, null_mut},
+};
 
 pub(crate) async fn establish(options: &SqliteConnectOptions) -> Result<SqliteConnection, Error> {
     let mut filename = options
@@ -48,6 +49,8 @@ pub(crate) async fn establish(options: &SqliteConnectOptions) -> Result<SqliteCo
         flags |= SQLITE_OPEN_MEMORY;
     }
 
+    let busy_timeout = options.busy_timeout;
+
     let handle = blocking!({
         let mut handle = null_mut();
 
@@ -85,8 +88,13 @@ pub(crate) async fn establish(options: &SqliteConnectOptions) -> Result<SqliteCo
         // This causes SQLite to automatically sleep in increasing intervals until the time
         // when there is something locked during [sqlite3_step]. This is sync. but we only
         // run [sqlite3_step] in [blocking!] so its okay.
-        // TODO: Allow this timeout to be configured in SqliteOptions
-        status = unsafe { sqlite3_busy_timeout(handle.0.as_ptr(), 5000) };
+        //
+        // We also need to convert the u128 value to i32, checking we're not overflowing.
+        let ms =
+            i32::try_from(busy_timeout.as_millis()).expect("Given busy timeout value is too big.");
+
+        status = unsafe { sqlite3_busy_timeout(handle.0.as_ptr(), ms) };
+
         if status != SQLITE_OK {
             return Err(Error::Database(Box::new(SqliteError::new(handle.as_ptr()))));
         }

sqlx-core/src/sqlite/options/mod.rs

@@ -5,7 +5,7 @@ mod journal_mode;
 mod parse;
 
 pub use journal_mode::SqliteJournalMode;
-use std::borrow::Cow;
+use std::{borrow::Cow, time::Duration};
 
 /// Options and flags which can be used to configure a SQLite connection.
 ///
@@ -49,6 +49,7 @@ pub struct SqliteConnectOptions {
     pub(crate) journal_mode: SqliteJournalMode,
     pub(crate) foreign_keys: bool,
     pub(crate) statement_cache_capacity: usize,
+    pub(crate) busy_timeout: Duration,
 }
 
 impl Default for SqliteConnectOptions {
@@ -67,6 +68,7 @@ impl SqliteConnectOptions {
             foreign_keys: true,
             statement_cache_capacity: 100,
             journal_mode: SqliteJournalMode::Wal,
+            busy_timeout: Duration::from_secs(5),
         }
     }
 
@@ -119,4 +121,13 @@ impl SqliteConnectOptions {
         self.statement_cache_capacity = capacity;
         self
     }
+
+    /// Sets a timeout value to wait when the database is locked, before
+    /// returning a busy timeout error.
+    ///
+    /// The default busy timeout is 5 seconds.
+    pub fn busy_timeout(mut self, timeout: Duration) -> Self {
+        self.busy_timeout = timeout;
+        self
+    }
 }

sqlx-core/src/type_info.rs

@@ -8,4 +8,9 @@ pub trait TypeInfo: Debug + Display + Clone + PartialEq<Self> + Send + Sync {
     /// Common type names are `VARCHAR`, `TEXT`, or `INT`. Type names should be uppercase. They
     /// should be a rough approximation of how they are written in SQL in the given database.
     fn name(&self) -> &str;
+
+    #[doc(hidden)]
+    fn is_void(&self) -> bool {
+        false
+    }
 }

sqlx-macros/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 authors = [
     "Ryan Leckey <[email protected]>", # [email protected]
     "Austin Bonander <[email protected]>", # [email protected]
-    "Zachery Gyurkovitz <zgyurkovitz@gmail.com>", # zach@launchbadge.com
+    "Chloe Ross <orangesnowfox@gmail.com>", # chloe@launchbadge.com
     "Daniel Akhterov <[email protected]>", # [email protected]
 ]
 

sqlx-macros/src/query/mod.rs

@@ -10,7 +10,7 @@ pub use input::QueryMacroInput;
 use quote::{format_ident, quote};
 use sqlx_core::connection::Connection;
 use sqlx_core::database::Database;
-use sqlx_core::describe::Describe;
+use sqlx_core::{column::Column, describe::Describe, type_info::TypeInfo};
 use sqlx_rt::block_on;
 
 use crate::database::DatabaseExt;
@@ -221,7 +221,12 @@ where
 
     let query_args = format_ident!("query_args");
 
-    let output = if data.describe.columns().is_empty() {
+    let output = if data
+        .describe
+        .columns()
+        .iter()
+        .all(|it| it.type_info().is_void())
+    {
         let db_path = DB::db_path();
         let sql = &input.src;