FISH-7076 : fixing malformed sql exception

luiseufrasio · luiseufrasio · commit 7ceb0fb10735 · 2023-03-02T19:41:41.000-03:00
diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/expressions/FieldExpression.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/expressions/FieldExpression.java
@@ -271,7 +271,11 @@ public Expression rebuildOn(Expression newBase) {
             }
             if ((descriptor != null) && descriptor.hasTablePerClassPolicy()) {
                 field = field.clone();
-                field.setTable(descriptor.getDefaultTable());
+                DatabaseTable table = descriptor.getDefaultTable();
+                if((field.getTableName().length() != 0) && descriptor.getTableNames().contains(field.getTableName())) {
+                    table = descriptor.getTable(field.getTableName());
+                }
+                field.setTable(table);
             }
         }
         FieldExpression expression = new FieldExpression(field, getBaseExpression().rebuildOn(newBase));
@@ -308,7 +312,11 @@ public Expression twistedForBaseAndContext(Expression newBase, Expression contex
             }
             if ((descriptor != null) && descriptor.hasTablePerClassPolicy()) {
                 field = field.clone();
-                field.setTable(descriptor.getDefaultTable());
+                DatabaseTable table = descriptor.getDefaultTable();
+                if((field.getTableName().length() != 0) && descriptor.getTableNames().contains(field.getTableName())) {
+                    table = descriptor.getTable(field.getTableName());
+                }
+                field.setTable(table);
             }
         }
         return twistedBase.getField(field);

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,11 @@ public Expression rebuildOn(Expression newBase) {`
`271`	`271`	`}`
`272`	`272`	`if ((descriptor != null) && descriptor.hasTablePerClassPolicy()) {`
`273`	`273`	`field = field.clone();`
`274`		`- field.setTable(descriptor.getDefaultTable());`
	`274`	`+ DatabaseTable table = descriptor.getDefaultTable();`
	`275`	`+ if((field.getTableName().length() != 0) && descriptor.getTableNames().contains(field.getTableName())) {`
	`276`	`+ table = descriptor.getTable(field.getTableName());`
	`277`	`+ }`
	`278`	`+ field.setTable(table);`
`275`	`279`	`}`
`276`	`280`	`}`
`277`	`281`	`FieldExpression expression = new FieldExpression(field, getBaseExpression().rebuildOn(newBase));`
`@@ -308,7 +312,11 @@ public Expression twistedForBaseAndContext(Expression newBase, Expression contex`
`308`	`312`	`}`
`309`	`313`	`if ((descriptor != null) && descriptor.hasTablePerClassPolicy()) {`
`310`	`314`	`field = field.clone();`
`311`		`- field.setTable(descriptor.getDefaultTable());`
	`315`	`+ DatabaseTable table = descriptor.getDefaultTable();`
	`316`	`+ if((field.getTableName().length() != 0) && descriptor.getTableNames().contains(field.getTableName())) {`
	`317`	`+ table = descriptor.getTable(field.getTableName());`
	`318`	`+ }`
	`319`	`+ field.setTable(table);`
`312`	`320`	`}`
`313`	`321`	`}`
`314`	`322`	`return twistedBase.getField(field);`