#165141 by hswong3i: move literal values out of some core queries to support cross-database compatibility (ie. better SQL parsing and altering options)