Merge pull request #6 from Maowse/master

Removed username/password params from more cfquery calls
jkeczan · Apr 28, 2015 · e3731d1 · e3731d1
2 parents b112c43 + 8cd9698
commit e3731d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/adapters/MicrosoftSQLServer.cfc b/adapters/MicrosoftSQLServer.cfc
@@ -165,7 +165,7 @@
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="columnName" type="any" required="true" hint="column name">
 		<cfset var loc = {}>
-		<cfquery name="loc.constraints" datasource="#application.wheels.dataSourceName#" username="#application.wheels.dataSourceUserName#" password="#application.wheels.dataSourcePassword#">
+		<cfquery name="loc.constraints" datasource="#application.wheels.dataSourceName#" >
 			SELECT
 				constraint_name
 			FROM
@@ -187,7 +187,7 @@
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="columnName" type="any" required="true" hint="column name">
 		<cfset var loc = {}>
-		<cfquery name="loc.constraints" datasource="#application.wheels.dataSourceName#" username="#application.wheels.dataSourceUserName#" password="#application.wheels.dataSourcePassword#">
+		<cfquery name="loc.constraints" datasource="#application.wheels.dataSourceName#" >
 			EXEC sp_helpconstraint #quoteTableName(LCase(arguments.name))#, 'nomsg'
 		</cfquery>
 		<cfif StructKeyExists(loc, "constraints") And loc.constraints.RecordCount NEQ "" And loc.constraints.RecordCount GT 0>
@@ -211,7 +211,7 @@
 		<cfargument name="columnName" type="any" required="true" hint="column name">
 		<cfset var loc = {}>
 		<!--- Based on info presented in `http://stackoverflow.com/questions/765867/list-of-all-index-index-columns-in-sql-server-db` --->
-		<cfquery name="loc.indexes" datasource="#application.wheels.dataSourceName#" username="#application.wheels.dataSourceUserName#" password="#application.wheels.dataSourcePassword#">
+		<cfquery name="loc.indexes" datasource="#application.wheels.dataSourceName#" >
 			SELECT
 				t.name AS table_name,
 				col.name AS column_name,

diff --git a/dbmigrate.cfc b/dbmigrate.cfc
@@ -130,14 +130,14 @@
 
 	<cffunction name="$setVersionAsMigrated" access="private">
 		<cfargument name="version" required="true" type="string">
-		<cfquery datasource="#application.wheels.dataSourceName#" username="#application.wheels.dataSourceUserName#" password="#application.wheels.dataSourcePassword#">
+		<cfquery datasource="#application.wheels.dataSourceName#">
 		INSERT INTO schemainfo (version) VALUES (<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.version#">)
 		</cfquery>
 	</cffunction>
 
 	<cffunction name="$removeVersionAsMigrated" access="private">
 		<cfargument name="version" required="true" type="string">
-		<cfquery datasource="#application.wheels.dataSourceName#" username="#application.wheels.dataSourceUserName#" password="#application.wheels.dataSourcePassword#">
+		<cfquery datasource="#application.wheels.dataSourceName#" >
 		DELETE FROM schemainfo WHERE version = <cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.version#">
 		</cfquery>
 	</cffunction>	
@@ -222,11 +222,11 @@
 	<cffunction name="$getVersionsPreviouslyMigrated" access="private" returntype="string">
 		<cfset var loc = {}>
 		<cftry>
-			<cfquery name="loc.qMigratedVersions" datasource="#application.wheels.dataSourceName#" username="#application.wheels.dataSourceUserName#" password="#application.wheels.dataSourcePassword#">
+			<cfquery name="loc.qMigratedVersions" datasource="#application.wheels.dataSourceName#" >
 			SELECT version FROM schemainfo ORDER BY version ASC
 			</cfquery>
 			<cfcatch type="database">
-				<cfquery datasource="#application.wheels.dataSourceName#" username="#application.wheels.dataSourceUserName#" password="#application.wheels.dataSourcePassword#">
+				<cfquery datasource="#application.wheels.dataSourceName#" >
 				CREATE TABLE schemainfo (version VARCHAR(25))
 				</cfquery>
 				<cfreturn "0">