Skip to content

Dynamically generate queryExecute options + new config to always include DSN #513

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

Merged
merged 2 commits into from
Feb 14, 2022
Merged

Dynamically generate queryExecute options + new config to always include DSN #513

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c153fee
Dynamically generate queryExecute options + new config to include dsn
homestar9 Jan 23, 2022
1e9cf08
Apply cfformat changes
homestar9 Jan 23, 2022
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
110 changes: 44 additions & 66 deletions system/cache/store/JDBCStore.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
type ="boolean"
default="true";

/**
* Whether to include the DSN in queryExecute statements. If not, it will use the default set in applciation.cfc
*/
property
name ="queryIncludeDsn"
type ="boolean"
default="true";

/**
* Constructor
*
Expand Down Expand Up @@ -100,6 +108,26 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
variables.dsnUsername = config.dsnUsername;
variables.dsnPassword = config.dsnPassword;

// this struct will contain the dsn and credentials if passed into the config. Otherwise queryExecute will default
// to the datasource set in application.cfc
variables.queryOptions = {};

// if DSN username or password were passed, include them in the query options
if ( len( variables.dsnUsername ) || len( variables.dsnPassword ) ) {
variables.queryOptions[ "dsnUsername" ] = variables.dsnUsername;
variables.queryOptions[ "dsnPassword" ] = variables.dsnPassword;
}

if ( isNull( config.queryIncludeDsn ) ) {
config.queryIncludeDsn = true;
}

// if we should include the dsn in the query options, add it
if ( config.queryIncludeDsn ) {
variables.queryOptions[ "dsn" ] = variables.dsn;
}


// Check autoCreate
if ( isNull( config.tableAutoCreate ) ) {
config.tableAutoCreate = true;
Expand Down Expand Up @@ -146,11 +174,7 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
queryExecute(
"TRUNCATE TABLE #variables.table#",
{},
{
datasource : variables.dsn,
username : variables.dsnUsername,
password : variables.dsnPassword
}
variables.queryOptions
);
}

Expand All @@ -163,11 +187,7 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
var qResults = queryExecute(
"SELECT objectKey FROM #variables.table# ORDER BY objectKey ASC",
{},
{
datasource : variables.dsn,
username : variables.dsnUsername,
password : variables.dsnPassword
}
variables.queryOptions
);

return (
Expand Down Expand Up @@ -205,11 +225,7 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
WHERE id = ?
",
[ normalizedID ],
{
datasource : variables.dsn,
username : variables.dsnUsername,
password : variables.dsnPassword
}
variables.queryOptions
);

// Update stats if found
Expand All @@ -236,11 +252,7 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
id : { value : "#normalizedID#", cfsqltype : "varchar" },
created : { value : "#now()#", cfsqltype : "timestamp" }
},
{
datasource : variables.dsn,
username : variables.dsnUsername,
password : variables.dsnPassword
}
variables.queryOptions
);
}
}
Expand All @@ -267,11 +279,7 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
WHERE id = ?
",
[ getNormalizedID( arguments.objectKey ) ],
{
datasource : variables.dsn,
username : variables.dsnUsername,
password : variables.dsnPassword
}
variables.queryOptions
);

// Just return if records found, else null
Expand All @@ -295,11 +303,7 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
WHERE id = ?
",
[ 1, getNormalizedID( arguments.objectKey ) ],
{
datasource : variables.dsn,
username : variables.dsnUsername,
password : variables.dsnPassword
}
variables.queryOptions
);
}

Expand All @@ -318,11 +322,7 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
WHERE id = ?
",
[ getNormalizedID( arguments.objectKey ) ],
{
datasource : variables.dsn,
username : variables.dsnUsername,
password : variables.dsnPassword
}
variables.queryOptions
);

return ( q.recordCount && q.isExpired ? true : false );
Expand Down Expand Up @@ -385,11 +385,7 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
isExpired : { value : "0", cfsqltype : "bit" },
isSimple : { value : "#isSimple#", cfsqltype : "bit" }
},
{
datasource : variables.dsn,
username : variables.dsnUsername,
password : variables.dsnPassword
}
variables.queryOptions
);

return;
Expand Down Expand Up @@ -423,11 +419,7 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
isExpired : { value : "0", cfsqltype : "bit" },
isSimple : { value : "#isSimple#", cfsqltype : "bit" }
},
{
datasource : variables.dsn,
username : variables.dsnUsername,
password : variables.dsnPassword
}
variables.queryOptions
);
}
}
Expand All @@ -438,18 +430,16 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
* @objectKey The object key to clear
*/
function clear( required objectKey ){
var localQueryOptions = duplicate( variables.queryOptions );
localQueryOptions[ "result" ] = "local.q";

queryExecute(
"DELETE
FROM #variables.table#
WHERE id = ?
",
[ getNormalizedID( arguments.objectKey ) ],
{
datasource : variables.dsn,
username : variables.dsnUsername,
password : variables.dsnPassword,
result : "local.q"
}
localQueryOptions
);

return ( q.recordCount ? true : false );
Expand All @@ -464,11 +454,7 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
FROM #variables.table#
",
{},
{
datasource : variables.dsn,
username : variables.dsnUsername,
password : variables.dsnPassword
}
variables.queryOptions
);

return q.totalCount;
Expand Down Expand Up @@ -497,11 +483,7 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
WHERE id = ?
",
[ getNormalizedID( arguments.objectKey ) ],
{
datasource : variables.dsn,
username : variables.dsnUsername,
password : variables.dsnPassword
}
variables.queryOptions
);
}

Expand Down Expand Up @@ -584,11 +566,7 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
) #create.afterCreate#
",
{},
{
datasource : variables.dsn,
username : variables.dsnUsername,
password : variables.dsnPassword
}
variables.queryOptions
);
}
}
Expand Down