Permalink
Browse files

fixed inconsistency in the consistency of the naming of the consisten…

…cy level variables
  • Loading branch information...
1 parent 0d1d947 commit 94dd64f130dfbe9ccce933ab37e3c3d5807550f5 @devdazed devdazed committed Mar 27, 2012
Showing with 12 additions and 7 deletions.
  1. +6 −1 History.md
  2. +4 −4 lib/column_family.js
  3. +1 −1 lib/helenus.js
  4. +1 −1 package.json
View
@@ -94,4 +94,9 @@
0.3.4 / 2012-03-25
==================
- * fixed issue with keys not marshalling when using indexed queries
+ * fixed issue with keys not marshalling when using indexed queries
+
+0.3.5 / 2012-03-27
+==================
+
+ * fixed inconsistency in the consistency of the naming of the consistency level variables
@@ -209,7 +209,7 @@ ColumnFamily.prototype.insert = function(key, columns, options, callback){
var len = columns.length, i = 0, valueMarshaller, col,
mutations = [], batch = {},
- consistency = options.consistency || DEFAULT_WRITE_CONSISTENCY;
+ consistency = options.consistency || options.consistencyLevel || DEFAULT_WRITE_CONSISTENCY;
for(; i < len; i += 1){
col = columns[i];
@@ -250,7 +250,7 @@ ColumnFamily.prototype.remove = function() {
var marshalledKey = this.keyMarshaller.serialize(args.key).toString('binary'),
path = columnPath(self, args.column, args.subcolumn),
timestamp = args.options.timestamp || new Date(),
- consistency = args.options.consistency || DEFAULT_WRITE_CONSISTENCY;
+ consistency = args.options.consistency || args.options.consistencyLevel || DEFAULT_WRITE_CONSISTENCY;
this.connection.execute('remove', marshalledKey, path, timestamp, consistency, args.callback);
};
@@ -277,7 +277,7 @@ ColumnFamily.prototype.get = function(key, options, callback){
callback = callback || NOOP;
var self = this,
- consistency = options.consistencyLevel || DEFAULT_READ_CONSISTENCY,
+ consistency = options.consistency || options.consistencyLevel || DEFAULT_READ_CONSISTENCY,
marshalledKey = this.keyMarshaller.serialize(key).toString('binary'),
predicate = getSlicePredicate(options, this.columnMarshaller);
@@ -327,7 +327,7 @@ ColumnFamily.prototype.getIndexed = function(query, options, callback){
var self = this, indexClause, indexExpressions = [],
i = 0, len = query.fields.length, field, valueMarshaller,
- consistency = options.consistencyLevel || DEFAULT_READ_CONSISTENCY,
+ consistency = options.consistency || options.consistencyLevel || DEFAULT_READ_CONSISTENCY,
predicate = getSlicePredicate(options, this.columnMarshaller);
for(; i < len; i += 1){
View
@@ -16,7 +16,7 @@ var Helenus = {};
* @static
* @constant
*/
-Helenus.version = '0.3.4';
+Helenus.version = '0.3.5';
/**
* The connection pool
View
@@ -1,6 +1,6 @@
{
"name": "helenus"
- , "version": "0.3.4"
+ , "version": "0.3.5"
, "description": "NodeJS Bindings for Cassandra"
, "keywords": ["cassandra"]
, "author": "Russell Bradberry <rbradberry@gmail.com>"

0 comments on commit 94dd64f

Please sign in to comment.