From a3a86739c2c4e93212275551fbb8d7c5854bf56f Mon Sep 17 00:00:00 2001
From: hengsin <hengsin@gmail.com>
Date: Mon, 3 Aug 2020 19:43:38 +0800
Subject: [PATCH] IDEMPIERE-4390 Error in the Workflow window (#201)

add keyword quote escape to gridtable and mquery
---
 org.adempiere.base/src/org/compiere/model/GridTable.java | 2 +-
 org.adempiere.base/src/org/compiere/model/MQuery.java    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/org.adempiere.base/src/org/compiere/model/GridTable.java b/org.adempiere.base/src/org/compiere/model/GridTable.java
index fdfb65cecf..37e1373a8e 100644
--- a/org.adempiere.base/src/org/compiere/model/GridTable.java
+++ b/org.adempiere.base/src/org/compiere/model/GridTable.java
@@ -347,7 +347,7 @@ public class GridTable extends AbstractTableModel
 			if (i > 0)
 				select.append(",");
 			GridField field = (GridField)m_fields.get(i);
-			select.append(field.getColumnSQL(true));	//	ColumnName or Virtual Column
+			select.append(field.isVirtualColumn() ? field.getColumnSQL(true) : DB.getDatabase().quoteColumnName(field.getColumnSQL(true)));	//	ColumnName or Virtual Column
 		}
 		//
 		select.append(" FROM ").append(m_tableName);
diff --git a/org.adempiere.base/src/org/compiere/model/MQuery.java b/org.adempiere.base/src/org/compiere/model/MQuery.java
index 580c526582..ea32ec506d 100644
--- a/org.adempiere.base/src/org/compiere/model/MQuery.java
+++ b/org.adempiere.base/src/org/compiere/model/MQuery.java
@@ -1216,7 +1216,7 @@ class Restriction  implements Serializable
 			//	We have a Function in the ColumnName
 			if (pos != -1 && end != -1 && !(pos-1==ColumnName.indexOf('(') && ColumnName.trim().startsWith("(")))
 				sb.append(ColumnName.substring(0, pos))
-					.append(tableName).append(".").append(ColumnName.substring(pos, end))
+					.append(tableName).append(".").append(DB.getDatabase().quoteColumnName(ColumnName.substring(pos, end)))
 					.append(ColumnName.substring(end));
 			else
 			{
@@ -1228,12 +1228,12 @@ class Restriction  implements Serializable
 				}
 				else
 				{
-					sb.append(tableName).append(".").append(ColumnName);
+					sb.append(tableName).append(".").append(DB.getDatabase().quoteColumnName(ColumnName));
 				}
 			}
 		}
 		else
-			sb.append(ColumnName);
+			sb.append(virtualColumn ? ColumnName : DB.getDatabase().quoteColumnName(ColumnName));
 		
 		sb.append(Operator);
 		if ( ! (Operator.equals(MQuery.NULL) || Operator.equals(MQuery.NOT_NULL)))