Merge origin/master

Conflicts:
	src/test/java/net/sf/jsqlparser/test/select/SelectTest.java

Author: wumpz

src/main/java/net/sf/jsqlparser/schema/Column.java

@@ -62,10 +62,19 @@ public void setColumnName(String string) {
 
     @Override
     public String getFullyQualifiedName() {
+        return getName(false);
+    }
+    
+    /**
+     * Get name with out without using aliases.
+     * @param aliases
+     * @return 
+     */
+    public String getName(boolean aliases) {
         StringBuilder fqn = new StringBuilder();
 
         if (table != null) {
-            if (table.getAlias() != null) {
+            if (table.getAlias() != null && aliases) {
                 fqn.append(table.getAlias().getName());
             } else {
                 fqn.append(table.getFullyQualifiedName());
@@ -87,6 +96,6 @@ public void accept(ExpressionVisitor expressionVisitor) {
 
     @Override
     public String toString() {
-        return getFullyQualifiedName();
+        return getName(true);
     }
 }

src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java

@@ -174,10 +174,6 @@ public void visit(PlainSelect plainSelect) {
         }
     }
 
-    public void visit(Column column) {
-        buffer.append(column.getFullyQualifiedName());
-    }
-
     @Override
     public void visit(AllTableColumns allTableColumns) {
         buffer.append(allTableColumns.getTable().getFullyQualifiedName()).append(".*");
@@ -360,7 +356,7 @@ public void deparseJoin(Join join) {
             buffer.append(" USING (");
             for (Iterator<Column> iterator = join.getUsingColumns().iterator(); iterator.hasNext();) {
                 Column column = iterator.next();
-                buffer.append(column.getFullyQualifiedName());
+                buffer.append(column.toString());
                 if (iterator.hasNext()) {
                     buffer.append(", ");
                 }

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -761,7 +761,7 @@ String RelObjectName() :
       | tk=<K_COLUMN> | tk=<K_REPLACE> | tk=<K_TRUNCATE> | tk=<K_KEY> | tk=<K_ANY>
       | tk=<K_OPEN> | tk=<K_OVER> | tk=<K_VALUES> | tk=<K_PERCENT> | tk=<K_PRIOR>
 	  | tk=<K_SEPARATOR> | tk=<K_NO> | tk=<K_ACTION> | tk=<K_CASCADE> | tk=<K_END>
-      | tk=<K_TABLE> | tk=<K_DATETIMELITERAL> | tk=<K_COMMIT>
+      | tk=<K_TABLE> | tk=<K_DATETIMELITERAL> | tk=<K_COMMIT> | tk=<K_PRECISION>
       )
 
     { return tk.image; }
@@ -2849,7 +2849,7 @@ ColDataType ColDataType():
 }
 {
 	( (tk=<K_CHARACTER> | tk=<K_BIT>) [tk2=<K_VARYING>] { colDataType.setDataType(tk.image + (tk2!=null?" " + tk2.image:"")); }
-	| tk=<K_DOUBLE> [tk2=<K_PRECISION>] { colDataType.setDataType(tk.image + (tk2!=null?" " + tk2.image:"")); }
+	| tk=<K_DOUBLE> [LOOKAHEAD(2) tk2=<K_PRECISION>] { colDataType.setDataType(tk.image + (tk2!=null?" " + tk2.image:"")); }
 	| ( tk=<S_IDENTIFIER> | tk=<K_DATETIMELITERAL> | tk=<K_XML> | tk=<K_INTERVAL> | tk=<DT_ZONE> ) { colDataType.setDataType(tk.image); })
 
 	[LOOKAHEAD(2) "(" ( (tk=<S_LONG> | tk=<S_CHAR_LITERAL> | tk=<S_IDENTIFIER> ) { argumentsStringList.add(tk.image); } ["," {/*argumentsStringList.add(",");*/}] )*    ")"]

src/test/java/net/sf/jsqlparser/test/TestUtils.java

@@ -81,7 +81,7 @@ public static void assertStatementCanBeDeparsedAs(Statement parsed, String state
     public static String buildSqlString(String sql, boolean laxDeparsingCheck) {
     	sql = SQL_COMMENT_PATTERN.matcher(sql).replaceAll("");
         if (laxDeparsingCheck) {
-            return sql.replaceAll("\\s", " ").replaceAll("\\s+", " ").replaceAll("\\s*([/,()=+\\-*|\\]<>])\\s*", "$1").toLowerCase().trim();
+            return sql.replaceAll("\\s", " ").replaceAll("\\s+", " ").replaceAll("\\s*([!/,()=+\\-*|\\]<>])\\s*", "$1").toLowerCase().trim();
         } else {
             return sql;
         }

src/test/java/net/sf/jsqlparser/test/insert/InsertTest.java

@@ -177,4 +177,9 @@ public void testModifierPriority3() throws JSQLParserException {
     public void testIssue223() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("INSERT INTO user VALUES (2001, '\\'Clark\\'', 'Kent')");
     }
+    
+    @Test
+    public void testKeywordPrecisionIssue363() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("INSERT INTO test (user_id, precision) VALUES (1, '111')");
+    }
 }

src/test/java/net/sf/jsqlparser/test/select/SelectTest.java

@@ -2281,4 +2281,8 @@ public void testProblemKeywordCommitIssue341() throws JSQLParserException {
     public void testProblemSqlIssue352() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed( "SELECT @rowNO from (SELECT @rowNO from dual) r", true);
     }
+    
+    public void testProblemIsIssue331() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT C_DocType.C_DocType_ID,NULL,COALESCE(C_DocType_Trl.Name,C_DocType.Name) AS Name,C_DocType.IsActive FROM C_DocType LEFT JOIN C_DocType_TRL ON (C_DocType.C_DocType_ID=C_DocType_Trl.C_DocType_ID AND C_DocType_Trl.AD_Language='es_AR') WHERE C_DocType.AD_Client_ID=1010016 AND C_DocType.AD_Client_ID IN (0,1010016) AND C_DocType.c_doctype_id in ( select c_doctype2.c_doctype_id from c_doctype as c_doctype2 where substring( c_doctype2.printname,6, length(c_doctype2.printname) ) = ( select letra from c_letra_comprobante as clc where clc.c_letra_comprobante_id = 1010039) ) AND ( (1010094!=0 AND C_DocType.ad_org_id = 1010094) OR 1010094=0 ) ORDER BY 3 LIMIT 2000", true);
+    }
 }

src/test/java/net/sf/jsqlparser/test/update/UpdateTest.java

@@ -108,4 +108,8 @@ public void testUpdateDoesNotAllowLimitOffset() throws JSQLParserException {
 		parserManager.parse(new StringReader(statement));
 	}
 
+    @Test
+	public void testUpdateWithFunctions() throws JSQLParserException {
+		assertSqlCanBeParsedAndDeparsed("UPDATE tablename SET col = SUBSTRING(col2, 1, 2)");
+	}
 }

src/test/java/net/sf/jsqlparser/util/SelectUtilsTest.java

@@ -122,4 +122,13 @@ public void testTableAliasIssue311() {
         assertEquals("SELECT tab1.col1, tab1.col2, tab1.col3, tab2.b1, tab2.b2 FROM mytable1 AS tab1 LEFT JOIN mytable2 AS tab2 ON tab1.col1 = tab2.b1",
                     select.toString());
     }
+    
+    public void testTableAliasIssue311_2() {
+        Table table1 = new Table("mytable1");
+        table1.setAlias(new Alias("tab1"));
+
+        Column col = new Column(table1, "col1");
+        assertEquals("tab1.col1", col.toString());
+        assertEquals("mytable.col1", col.getFullyQualifiedName());
+    }
 }