Merge pull request #1086 from triptec/master

Update formatNamedParameters to not match parameters starting with digit

lib/sql-string.js

@@ -143,7 +143,7 @@ SqlString.format = function(sql, values, timeZone, dialect) {
 }
 }
 
 
 SqlString.formatNamedParameters = function(sql, values, timeZone, dialect) {
 SqlString.formatNamedParameters = function(sql, values, timeZone, dialect) {
-  return sql.replace(/\:(\w+)/g, function (value, key) {
+  return sql.replace(/\:(?!\d)(\w+)/g, function (value, key) {
     if (values.hasOwnProperty(key)) {
     if (values.hasOwnProperty(key)) {
       return SqlString.escape(values[key], false, timeZone, dialect)
       return SqlString.escape(values[key], false, timeZone, dialect)
     } else {
     } else {

test/sequelize.test.js

@@ -202,6 +202,13 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
       })
       })
     })
     })
 
 
+    it('replaces named parameters with the passed object and ignore those which does not qualify', function(done) {
+      this.sequelize.query('select :one as foo, :two as bar, \'00:00\' as baz', null, { raw: true }, { one: 1, two: 2 }).success(function(result) {
+        expect(result).to.deep.equal([{ foo: 1, bar: 2, baz: '00:00' }])
+        done()
+      })
+    })
+
     it('replaces named parameters with the passed object using the same key twice', function(done) {
     it('replaces named parameters with the passed object using the same key twice', function(done) {
       this.sequelize.query('select :one as foo, :two as bar, :one as baz', null, { raw: true }, { one: 1, two: 2 }).success(function(result) {
       this.sequelize.query('select :one as foo, :two as bar, :one as baz', null, { raw: true }, { one: 1, two: 2 }).success(function(result) {
         expect(result).to.deep.equal([{ foo: 1, bar: 2, baz: 1 }])
         expect(result).to.deep.equal([{ foo: 1, bar: 2, baz: 1 }])