Skip to content

Commit d1e8641

Browse files
committed
boxlang prime updates on sqltypes
1 parent dc507ec commit d1e8641

2 files changed

Lines changed: 107 additions & 21 deletions

File tree

system/cache/store/JDBCStore.cfc

Lines changed: 99 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,21 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
237237
var qStats = queryExecute(
238238
"#targetSQL#",
239239
{
240-
lastAccessed : { value : "#now()#", cfsqltype : "timestamp" },
241-
id : { value : "#normalizedID#", cfsqltype : "varchar" },
242-
created : { value : "#now()#", cfsqltype : "timestamp" }
240+
lastAccessed : {
241+
value : "#now()#",
242+
cfsqltype : "timestamp",
243+
sqltype : "timestamp"
244+
},
245+
id : {
246+
value : "#normalizedID#",
247+
cfsqltype : "varchar",
248+
sqltype : "varchar"
249+
},
250+
created : {
251+
value : "#now()#",
252+
cfsqltype : "timestamp",
253+
sqltype : "timestamp"
254+
}
243255
},
244256
variables.queryOptions
245257
);
@@ -360,18 +372,51 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
360372
)
361373
",
362374
{
363-
id : { value : "#normalizedId#", cfsqltype : "varchar" },
364-
objectKey : { value : "#arguments.objectKey#", cfsqltype : "varchar" },
365-
objectValue : { value : "#arguments.object#", cfsqltype : "longvarchar" },
366-
hits : { value : "1", cfsqltype : "integer" },
367-
timeout : { value : "#arguments.timeout#", cfsqltype : "integer" },
375+
id : {
376+
value : "#normalizedId#",
377+
cfsqltype : "varchar",
378+
sqltype : "varchar"
379+
},
380+
objectKey : {
381+
value : "#arguments.objectKey#",
382+
cfsqltype : "varchar",
383+
sqltype : "varchar"
384+
},
385+
objectValue : {
386+
value : "#arguments.object#",
387+
cfsqltype : "longvarchar",
388+
sqltype : "longvarchar"
389+
},
390+
hits : {
391+
value : "1",
392+
cfsqltype : "integer",
393+
sqltype : "integer"
394+
},
395+
timeout : {
396+
value : "#arguments.timeout#",
397+
cfsqltype : "integer",
398+
sqltype : "integer"
399+
},
368400
lastAccessTimeout : {
369401
value : "#arguments.lastAccessTimeout#",
370-
cfsqltype : "integer"
402+
cfsqltype : "integer",
403+
sqltype : "integer"
404+
},
405+
now : {
406+
value : now(),
407+
cfsqltype : "timestamp",
408+
sqltype : "timestamp"
371409
},
372-
now : { value : now(), cfsqltype : "timestamp" },
373-
isExpired : { value : "0", cfsqltype : "bit" },
374-
isSimple : { value : "#isSimple#", cfsqltype : "bit" }
410+
isExpired : {
411+
value : "0",
412+
cfsqltype : "bit",
413+
sqltype : "bit"
414+
},
415+
isSimple : {
416+
value : "#isSimple#",
417+
cfsqltype : "bit",
418+
sqltype : "bit"
419+
}
375420
},
376421
variables.queryOptions
377422
);
@@ -393,18 +438,51 @@ component implements="coldbox.system.cache.store.IObjectStore" accessors="true"
393438
WHERE id = :id
394439
",
395440
{
396-
id : { value : "#normalizedId#", cfsqltype : "varchar" },
397-
objectKey : { value : "#arguments.objectKey#", cfsqltype : "varchar" },
398-
objectValue : { value : "#arguments.object#", cfsqltype : "longvarchar" },
399-
hits : { value : "1", cfsqltype : "integer" },
400-
timeout : { value : "#arguments.timeout#", cfsqltype : "integer" },
441+
id : {
442+
value : "#normalizedId#",
443+
cfsqltype : "varchar",
444+
sqltype : "varchar"
445+
},
446+
objectKey : {
447+
value : "#arguments.objectKey#",
448+
cfsqltype : "varchar",
449+
sqltype : "varchar"
450+
},
451+
objectValue : {
452+
value : "#arguments.object#",
453+
cfsqltype : "longvarchar",
454+
sqltype : "longvarchar"
455+
},
456+
hits : {
457+
value : "1",
458+
cfsqltype : "integer",
459+
sqltype : "integer"
460+
},
461+
timeout : {
462+
value : "#arguments.timeout#",
463+
cfsqltype : "integer",
464+
sqltype : "integer"
465+
},
401466
lastAccessTimeout : {
402467
value : "#arguments.lastAccessTimeout#",
403-
cfsqltype : "integer"
468+
cfsqltype : "integer",
469+
sqltype : "integer"
470+
},
471+
now : {
472+
value : now(),
473+
cfsqltype : "timestamp",
474+
sqltype : "timestamp"
475+
},
476+
isExpired : {
477+
value : "0",
478+
cfsqltype : "bit",
479+
sqltype : "bit"
404480
},
405-
now : { value : now(), cfsqltype : "timestamp" },
406-
isExpired : { value : "0", cfsqltype : "bit" },
407-
isSimple : { value : "#isSimple#", cfsqltype : "bit" }
481+
isSimple : {
482+
value : "#isSimple#",
483+
cfsqltype : "bit",
484+
sqltype : "bit"
485+
}
408486
},
409487
variables.queryOptions
410488
);

system/logging/appenders/DBAppender.cfc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ component accessors="true" extends="coldbox.system.logging.AbstractAppender" {
170170
{
171171
datetime : {
172172
cfsqltype : variables.queryParamDataTimeType,
173+
sqltype : variables.queryParamDataTimeType,
173174
value : "#dateFormat( targetDate, "mm/dd/yyyy" )#"
174175
}
175176
},
@@ -231,30 +232,37 @@ component accessors="true" extends="coldbox.system.logging.AbstractAppender" {
231232
{
232233
uuid : {
233234
cfsqltype : "varchar",
235+
sqltype : "varchar",
234236
value : "#variables.uuid.randomUUID().toString()#"
235237
},
236238
severity : {
237239
cfsqltype : "varchar",
240+
sqltype : "varchar",
238241
value : "#arguments.data.severity#"
239242
},
240243
category : {
241244
cfsqltype : "varchar",
245+
sqltype : "varchar",
242246
value : "#arguments.data.category#"
243247
},
244248
timestamp : {
245249
cfsqltype : variables.queryParamDataTimeType,
250+
sqltype : variables.queryParamDataTimeType,
246251
value : "#arguments.data.timestamp#"
247252
},
248253
name : {
249254
cfsqltype : "varchar",
255+
sqltype : "varchar",
250256
value : "#left( getName(), 100 )#"
251257
},
252258
message : {
253259
cfsqltype : "varchar",
260+
sqltype : "varchar",
254261
value : "#arguments.data.message#"
255262
},
256263
extraInfo : {
257264
cfsqltype : "varchar",
265+
sqltype : "varchar",
258266
value : "#arguments.data.extraInfo#"
259267
}
260268
},

0 commit comments

Comments
 (0)