dnim/rust-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make statement IDs globally unique

Browse Source 
This avoids weird behavior when using a statement with the wrong
connection
This commit is contained in:
Steven Fackler 2017-01-07 14:36:40 -08:00
parent de46ba2176
commit b673d8a727
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tokio-postgres/src/lib.rs
View File

@ -78,6 +78,7 @@ use std::collections::HashMap;
use std::fmt;
use std::io;
use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering};
use std::sync::mpsc::{self, Sender, Receiver};
use tokio_core::reactor::Handle;
@ -109,6 +110,8 @@ const TYPEINFO_QUERY: &'static str = "__typeinfo";
const TYPEINFO_ENUM_QUERY: &'static str = "__typeinfo_enum";
const TYPEINFO_COMPOSITE_QUERY: &'static str = "__typeinfo_composite";
static NEXT_STMT_ID: AtomicUsize = ATOMIC_USIZE_INIT;
/// Specifies the TLS support required for a new connection.
pub enum TlsMode {
/// The connection must use TLS.
@ -163,7 +166,6 @@ struct InnerConnection {
parameters: HashMap<String, String>,
types: HashMap<Oid, Other>,
cancel_data: CancelData,
next_stmt_id: u32,
has_typeinfo_query: bool,
has_typeinfo_enum_query: bool,
has_typeinfo_composite_query: bool,
@ -283,7 +285,6 @@ impl Connection {
process_id: 0,
secret_key: 0,
},
next_stmt_id: 0,
has_typeinfo_query: false,
has_typeinfo_enum_query: false,
has_typeinfo_composite_query: false,
@ -969,9 +970,8 @@ impl Connection {
}
/// Creates a new prepared statement.
pub fn prepare(mut self, query: &str) -> BoxFuture<(Statement, Connection), Error> {
let id = self.0.next_stmt_id;
self.0.next_stmt_id += 1;
pub fn prepare(self, query: &str) -> BoxFuture<(Statement, Connection), Error> {
let id = NEXT_STMT_ID.fetch_add(1, Ordering::SeqCst);
let name = format!("s{}", id);
self.raw_prepare(&name, query)
.map(|(params, columns, conn)| {