Changeset 1664 for trunk/src

Timestamp:

06/29/10 13:11:05 (2 months ago)

Author:

jtv

Message:

Added quote() for binarystring.

Location:

trunk/src

Files:

• connection_base.cxx (modified) (1 diff)
• transaction_base.cxx (modified) (2 diffs)

trunk/src/connection_base.cxx

@@ -1506 +1506 @@
 
 
+string pqxx::connection_base::quote_raw(const unsigned char str[], size_t len)
+{
+  // Since 8.2, postgres prefers E'escape strings' for bytea.
+  const string prefix((server_version() >= 80200) ? "E'" : "'");
+  return prefix + esc_raw(str, len) + "'::bytea";
+}
+
+
+string pqxx::connection_base::quote(const binarystring &b)
+{
+  return quote_raw(b.data(), b.size());
+}
+
+
 pqxx::internal::reactivation_avoidance_exemption::
   reactivation_avoidance_exemption(

trunk/src/transaction_base.cxx

@@ -9 +9 @@
  *   represents a database transaction
  *
- * Copyright (c) 2001-2009, Jeroen T. Vermeulen <jtv@xs4all.nl>
+ * Copyright (c) 2001-2010, Jeroen T. Vermeulen <jtv@xs4all.nl>
  *
  * See COPYING for copyright license.  If you did not receive a file called
@@ -224 +224 @@
 {
   const unsigned char *p = reinterpret_cast<const unsigned char *>(str.c_str());
-  return m_Conn.esc_raw(p, str.size());
+  return conn().esc_raw(p, str.size());
+}
+
+
+string pqxx::transaction_base::quote_raw(const PGSTD::string &str) const
+{
+  const unsigned char *p = reinterpret_cast<const unsigned char *>(str.c_str());
+  return conn().quote_raw(p, str.size());
 }