Addition to statement and PS getWarnings tests to co,pliment patch in the rev#916.1.2("...This patch makes statements read their warning count and return warnings only if the count >0)

лаврин · лаврин · commit e330c14363aa · 2012-06-04T14:51:01.000+03:00
diff --git a/test/unit/classes/preparedstatement.cpp b/test/unit/classes/preparedstatement.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -1292,10 +1292,15 @@ void preparedstatement::getWarnings()
     stmt->execute("DROP TABLE IF EXISTS test");
     stmt->execute("CREATE TABLE test(id INT UNSIGNED)");
 
+	// Generating 2  warnings to make sure we get only the last 1 - won't hurt
     // Lets hope that this will always cause a 1264 or similar warning
-    pstmt.reset(con->prepareStatement("INSERT INTO test(id) VALUES (-1)"));
+    pstmt.reset(con->prepareStatement("INSERT INTO test(id) VALUES (?)"));
+	pstmt->setInt(1, -2);
     pstmt->executeUpdate();
+	pstmt->setInt(1, -1);
+	pstmt->executeUpdate();
 
+	int count= 0;
     for (const sql::SQLWarning* warn=pstmt->getWarnings(); warn; warn=warn->getNextWarning())
     {
       msg.str("");
@@ -1314,8 +1319,12 @@ void preparedstatement::getWarnings()
         ASSERT(("" != warn->getSQLState()));
       }
       ASSERT(("" != warn->getMessage()));
+
+	  ++count;
     }
 
+	ASSERT_EQUALS(1, count);
+
     for (const sql::SQLWarning* warn=pstmt->getWarnings(); warn; warn=warn->getNextWarning())
     {
       msg.str("");
@@ -1342,6 +1351,15 @@ void preparedstatement::getWarnings()
       FAIL("There should be no more warnings!");
     }
 
+	pstmt->setInt(1, -3);
+	pstmt->executeUpdate();
+	ASSERT(pstmt->getWarnings() != NULL);
+	// Statement without tables access does not reset warnings.
+	pstmt.reset(con->prepareStatement("SELECT 1"));
+    res.reset(pstmt->executeQuery());
+	ASSERT(pstmt->getWarnings() == NULL);
+    ASSERT(res->next());
+
     // TODO - how to use getNextWarning() ?
     stmt->execute("DROP TABLE IF EXISTS test");
   }
diff --git a/test/unit/classes/statement.cpp b/test/unit/classes/statement.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -63,18 +63,22 @@ void statement::getWarnings()
 {
   logMsg("statement::getWarnings() - MySQL_Statement::get|clearWarnings()");
   std::stringstream msg;
+  unsigned int count= 0;
 
   stmt.reset(con->createStatement());
   try
   {
     stmt->execute("DROP TABLE IF EXISTS test");
     stmt->execute("CREATE TABLE test(id INT UNSIGNED)");
 
+	// Generating 2  warnings to make sure we get only the last 1 - won't hurt
+	stmt->execute("INSERT INTO test(id) VALUES (-2)");
     // Lets hope that this will always cause a 1264 or similar warning
     stmt->execute("INSERT INTO test(id) VALUES (-1)");
 
     for (const sql::SQLWarning* warn=stmt->getWarnings(); warn; warn=warn->getNextWarning())
     {
+		++count;
       msg.str("");
       msg << "... ErrorCode = '" << warn->getErrorCode() << "', ";
       msg << "SQLState = '" << warn->getSQLState() << "', ";
@@ -93,6 +97,8 @@ void statement::getWarnings()
       ASSERT(("" != warn->getMessage()));
     }
 
+	ASSERT_EQUALS(1, count);
+
     for (const sql::SQLWarning* warn=stmt->getWarnings(); warn; warn=warn->getNextWarning())
     {
       msg.str("");
@@ -119,6 +125,17 @@ void statement::getWarnings()
       FAIL("There should be no more warnings!");
     }
 
+	// New warning
+	stmt->execute("INSERT INTO test(id) VALUES (-3)");
+	// Verifying we have warnings now
+	ASSERT(stmt->getWarnings() != NULL);
+
+    // Statement without tables access does not reset warnings.
+	stmt->execute("SELECT 1");
+	ASSERT(stmt->getWarnings() == NULL);
+	res.reset(stmt->getResultSet());
+	res->next();
+
     // TODO - how to use getNextWarning() ?
     stmt->execute("DROP TABLE IF EXISTS test");
   }
