completed updating integration tests to test uniqueidentifierN / guid

src/guid-parser.coffee

@@ -21,4 +21,35 @@ guidToArray = (guid) ->
     final = [b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, b14, b15, b16]
 
     final
-exports.guidToArray = guidToArray
+exports.guidToArray = guidToArray
+
+formatHex = (number) ->
+    hex = number.toString(16)
+    if hex.length == 1
+        hex = '0' + hex
+    return hex
+
+arrayToGuid = (array) ->
+    guid = formatHex(array[3]) +
+        formatHex(array[2]) +
+        formatHex(array[1]) +
+        formatHex(array[0]) +
+        '-' +
+        formatHex(array[5]) +
+        formatHex(array[4]) +
+        '-' +
+        formatHex(array[7]) +
+        formatHex(array[6]) +
+        '-' +
+        formatHex(array[8]) +
+        formatHex(array[9]) +
+        '-' +
+        formatHex(array[10]) +
+        formatHex(array[11]) +
+        formatHex(array[12]) +
+        formatHex(array[13]) +
+        formatHex(array[14]) +
+        formatHex(array[15])
+    guid.toUpperCase()
+
+exports.arrayToGuid = arrayToGuid

src/value-parser.coffee

@@ -1,5 +1,6 @@
 iconv = require('iconv-lite')
 sprintf = require('sprintf').sprintf
+guidParser = require('./guid-parser')
 require('./buffertools')
 
 NULL = (1 << 16) - 1
@@ -176,7 +177,7 @@ parse = (buffer, metaData) ->
         when 0
           value = null
         when 0x10
-          value = buffer.readArray(0x10)
+          value = guidParser.arrayToGuid( buffer.readArray(0x10) )
         else
           throw new Error(sprintf('Unsupported guid size %d at offset 0x%04X', dataLength - 1, buffer.position))
     else

test/integration/datatypes-in-results-test.coffee

@@ -212,10 +212,8 @@ exports.imageNull = (test) ->
   execSql(test, "select cast(null as image)", null)
 
 exports.guid = (test) ->
-  execSql(test, "select cast('01234567-89AB-CDEF-0123-456789ABCDEF' as uniqueidentifier)", [
-    0x67, 0x45, 0x23, 0x01, 0xAB, 0x89, 0xEF, 0xCD,
-    0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF
-  ])
+  execSql(test, "select cast('01234567-89AB-CDEF-0123-456789ABCDEF' as uniqueidentifier)", '01234567-89AB-CDEF-0123-456789ABCDEF')
+
 
 exports.guidNull = (test) ->
   execSql(test, "select cast(null as uniqueidentifier)", null)

test/integration/parameterised-statements-test.coffee

@@ -249,7 +249,7 @@ execSql = (test, type, value) ->
       else if (type == TYPES.BigInt)
         test.strictEqual(columns[0].value, value.toString())
       else if (type == TYPES.UniqueIdentifierN)
-        test.deepEqual(columns[0].value, guidParser.guidToArray(value))
+        test.deepEqual(columns[0].value, value)
       else
         test.strictEqual(columns[0].value, value)
   )
@@ -299,7 +299,8 @@ execSqlOutput = (test, type, value) ->
     else if (type == TYPES.BigInt)
       test.strictEqual(returnValue, value.toString())
     else if (type == TYPES.UniqueIdentifierN)
-      test.deepEqual(returnValue, guidParser.guidToArray(value))
+
+      test.deepEqual(returnValue, value)
     else
       test.strictEqual(returnValue, value)
 

test/unit/token/row-token-parser-test.coffee

@@ -441,14 +441,14 @@ module.exports.guidN = (test) ->
     0,
     16, 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef
   ]))
-  #console.log(buffer.data)
+  # console.log(buffer.data)
 
   token = parser(new ReadableTrackingBuffer(buffer.data, 'ucs2'), colMetaData)
-  #console.log(token)
+  # console.log(token)
 
   test.strictEqual(token.columns.length, 2)
   test.strictEqual(token.columns[0].value, null)
-  test.deepEqual([0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef], token.columns[1].value)
+  test.deepEqual('67452301-AB89-EFCD-0123-456789ABCDEF', token.columns[1].value)
 
   test.done()