Permalink
Browse files

Merge pull request #99 from Aaronontheweb/master

Fixed bug with retrieving CounterColumns
  • Loading branch information...
2 parents b7aba46 + 2d5df1e commit 7e3deb81014c0ec42c2939f58aac6c20ebfdf3b4 @nberardi nberardi committed Jan 5, 2013
Showing with 3 additions and 3 deletions.
  1. +1 −1 src/FluentColumnFamily.cs
  2. +2 −2 src/Operations/Helper.cs
View
2 src/FluentColumnFamily.cs
@@ -189,7 +189,7 @@ private CassandraColumnSchema GetColumnSchema(object name)
if (colSchema != null)
return colSchema;
- return new CassandraColumnSchema { NameType = schema.ColumnNameType, ValueType = typeof(BytesType) };
+ return new CassandraColumnSchema { NameType = schema.ColumnNameType, ValueType = schema.DefaultColumnValueType ?? typeof(BytesType) };
}
/// <summary>
View
4 src/Operations/Helper.cs
@@ -144,9 +144,9 @@ public static IFluentBaseColumn ConvertToFluentBaseColumn(ColumnOrSuperColumn co
else if (col.Column != null)
return ConvertColumnToFluentColumn(col.Column, schema);
else if (col.Counter_super_column != null)
- return ConvertColumnToFluentCounterColumn(col.Counter_column, schema);
+ return ConvertSuperColumnToFluentCounterSuperColumn(col.Counter_super_column, schema);
else if (col.Counter_column != null)
- return ConvertSuperColumnToFluentCounterSuperColumn(col.Counter_super_column, schema);
+ return ConvertColumnToFluentCounterColumn(col.Counter_column, schema);
else
return null;
}

0 comments on commit 7e3deb8

Please sign in to comment.