Skip to content

Commit a734cff

Browse files
authored
Fix options of Datasource in services.datasource.create.cfm footer setting export
For details see https://dev.lucee.org/t/datasource-script-in-lucee-admin/14409
1 parent b5b92ed commit a734cff

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

core/src/main/cfml/context/admin/services.datasource.create.cfm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ if(isNumeric(datasource.connectionLimit))optional.append('connectionLimit:#datas
601601
if(datasource.connectionTimeout NEQ 1)optional.append('connectionTimeout:#datasource.connectionTimeout# // default: 1; unit: minutes');
602602
if(isNumeric(datasource.liveTimeout) && datasource.liveTimeout>0)optional.append('liveTimeout:#datasource.liveTimeout# // default: -1; unit: minutes');
603603
if(datasource.metaCacheTimeout NEQ 60000)optional.append(',metaCacheTimeout:#datasource.metaCacheTimeout# // default: 60000; unit: milliseconds');
604-
if(len(datasource.timezone))optional.append("timezone:'#replace(datasource.timezone,"'","''","all")#'");
604+
if(len(datasource.timezone))optional.append("timezone:'#replace(datasource.timezone,"'","''","all")#' // default is same as lucee instance");
605605
if(datasource.storage) optional.append('storage:#datasource.storage# // default: false');
606606
if(datasource.readOnly) optional.append('readOnly:#datasource.readOnly# // default: false');
607607
if(!isNull(driver.literalTimestampWithTSOffset) && driver.literalTimestampWithTSOffset())
@@ -627,7 +627,8 @@ this.datasources["#datasource.name#"] = {
627627
password: "#datasource.passwordEncrypted#",<cfif optional.len()>
628628

629629
// optional settings
630-
<cfloop array="#optional#" index="i" item="value">#replace(value, " // default", ", // default")#<cfif i LT optional.len()>
630+
<cfloop array="#optional#" index="i" item="value"><cfif i LT optional.len()>#replace(value, " // default", ", // default")#
631+
<cfelse>#value#
631632
</cfif></cfloop></cfif>
632633
};
633634
</cfsavecontent>
@@ -636,4 +637,4 @@ this.datasources["#datasource.name#"] = {
636637

637638

638639
</cfif>
639-
</cfoutput>
640+
</cfoutput>

0 commit comments

Comments
 (0)