Changeset 1388

Timestamp:

08/28/08 07:21:35 (4 months ago)

Author:

jtv

Message:

Ensure transaction is open before executing prepared statement, thanks qelo. Fixes #159.

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/include/pqxx/connection_base.hxx (modified) (2 diffs)
• trunk/include/pqxx/transaction_base.hxx (modified) (2 diffs)
• trunk/src/transaction_base.cxx (modified) (3 diffs)
• trunk/test/unit/test_prepared_statement.cxx (moved) (moved from trunk/test/test085.cxx) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2008-08-28  Jeroen T. Vermeulen <jtv@xs4all.nl>
+ include/pqxx/connection_base.hxx, test/test085.cxx,
+ test/unit/test_prepared_statement.cxx:
+  - Re-branded test085 as a unit test
+ include/pqxx/transaction_base.hxx, sr/transaction_base.cxx:
+  - New function activate() for explicit bracketing
+  - Activate before executing prepared statement, thanks qelo
-2008-08-27  Jeroen T. Vermeulen <jtv@xs4all.nl>
- include/pqxx/compiler-public.hxx:

trunk/include/pqxx/connection_base.hxx

@@ -608 +608 @@
-   */
-  prepare::declaration prepare(const PGSTD::string &name,
-                              //[t85]
+
-
-  /// Drop prepared statement
-                           //[t85]
+
-
-  /// Request that prepared statement be registered with the server
@@ -624 +624 @@
-   * whether to register prepared statements that you've defined.
-   */
-                         //[t85]
+
-
-  /**

trunk/include/pqxx/transaction_base.hxx

@@ -223 +223 @@
-   * ongoing transaction in the process.
-   */
-                //[t85]
+
-
-  //@}
@@ -338 +338 @@
-  };
-
+  /// Make sure transaction is opened on backend, if appropriate
+  void PQXX_PRIVATE activate();
-
-  void PQXX_PRIVATE CheckPendingError();

trunk/src/transaction_base.cxx

@@ -198 +198 @@
-
-
+void pqxx::transaction_base::activate()
+{
+  switch (m_Status)
+  {
+  case st_nascent:
+    // Make sure transaction has begun before executing anything
+    Begin();
+    break;
+
+  case st_active:
+    break;
+
+  case st_committed:
+  case st_aborted:
+  case st_in_doubt:
+    throw usage_error(
+        "Attempt to activate " + description() + " "
+        "which is already closed");
+
+  default:
+    throw internal_error("pqxx::transaction: invalid status code");
+  }
+}
+
+
-pqxx::result pqxx::transaction_base::exec(const PGSTD::string &Query,
-                                          const PGSTD::string &Desc)
@@ -211 +236 @@
-                      "still open");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-  }
-
@@ -239 +253 @@
-pqxx::transaction_base::prepared(const PGSTD::string &statement)
-{
+  try
+  {
+    activate();
+  }
+  catch (const usage_error &e)
+  {
+    throw usage_error(
+        "Error executing prepared statement " + statement + ".  " + e.what());
+  }
-  return prepare::invocation(*this, statement);
-}

trunk/test/unit/test_prepared_statement.cxx

