Merge pull request #42 from DullReferenceException/bom-fix

BOM fix
godaddy · Feb 3, 2015 · 34e8392 · 34e8392
2 parents bb00844 + 2fdb4e5
commit 34e8392
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/lib/util/query-cache.js b/lib/util/query-cache.js
@@ -31,7 +31,8 @@ QueryCache.prototype.initQueries = function initQueries() {
     , fileCache = this.fileCache
     , files = fs.readdirSync(queryDir);
   files.forEach(function (filePath) {
-    fileCache[path.basename(filePath, ".cql")] = fs.readFileSync(path.join(queryDir, filePath), "utf8");
+    var fileContent = fs.readFileSync(path.join(queryDir, filePath), "utf8").replace(/^\uFEFF/, ''); // remove BOM
+    fileCache[path.basename(filePath, ".cql")] = fileContent;
   });
 };
 

diff --git a/test/stubs/cql/cqlFileWithBOM.cql b/test/stubs/cql/cqlFileWithBOM.cql
@@ -0,0 +1 @@
+SELECT * FROM "myColumnFamily"
diff --git a/test/unit/drivers/datastax.tests.js b/test/unit/drivers/datastax.tests.js
@@ -1868,6 +1868,19 @@ describe('lib/drivers/datastax', function () {
       });
     });
 
+    it('handles CQL files containing a BOM', function (done) {
+      // arrange
+      var queryName = 'cqlFileWithBOM';
+      var params = [];
+      var consistency = cql.types.consistencies.one;
+
+      // act
+      instance.namedQuery(queryName, params, { consistency: consistency }, function () {
+        expect(instance.execCql.firstCall.args[0]).to.equal('SELECT * FROM "myColumnFamily"');
+        done();
+      });
+    });
+
     it('allows caller to disable prepared statement', function (done) {
       // arrange
       var queryName = 'myFakeCql';