diff options
Diffstat (limited to 'src/main/webapp/models/Host.cfc')
| -rw-r--r-- | src/main/webapp/models/Host.cfc | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/main/webapp/models/Host.cfc b/src/main/webapp/models/Host.cfc index a69f039..22f9b88 100644 --- a/src/main/webapp/models/Host.cfc +++ b/src/main/webapp/models/Host.cfc @@ -14,7 +14,7 @@ <cfset var statement = ""> <cfif Len(this.db_type.batch_separator)> - <cfset sql = REReplace(sql, "#chr(10)##this.db_type.batch_separator#(#chr(13)#?)#chr(10)#", '#chr(7)#', 'all')> + <cfset sql = REReplaceNoCase(sql, "#chr(10)##this.db_type.batch_separator#(#chr(13)#?)#chr(10)#", '#chr(7)#', 'all')> </cfif> <cftry> @@ -67,13 +67,13 @@ <cfset var escaped_separator = ReReplace(arguments.statement_separator, "([^A-Za-z0-9])", "\\\1", "ALL")> </cfif> <cfif Len(this.db_type.batch_separator)> - <cfset ddl_list = REReplace(arguments.ddl, "#chr(10)##this.db_type.batch_separator#(#chr(13)#?)#chr(10)#", '#chr(7)#', 'all')> + <cfset ddl_list = REReplaceNoCase(arguments.ddl, "#chr(10)##this.db_type.batch_separator#(#chr(13)#?)#chr(10)#", '#chr(7)#', 'all')> <cfelse> <cfset ddl_list = arguments.ddl> </cfif> - <cfset ddl_list = REReplace(ddl_list, "#escaped_separator#\s*(\r?\n|$)", "#chr(7)#", "all")> + <cfset ddl_list = REReplaceNoCase(ddl_list, "#escaped_separator#\s*(\r?\n|$)", "#chr(7)#", "all")> - <cfloop list="#ddl_list#" index="statement" delimiters="#chr(7)#"> + <cfloop list="#ddl_list#" index="statement" delimiters="#chr(7)#"> <cfif Len(trim(statement))> <cfquery datasource="#this.db_type_id#_#arguments.datasourceName#">#PreserveSingleQuotes(statement)#</cfquery> </cfif> @@ -91,15 +91,15 @@ password=this.db_type_id & '_' & arguments.datasourceName, customJDBCArguments=this.db_type.custom_jdbc_attributes, timeout=0, - allowed_select=true, - allowed_insert=!local.isMySQL, - allowed_update=!local.isMySQL, - allowed_delete=!local.isMySQL, - allowed_alter=!local.isMySQL, - allowed_drop=!local.isMySQL, - allowed_revoke=false, - allowed_create=!local.isMySQL, - allowed_grant=false, + allowed_select=true, + allowed_insert=!local.isMySQL, + allowed_update=!local.isMySQL, + allowed_delete=!local.isMySQL, + allowed_alter=!local.isMySQL, + allowed_drop=!local.isMySQL, + allowed_revoke=false, + allowed_create=!local.isMySQL, + allowed_grant=false, pooling=false, description = "Created on #DateFormat(Now(), 'mm/dd/yyyy')# #TimeFormat(Now(), 'hh:mm:ss tt')#" ); @@ -122,18 +122,18 @@ <cffunction name="dropDatabase"> <cfargument name="databaseName" type="string"> - <cfset var statement = ""> + <cfset var statement = ""> <cfif not IsDefined("this.db_type")> <cfset this.db_type = model("DB_Type").findByKey(this.db_type_id)> </cfif> <cfset var sql = Replace(this.db_type.drop_script_template, '##databaseName##', this.db_type_id & '_' & ucase(databaseName), 'ALL')> - <cfif Len(this.db_type.batch_separator)> - <cfset sql = REReplace(sql, "#chr(10)##this.db_type.batch_separator#(#chr(13)#?)#chr(10)#", '#chr(7)#', 'all')> + <cfif Len(this.db_type.batch_separator)> + <cfset sql = REReplaceNoCase(sql, "#chr(10)##this.db_type.batch_separator#(#chr(13)#?)#chr(10)#", '#chr(7)#', 'all')> </cfif> - <cfloop list="#sql#" index="statement" delimiters="#chr(7)#"> + <cfloop list="#sql#" index="statement" delimiters="#chr(7)#"> <cfquery datasource="#this.cf_dsn#">#PreserveSingleQuotes(statement)#</cfquery> </cfloop> |