Skip to content

Datetime fixes #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: p740
Choose a base branch
from
Open

Datetime fixes #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/dbgateways/BaseGateway.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<cfset var st = refind("\?(?=([^']*'[^']*')*[^']*$)",sql,1,true) />
<cfset var paramindex = 1 />
<cfset var sqlParam = "" />
<cfset var comment = "#### #dateformat(now(),'yyyy-mm-dd')# #timeformat(now(),'hh:mm:ss')#" />
<cfset var comment = "#### #dateformat(now(),'yyyy-mm-dd')# #timeformat(now(),'HH:mm:ss')#" />

<cfif structkeyexists(request,"id")>
<cfset comment = comment & ", " & request.id />
Expand Down
12 changes: 6 additions & 6 deletions packages/dbgateways/MSSQL2005Gateway.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
<cfoutput>DEFAULT NULL </cfoutput>
<cfelseif stVal.cfsqltype eq "cf_sql_varchar">
<cfoutput>DEFAULT '#stVal.value#' </cfoutput>
<cfelseif stVal.cfsqltype eq "cf_sql_date">
<cfoutput>DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"hh:mm:s")#' </cfoutput>
<cfelseif stVal.cfsqltype eq "cf_sql_timestamp">
<cfoutput>DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"HH:mm:s")#' </cfoutput>
<cfelse>
<cfoutput>DEFAULT #stVal.value# </cfoutput>
</cfif>
Expand Down Expand Up @@ -159,8 +159,8 @@
DEFAULT NULL
<cfelseif stVal.cfsqltype eq "cf_sql_varchar">
DEFAULT '#stVal.value#'
<cfelseif stVal.cfsqltype eq "cf_sql_date">
DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"hh:mm:s")#'
<cfelseif stVal.cfsqltype eq "cf_sql_timestamp">
DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"HH:mm:s")#'
<cfelseif isNumeric(stVal.value)>
DEFAULT #stVal.value#
</cfif>
Expand Down Expand Up @@ -298,8 +298,8 @@
DEFAULT NULL
<cfelseif stVal.cfsqltype eq "cf_sql_varchar">
DEFAULT '#stVal.value#'
<cfelseif stVal.cfsqltype eq "cf_sql_date">
DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"hh:mm:s")#'
<cfelseif stVal.cfsqltype eq "cf_sql_timestamp">
DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"HH:mm:s")#'
<cfelse>
DEFAULT #stVal.value#
</cfif>
Expand Down
12 changes: 6 additions & 6 deletions packages/dbgateways/MSSQL2012Gateway.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
<cfoutput>DEFAULT NULL </cfoutput>
<cfelseif stVal.cfsqltype eq "cf_sql_varchar">
<cfoutput>DEFAULT '#stVal.value#' </cfoutput>
<cfelseif stVal.cfsqltype eq "cf_sql_date">
<cfoutput>DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"hh:mm:s")#' </cfoutput>
<cfelseif stVal.cfsqltype eq "cf_sql_timestamp">
<cfoutput>DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"HH:mm:s")#' </cfoutput>
<cfelse>
<cfoutput>DEFAULT #stVal.value# </cfoutput>
</cfif>
Expand Down Expand Up @@ -171,8 +171,8 @@
DEFAULT NULL
<cfelseif stVal.cfsqltype eq "cf_sql_varchar">
DEFAULT '#stVal.value#'
<cfelseif stVal.cfsqltype eq "cf_sql_date">
DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"hh:mm:s")#'
<cfelseif stVal.cfsqltype eq "cf_sql_timestamp">
DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"HH:mm:s")#'
<cfelseif isNumeric(stVal.value)>
DEFAULT #stVal.value#
</cfif>
Expand Down Expand Up @@ -316,8 +316,8 @@
DEFAULT NULL
<cfelseif stVal.cfsqltype eq "cf_sql_varchar">
DEFAULT '#stVal.value#'
<cfelseif stVal.cfsqltype eq "cf_sql_date">
DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"hh:mm:s")#'
<cfelseif stVal.cfsqltype eq "cf_sql_timestamp">
DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"HH:mm:s")#'
<cfelse>
DEFAULT #stVal.value#
</cfif>
Expand Down
20 changes: 12 additions & 8 deletions packages/dbgateways/MSSQLGateway.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<cfset var st = refind("\?(?=([^']*'[^']*')*[^']*$)",sql,1,true) />
<cfset var paramindex = 1 />
<cfset var sqlParam = "" />
<cfset var comment = "#### #dateformat(now(),'yyyy-mm-dd')# #timeformat(now(),'hh:mm:ss')#" />
<cfset var comment = "#### #dateformat(now(),'yyyy-mm-dd')# #timeformat(now(),'HH:mm:ss')#" />

