From 54684518f0e14f364fb714f6551a5e67f78bf252 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Thu, 25 Jan 2007 00:35:51 +0000
Subject: [PATCH] * [ 1643831 ] Convert update problem

---
 .../compiere/dbPort/Convert_PostgreSQL.java   | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java b/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java
index 33ad9952c0..b2db7ed28e 100644
--- a/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java
+++ b/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java
@@ -122,6 +122,7 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
 		// log.info(result.get(i));
 		// log.info("------------------------------------------------------------");
 
+		//System.out.println(result.get(0));
 		return result;
 	} // convertStatement
 
@@ -1425,10 +1426,25 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
 			return true;
 		else if (',' == c)
 			return true;
+		else if ('?' == c)
+			return true;
+		else if ('#' == c)
+			return true;
+		else if ('@' == c)
+			return true;
+		else if ('~' == c)
+			return true;
+		else if ('&' == c)
+			return true;
+		else if ('^' == c)
+			return true;
+		else if ('!' == c)
+			return true;
 		else
 			return false;
 	}
 	
+	/*
 	private boolean isOperator(String token)
 	{
 		if ("=".equals(token))
@@ -1457,7 +1473,8 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
 			return true;
 		else
 			return false;
-	}
+	}*/
+	
 	/**
 	 * Check if token is a valid sql identifier
 	 * @param token
@@ -1481,8 +1498,27 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
 				return false;
 			} catch (NumberFormatException e) {}
 		}
+		
+		if (isSQLFunctions(token))
+			return false;
+		
 		return true;
 	}
+	
+	private boolean isSQLFunctions(String token)
+	{
+		if (token.equalsIgnoreCase("current_timestamp"))
+			return true;
+		else if (token.equalsIgnoreCase("current_time"))
+			return true;
+		else if (token.equalsIgnoreCase("current_date"))
+			return true;
+		else if (token.equalsIgnoreCase("localtime"))
+			return true;
+		else if (token.equalsIgnoreCase("localtimestamp"))
+			return true;
+		return false;
+	}
 
 	/***************************************************************************
 	 * Converts Delete.