@@ -78 +78 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  try
-  {
-    /* A bit of nastiness in prepared statements: on 7.3.x backends we can't
-     * compare pg_tables.tablename to a string.  We work around this by using
-     * the LIKE operator.
-     *
-     * Later backend versions do not suffer from this problem.
-     */
-    const string
-          Q_readpgtables = "SELECT * FROM pg_tables",
-          Q_seetable = Q_readpgtables + " WHERE tablename LIKE $1",
-          Q_seetables = Q_seetable + " OR tablename LIKE $2";
-
-    cout << "Preparing a simple statement..." << endl;
-    C.prepare("ReadPGTables", Q_readpgtables);
@@ -102 +102 @@
-        T.exec(Q_readpgtables),
-        "ReadPGTables");
-
-    // Try prepare_now() on an already prepared statement
-    C.prepare_now("ReadPGTables");
-
-    // Pro forma check: same thing but with name passed as C-style string
-    COMPARE_RESULTS("ReadPGTables_char",
-        T.prepared("ReadPGTables").exec(),
-        T.exec(Q_readpgtables));
-
-    cout << "Dropping prepared statement..." << endl;
-    C.unprepare("ReadPGTables");
-
-    PQXX_CHECK_THROWS(
-        C.prepare_now("ReadPGTables"),
-        exception,
-        "prepare_now() succeeded on dropped statement.");
-
-    // Just to try and confuse things, "unprepare" twice
-    cout << "Testing error detection and handling..." << endl;
-    try { C.unprepare("ReadPGTables"); }
-    catch (const exception &e) { cout << "(Expected) " << e.what() << endl; }
-
-    // Verify that attempt to execute unprepared statement fails
-    PQXX_CHECK_THROWS(
-        T.prepared("ReadPGTables").exec(),
-        exception,
-        "Execute unprepared statement didn't fail.");
-
-    // Re-prepare the same statement and test again
-    C.prepare("ReadPGTables", Q_readpgtables);
-    C.prepare_now("ReadPGTables");
-    COMPARE_RESULTS("ReadPGTables_2",
-        T.prepared("ReadPGTables").exec(),
-        T.exec(Q_readpgtables));
-
-    // Double preparation of identical statement should be ignored...
-    C.prepare("ReadPGTables", Q_readpgtables);
-    COMPARE_RESULTS("ReadPGTables_double",
-        T.prepared("ReadPGTables").exec(),
-        T.exec(Q_readpgtables));
-
-    // ...But a modified definition shouldn't
-    PQXX_CHECK_THROWS(
-        C.prepare("ReadPGTables", Q_readpgtables + " ORDER BY tablename"),
-        exception,
-        "Bad redefinition of statement went unnoticed.");
-
-    cout << "Testing prepared statement with parameter..." << endl;
-
-    C.prepare("SeeTable", Q_seetable)("varchar", pqxx::prepare::treat_string);
-
-    vector<string> args;
-    args.push_back("pg_type");
-    COMPARE_RESULTS("SeeTable_seq",
-        T.prepared("SeeTable")(args[0]).exec(),
-        T.exec(subst(T,Q_seetable,args)));
-
-    cout << "Testing prepared statement with 2 parameters..." << endl;
-
-    C.prepare("SeeTables", Q_seetables)
-      ("varchar",pqxx::prepare::treat_string)
-      ("varchar",pqxx::prepare::treat_string);
-    args.push_back("pg_index");
-    COMPARE_RESULTS("SeeTables_seq",
-      T.prepared("SeeTables")(args[0])(args[1]).exec(),
-      T.exec(subst(T,Q_seetables,args)));
-
-    cout << "Testing prepared statement with a null parameter..." << endl;
-    vector<const char *> ptrs;
-    ptrs.push_back(0);
-    ptrs.push_back("pg_index");
-    COMPARE_RESULTS("SeeTables_null1",
-        T.prepared("SeeTables")(ptrs[0])(ptrs[1]).exec(),
-        T.exec(subst(T,Q_seetables,ptrs)));
-    COMPARE_RESULTS("SeeTables_null2",
-        T.prepared("SeeTables")(ptrs[0])(ptrs[1]).exec(),
-        T.prepared("SeeTables")()(ptrs[1]).exec());
-    COMPARE_RESULTS("SeeTables_null3",
-        T.prepared("SeeTables")(ptrs[0])(ptrs[1]).exec(),
-        T.prepared("SeeTables")("somestring",false)(ptrs[1]).exec());
-    COMPARE_RESULTS("SeeTables_null4",
-        T.prepared("SeeTables")(ptrs[0])(ptrs[1]).exec(),
-        T.prepared("SeeTables")(42,false)(ptrs[1]).exec());
-    COMPARE_RESULTS("SeeTables_null5",
-        T.prepared("SeeTables")(ptrs[0])(ptrs[1]).exec(),
-        T.prepared("SeeTables")(0,false)(ptrs[1]).exec());
-
-    cout << "Testing wrong numbers of parameters..." << endl;
-    PQXX_CHECK_THROWS(
-        T.prepared("SeeTables")()()("hi mom!").exec(),
-        exception,
-        "No error for too many parameters.");
-
-    PQXX_CHECK_THROWS(
-        T.prepared("SeeTables")("who, me?").exec(),
-        exception,
-        "No error for too few parameters.");
-  }
-  catch (const feature_not_supported &e)
@@ -204 +107 @@
-    cout << "Backend version does not support prepared statements.  Skipping."
-         << endl;
+    return;
-  }
+
+  // Try prepare_now() on an already prepared statement
+  C.prepare_now("ReadPGTables");
+
+  // Pro forma check: same thing but with name passed as C-style string
+  COMPARE_RESULTS("ReadPGTables_char",
+        T.prepared("ReadPGTables").exec(),
+        T.exec(Q_readpgtables));
+
+  cout << "Dropping prepared statement..." << endl;
+  C.unprepare("ReadPGTables");
+
+  PQXX_CHECK_THROWS(
+        C.prepare_now("ReadPGTables"),
+        exception,
+        "prepare_now() succeeded on dropped statement.");
+
+  // Just to try and confuse things, "unprepare" twice
+  cout << "Testing error detection and handling..." << endl;
+  try { C.unprepare("ReadPGTables"); }
+  catch (const exception &e) { cout << "(Expected) " << e.what() << endl; }
+
+  // Verify that attempt to execute unprepared statement fails
+  PQXX_CHECK_THROWS(
+        T.prepared("ReadPGTables").exec(),
+        exception,
+        "Execute unprepared statement didn't fail.");
+
+  // Re-prepare the same statement and test again
+  C.prepare("ReadPGTables", Q_readpgtables);
+  C.prepare_now("ReadPGTables");
+  COMPARE_RESULTS("ReadPGTables_2",
+        T.prepared("ReadPGTables").exec(),
+        T.exec(Q_readpgtables));
+
+  // Double preparation of identical statement should be ignored...
+  C.prepare("ReadPGTables", Q_readpgtables);
+  COMPARE_RESULTS("ReadPGTables_double",
+        T.prepared("ReadPGTables").exec(),
+        T.exec(Q_readpgtables));
+
+  // ...But a modified definition shouldn't
+  PQXX_CHECK_THROWS(
+        C.prepare("ReadPGTables", Q_readpgtables + " ORDER BY tablename"),
+        exception,
+        "Bad redefinition of statement went unnoticed.");
+
+  cout << "Testing prepared statement with parameter..." << endl;
+
+  C.prepare("SeeTable", Q_seetable)("varchar", pqxx::prepare::treat_string);
+
+  vector<string> args;
+  args.push_back("pg_type");
+  COMPARE_RESULTS("SeeTable_seq",
+        T.prepared("SeeTable")(args[0]).exec(),
+        T.exec(subst(T,Q_seetable,args)));
+
+  cout << "Testing prepared statement with 2 parameters..." << endl;
+
+  C.prepare("SeeTables", Q_seetables)
+      ("varchar",pqxx::prepare::treat_string)
+      ("varchar",pqxx::prepare::treat_string);
+  args.push_back("pg_index");
+  COMPARE_RESULTS("SeeTables_seq",
+      T.prepared("SeeTables")(args[0])(args[1]).exec(),
+      T.exec(subst(T,Q_seetables,args)));
+
+  cout << "Testing prepared statement with a null parameter..." << endl;
+  vector<const char *> ptrs;
+  ptrs.push_back(0);
+  ptrs.push_back("pg_index");
+  COMPARE_RESULTS("SeeTables_null1",
+        T.prepared("SeeTables")(ptrs[0])(ptrs[1]).exec(),
+        T.exec(subst(T,Q_seetables,ptrs)));
+  COMPARE_RESULTS("SeeTables_null2",
+        T.prepared("SeeTables")(ptrs[0])(ptrs[1]).exec(),
+        T.prepared("SeeTables")()(ptrs[1]).exec());
+  COMPARE_RESULTS("SeeTables_null3",
+        T.prepared("SeeTables")(ptrs[0])(ptrs[1]).exec(),
+        T.prepared("SeeTables")("somestring",false)(ptrs[1]).exec());
+  COMPARE_RESULTS("SeeTables_null4",
+        T.prepared("SeeTables")(ptrs[0])(ptrs[1]).exec(),
+        T.prepared("SeeTables")(42,false)(ptrs[1]).exec());
+  COMPARE_RESULTS("SeeTables_null5",
+        T.prepared("SeeTables")(ptrs[0])(ptrs[1]).exec(),
+        T.prepared("SeeTables")(0,false)(ptrs[1]).exec());
+
+  cout << "Testing wrong numbers of parameters..." << endl;
+  PQXX_CHECK_THROWS(
+        T.prepared("SeeTables")()()("hi mom!").exec(),
+        exception,
+        "No error for too many parameters.");
+
+  PQXX_CHECK_THROWS(
+        T.prepared("SeeTables")("who, me?").exec(),
+        exception,
+        "No error for too few parameters.");
-}
-} // namespace
-
-085
+prepared_statement