<cfif structkeyexists(request,"id")>
<cfset comment = comment & ", " & request.id />
Expand Down Expand Up @@ -129,8 +129,8 @@
<cfoutput>DEFAULT NULL </cfoutput>
<cfelseif stVal.cfsqltype eq "cf_sql_varchar">
<cfoutput>DEFAULT '#stVal.value#' </cfoutput>
<cfelseif stVal.cfsqltype eq "cf_sql_date">
<cfoutput>DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"hh:mm:s")#' </cfoutput>
<cfelseif stVal.cfsqltype eq "cf_sql_timestamp">
<cfoutput>DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"HH:mm:s")#' </cfoutput>
<cfelseif isNumeric(stVal.value)>
<cfoutput>DEFAULT #stVal.value# </cfoutput>
</cfif>
Expand Down Expand Up @@ -250,8 +250,8 @@
DEFAULT NULL
<cfelseif stVal.cfsqltype eq "cf_sql_varchar">
DEFAULT '#stVal.value#'
<cfelseif stVal.cfsqltype eq "cf_sql_date">
DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"hh:mm:s")#'
<cfelseif stVal.cfsqltype eq "cf_sql_timestamp">
DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"HH:mm:s")#'
<cfelse>
DEFAULT #stVal.value#
</cfif>
Expand Down Expand Up @@ -395,8 +395,8 @@
DEFAULT NULL
<cfelseif stVal.cfsqltype eq "cf_sql_varchar">
DEFAULT '#stVal.value#'
<cfelseif stVal.cfsqltype eq "cf_sql_date">
DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"hh:mm:s")#'
<cfelseif stVal.cfsqltype eq "cf_sql_timestamp">
DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"HH:mm:s")#'
<cfelse>
DEFAULT #stVal.value#
</cfif>
Expand Down Expand Up @@ -861,7 +861,11 @@
<!--- Handle weird null values --->
<cfset e = getValueFromDB(schema=arguments.expected,value=arguments.expected.default) />
<cfset a = getValueFromDB(schema=arguments.actual,value=arguments.actual.default) />
<cfset b = b or e neq a />
<cfif e eq "" or a eq "" >
<cfset b = b or e neq a />
<cfelse>
<cfset b = b or (dateCompare(e, a) neq 0) >
</cfif>
<cfelse>
<cfset b = b or arguments.expected.default neq arguments.actual.default />
</cfif>
Expand Down
4 changes: 2 additions & 2 deletions packages/dbgateways/MySQLGateway.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@
<cfoutput>DEFAULT NULL </cfoutput>
<cfelseif stVal.cfsqltype eq "cf_sql_varchar">
<cfoutput>DEFAULT '#stVal.value#' </cfoutput>
<cfelseif stVal.cfsqltype eq "cf_sql_date">
<cfoutput>DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"hh:mm:s")#' </cfoutput>
<cfelseif stVal.cfsqltype eq "cf_sql_timestamp">
<cfoutput>DEFAULT '#dateformat(stVal.value,"YYYY-MM-DD")#T#timeformat(stVal.value,"HH:mm:s")#' </cfoutput>
<cfelseif isNumeric(stVal.value)>
<cfoutput>DEFAULT #stVal.value# </cfoutput>
</cfif>
Expand Down