Index: tags/security/ui/dmSec_TestPolicySetup.cfm
===================================================================
RCS file: /FARCRY/farcry_core/tags/security/ui/dmSec_TestPolicySetup.cfm,v
retrieving revision 1.2
diff -u -r1.2 dmSec_TestPolicySetup.cfm
--- tags/security/ui/dmSec_TestPolicySetup.cfm	23 Apr 2004 17:50:15 -0000	1.2
+++ tags/security/ui/dmSec_TestPolicySetup.cfm	16 Jun 2004 18:55:01 -0000
@@ -63,28 +63,31 @@
 			<span style="color:red;">Error:</span> Policy Store Datasource attribute not found.<br>
 			The structure 'policyStore.datasource' was not found in the security structure.<br>
 			
-		<cfelseif not isDefined("stPolicyStore.dbowner")>
-			
-			<span style="color:red;">Error:</span> Policy Store dbowner attribute not found.<br>
-			The structure 'policyStore.dbowner' was not found in the security structure.<br>
-			
-		<cfelseif not isDefined("stPolicyStore.testTable")>
-			
-			<span style="color:red;">Error:</span> Policy Store testTable attribute not found.<br>
-			The structure 'policyStore.testTable' was not found in the security structure.<br>	
-			
 		<cfelse>
 		
 			<span style="color:green;">OK:</span> PolicyStore Datasource attribute exists.<br>
 			
-			<!--- Test the database connection works --->
+			<!--- Test the odbc connection works --->
 			<cftry>
-				<cfquery name="testConnection" datasource="#stPolicyStore.datasource#">
-					SELECT 1
-					FROM #stPolicyStore.dbowner##stPolicyStore.testTable#
-				</cfquery>
+			
+				<cfswitch expression="#application.dbType#">
+				
+					<cfcase value="ora">
+						<cfquery name="testODBC" datasource="#stPolicyStore.datasource#" dbtype="ODBC">
+							SELECT 1 FROM DUAL
+						</cfquery>
+					</cfcase>
+					
+					<cfdefaultcase>
+						<cfquery name="testODBC" datasource="#stPolicyStore.datasource#" dbtype="ODBC">
+							SELECT 1;
+						</cfquery>
+					</cfdefaultcase>
+				
+				</cfswitch>
+				
 			<cfcatch>
-				<span style="color:red;">Error:</span> Cannot connect to datasource #stPolicyStore.datasource# table #stPolicyStore.testTable#
+				<span style="color:red;">Error:</span> Cannot find datasource #stPolicyStore.datasource# in ODBC
 				<cfabort>
 			</cfcatch>