Revision
15552
Author
mikej
Date
2009-11-19 11:49:43 -0600 (Thu, 19 Nov 2009)

Log Message

create tables before we test against them

Modified Paths

Diff

Modified: freeswitch/trunk/src/switch_core_sqldb.c (15551 => 15552)


--- freeswitch/trunk/src/switch_core_sqldb.c	2009-11-19 16:56:19 UTC (rev 15551)
+++ freeswitch/trunk/src/switch_core_sqldb.c	2009-11-19 17:49:43 UTC (rev 15552)
@@ -953,6 +953,18 @@
 	switch_cache_db_test_reactive(dbh, "select hostname from aliases", "DROP TABLE aliases", create_alias_sql);
 	switch_cache_db_test_reactive(dbh, "select hostname from nat", "DROP TABLE nat", create_nat_sql);
 
+	if (dbh->db) {
+		switch_cache_db_execute_sql(dbh, create_channels_sql, NULL);
+		switch_cache_db_execute_sql(dbh, create_calls_sql, NULL);
+		switch_cache_db_execute_sql(dbh, create_interfaces_sql, NULL);
+		switch_cache_db_execute_sql(dbh, create_tasks_sql, NULL);
+	} else {
+		switch_cache_db_test_reactive(dbh, "select hostname from channels", "DROP TABLE channels", create_channels_sql);
+		switch_cache_db_test_reactive(dbh, "select hostname from calls", "DROP TABLE calls", create_calls_sql);
+		switch_cache_db_test_reactive(dbh, "select hostname from interfaces", "DROP TABLE interfaces", create_interfaces_sql);
+		switch_cache_db_test_reactive(dbh, "select hostname from tasks", "DROP TABLE tasks", create_tasks_sql);
+		
+	}
 
 	if (dbh->odbc_dbh) {
 		char *err;
@@ -970,20 +982,6 @@
 		}
 	}
 
-
-	if (dbh->db) {
-		switch_cache_db_execute_sql(dbh, create_channels_sql, NULL);
-		switch_cache_db_execute_sql(dbh, create_calls_sql, NULL);
-		switch_cache_db_execute_sql(dbh, create_interfaces_sql, NULL);
-		switch_cache_db_execute_sql(dbh, create_tasks_sql, NULL);
-	} else {
-		switch_cache_db_test_reactive(dbh, "select hostname from channels", "DROP TABLE channels", create_channels_sql);
-		switch_cache_db_test_reactive(dbh, "select hostname from calls", "DROP TABLE calls", create_calls_sql);
-		switch_cache_db_test_reactive(dbh, "select hostname from interfaces", "DROP TABLE interfaces", create_interfaces_sql);
-		switch_cache_db_test_reactive(dbh, "select hostname from tasks", "DROP TABLE tasks", create_tasks_sql);
-		
-	}
-
 	switch_cache_db_execute_sql(dbh, "delete from complete where sticky=0", NULL);
 	switch_cache_db_execute_sql(dbh, "delete from aliases where sticky=0", NULL);
 	switch_cache_db_execute_sql(dbh, "delete from nat where sticky=0", NULL);