diff options
| author | James Moger <james.moger@gmail.com> | 2011-12-06 12:45:11 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gmail.com> | 2011-12-06 12:45:11 -0500 |
| commit | fe7a924f168f5738fead18a4b0dad8b0451a5973 (patch) | |
| tree | af2f0f3303b6f6f329f5cfcd357b28d590799455 /src/com/iciql | |
| parent | 0b94e39b872246774fe2f3a0d507f7c134a9d6b4 (diff) | |
| download | iciql-fe7a924f168f5738fead18a4b0dad8b0451a5973.tar.gz iciql-fe7a924f168f5738fead18a4b0dad8b0451a5973.zip | |
Fixed join into custom type of primitivesv0.7.3
Diffstat (limited to 'src/com/iciql')
| -rw-r--r-- | src/com/iciql/Constants.java | 6 | ||||
| -rw-r--r-- | src/com/iciql/TableDefinition.java | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/com/iciql/Constants.java b/src/com/iciql/Constants.java index 0bd7663..5c1bfc0 100644 --- a/src/com/iciql/Constants.java +++ b/src/com/iciql/Constants.java @@ -25,14 +25,14 @@ public class Constants { // The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
- public static final String VERSION = "0.7.3-SNAPSHOT";
+ public static final String VERSION = "0.7.3";
// The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
- public static final String VERSION_DATE = "PENDING";
+ public static final String VERSION_DATE = "2011-12-06";
// The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
- public static final String API_CURRENT = "7";
+ public static final String API_CURRENT = "8";
}
diff --git a/src/com/iciql/TableDefinition.java b/src/com/iciql/TableDefinition.java index 05d312c..97060f9 100644 --- a/src/com/iciql/TableDefinition.java +++ b/src/com/iciql/TableDefinition.java @@ -722,8 +722,14 @@ public class TableDefinition<T> { stat.appendSQL(", ");
}
FieldDefinition def = fields.get(i);
- Object obj = def.getValue(x);
- query.appendSQL(stat, x, obj);
+ if (def.isPrimitive) {
+ Object obj = def.getValue(x);
+ Object alias = query.getPrimitiveAliasByValue(obj);
+ query.appendSQL(stat, x, alias);
+ } else {
+ Object obj = def.getValue(x);
+ query.appendSQL(stat, x, obj);
+ }
}
}
}
|