Merge branch 'master' of github.com:deanhiller/playorm

deanhiller · Jan 30, 2013 · 9eff6b4 · 9eff6b4
2 parents d460377 + a3fbab0
commit 9eff6b4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/input/javasrc/com/alvazan/orm/layer3/typed/NoSqlTypedSessionImpl.java b/input/javasrc/com/alvazan/orm/layer3/typed/NoSqlTypedSessionImpl.java
@@ -203,8 +203,13 @@ public Cursor<IndexPoint> indexView(String columnFamily, String column,
 		if(meta == null)
 			throw new IllegalArgumentException("columnFamily="+columnFamily+" not found");
 		DboColumnMeta colMeta = meta.getColumnMeta(column);
-		if(colMeta == null)
-			throw new IllegalArgumentException("Column="+column+" not found on meta info for column family="+columnFamily);
+		if (colMeta == null) {
+			colMeta = meta.getIdColumnMeta();
+			if (!(colMeta != null && colMeta.getColumnName().equals(column)))
+				throw new IllegalArgumentException("Column=" + column
+						+ " not found on meta info for column family="
+						+ columnFamily);
+		}
 		else if(!colMeta.isIndexed())
 			throw new IllegalArgumentException("Column="+column+" is not an indexed column");
 		else if(meta.getPartitionedColumns().size() > 1 && partitionBy == null)

diff --git a/input/javasrc/com/alvazan/ssql/cmdline/CmdIndex.java b/input/javasrc/com/alvazan/ssql/cmdline/CmdIndex.java
@@ -243,6 +243,8 @@ private ColFamilyData goMore(NoSqlEntityManager mgr, String cf, String lastPart)
 
 		DboColumnMeta colMeta = meta.getColumnMeta(field);
 		if(colMeta == null) {
+			colMeta = meta.getIdColumnMeta();
+			if(!(colMeta != null && colMeta.getColumnName().equals(field)))
 			throw new InvalidCommand("Column="+field+" not found on table="+cf);
 		}