From 49281a27dcd58b4899059364ae38f6507ed8a8e3 Mon Sep 17 00:00:00 2001 From: Alex Huang Date: Mon, 3 Jan 2011 08:45:30 -0800 Subject: [PATCH] Added table name --- utils/src/com/cloud/utils/db/SqlGenerator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/src/com/cloud/utils/db/SqlGenerator.java b/utils/src/com/cloud/utils/db/SqlGenerator.java index 2db80284faf..d504ef37901 100755 --- a/utils/src/com/cloud/utils/db/SqlGenerator.java +++ b/utils/src/com/cloud/utils/db/SqlGenerator.java @@ -578,8 +578,11 @@ public class SqlGenerator { DiscriminatorValue dv = table.getAnnotation(DiscriminatorValue.class); if (dv != null) { Class parent = table.getSuperclass(); + String tableName = DbUtil.getTableName(parent); DiscriminatorColumn dc = parent.getAnnotation(DiscriminatorColumn.class); assert(dc != null) : "Parent does not have discrminator column: " + parent.getName(); + sql.append(tableName); + sql.append("."); sql.append(dc.name()).append("="); Object value = null; if (dc.discriminatorType() == DiscriminatorType.INTEGER) { @@ -596,7 +599,6 @@ public class SqlGenerator { } values.put(dc.name(), value); sql.append(" AND "); - } }