Connector/ODBC 3.51 commit: r647 - trunk/test

[jwinstead]

Modified:
   trunk/test/my_catalog.c
Log:
Fix my_colpriv test to clean up after itself (left a user behind)


Modified: trunk/test/my_catalog.c
===================================================================
--- trunk/test/my_catalog.c	2007-08-08 20:28:41 UTC (rev 646)
+++ trunk/test/my_catalog.c	2007-08-09 00:10:39 UTC (rev 647)
@@ -222,41 +222,25 @@
 }
 
 
-void my_colpriv_init(SQLHDBC hdbc,SQLHSTMT hstmt)
+DECLARE_TEST(my_colpriv)
 {
-    SQLRETURN rc;
+  ok_sql(hstmt, "DROP TABLE IF EXISTS test_colprev1");
+  ok_sql(hstmt, "DROP TABLE IF EXISTS test_colprev2");
+  ok_sql(hstmt, "DROP TABLE IF EXISTS test_colprev3");
 
-    SQLExecDirect( hstmt, "DROP TABLE test_colprev1",SQL_NTS);
-    SQLExecDirect( hstmt, "DROP TABLE test_colprev2",SQL_NTS);
-    SQLExecDirect( hstmt, "DROP TABLE test_colprev3",SQL_NTS);
+  ok_sql(hstmt, "CREATE TABLE test_colprev1(a INT,b INT,c INT, d INT)");
+  ok_sql(hstmt, "CREATE TABLE test_colprev2(a INT,b INT,c INT, d INT)");
+  ok_sql(hstmt, "CREATE TABLE test_colprev3(a INT,b INT,c INT, d INT)");
 
-    SQLFreeStmt(hstmt, SQL_CLOSE);
+  (void)SQLExecDirect(hstmt, (SQLCHAR *)"DROP USER my_colpriv", SQL_NTS);
 
-    rc = SQLExecDirect(hstmt, "CREATE TABLE test_colprev1(a INT,b INT,c INT, d
INT)",SQL_NTS);
-    mystmt(hstmt,rc);
-    rc = SQLExecDirect(hstmt, "CREATE TABLE test_colprev2(a INT,b INT,c INT, d INT)",  
SQL_NTS);
-    mystmt(hstmt,rc);
+  ok_sql(hstmt, "GRANT SELECT(a,b),INSERT(d),UPDATE(c) ON test_colprev1 TO my_colpriv");
+  ok_sql(hstmt, "GRANT SELECT(c,a),UPDATE(a,b) ON test_colprev3 TO my_colpriv");
 
-    rc = SQLExecDirect(hstmt, "CREATE TABLE test_colprev3(a INT,b INT,c INT, d INT)",  
SQL_NTS);
-    mystmt(hstmt,rc);
+  ok_sql(hstmt, "FLUSH PRIVILEGES");
 
-    SQLFreeStmt(hstmt, SQL_CLOSE);
+  ok_stmt(hstmt, SQLFreeStmt(hstmt, SQL_CLOSE));
 
-    SQLExecDirect(hstmt, "DELETE FROM mysql.columns_priv where
USER='my_colpriv'",SQL_NTS); 
-    rc = SQLExecDirect(hstmt, "GRANT SELECT(a,b),INSERT(d), UPDATE(c) ON test_colprev1 TO
my_colpriv",SQL_NTS);     
-    mystmt(hstmt,rc);
-    rc = SQLExecDirect( hstmt, "GRANT SELECT(c,a),UPDATE(a,b) ON test_colprev3 TO
my_colpriv",  SQL_NTS);     
-    mystmt(hstmt,rc);
-
-    SQLExecDirect(  hstmt, "FLUSH PRIVILEGES",  SQL_NTS);
-    SQLFreeStmt(hstmt, SQL_CLOSE);  
-}
-
-
-DECLARE_TEST(my_colpriv)
-{
-  my_colpriv_init(hdbc, hstmt);
-
   ok_stmt(hstmt, SQLColumnPrivileges(hstmt,
                                      NULL, SQL_NTS, NULL, SQL_NTS,
                                      "test_colprev1", SQL_NTS, NULL, SQL_NTS));
@@ -312,7 +296,10 @@
 
   ok_stmt(hstmt, SQLFreeStmt(hstmt, SQL_CLOSE));
 
+  ok_sql(hstmt, "DROP USER my_colpriv");
+
   ok_sql(hstmt, "DROP TABLE test_colprev1, test_colprev2, test_colprev3");
+
   return OK;
 }