fixes #540,#526

Author: wumpz

nb-configuration.xml

@@ -14,7 +14,7 @@
 		Any value defined here will override the pom.xml file value but is only applicable to the current project.
 		-->
         <netbeans.compile.on.save>none</netbeans.compile.on.save>
-        <com-junichi11-netbeans-changelf.enable>true</com-junichi11-netbeans-changelf.enable>
+        <com-junichi11-netbeans-changelf.enable>false</com-junichi11-netbeans-changelf.enable>
         <com-junichi11-netbeans-changelf.use-project>true</com-junichi11-netbeans-changelf.use-project>
         <com-junichi11-netbeans-changelf.lf-kind>LF</com-junichi11-netbeans-changelf.lf-kind>
         <com-junichi11-netbeans-changelf.use-global>false</com-junichi11-netbeans-changelf.use-global>

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

@@ -52,8 +52,8 @@ public InsertDeParser() {
      * @param expressionVisitor a {@link ExpressionVisitor} to de-parse
      * {@link net.sf.jsqlparser.expression.Expression}s. It has to share the same<br>
      * StringBuilder (buffer parameter) as this object in order to work
-     * @param selectVisitor a {@link SelectVisitor} to de-parse
-     * {@link net.sf.jsqlparser.statement.select.Select}s. It has to share the same<br>
+     * @param selectVisitor a {@link SelectVisitor} to de-parse {@link net.sf.jsqlparser.statement.select.Select}s. It
+     * has to share the same<br>
      * StringBuilder (buffer parameter) as this object in order to work
      * @param buffer the buffer that will be filled with the insert
      */
@@ -81,7 +81,8 @@ public void deParse(Insert insert) {
         }
         buffer.append("INTO ");
 
-        buffer.append(insert.getTable().getFullyQualifiedName());
+        buffer.append(insert.getTable().toString());
+
         if (insert.getColumns() != null) {
             buffer.append(" (");
             for (Iterator<Column> iter = insert.getColumns().iterator(); iter.hasNext();) {
@@ -115,7 +116,7 @@ public void deParse(Insert insert) {
                 buffer.append(")");
             }
         }
-        
+
         if (insert.isUseSet()) {
             buffer.append(" SET ");
             for (int i = 0; i < insert.getSetColumns().size(); i++) {

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

@@ -625,6 +625,8 @@ Insert Insert():
     boolean useSet = false;
     List<Column> setColumns = new ArrayList<Column>();
     List<Expression> setExpressionList = new ArrayList<Expression>();
+    String name = null;
+    boolean useAs = false;
 }
 {
     <K_INSERT>
@@ -634,7 +636,8 @@ Insert Insert():
     }]
     [<K_IGNORE>{ modifierIgnore = true; }]
     [<K_INTO>] table=Table()
-
+  
+    [ [<K_AS> { useAs = true; } ] name=RelObjectNameWithoutValue() { table.setAlias(new Alias(name,useAs)); }]
 
      [LOOKAHEAD(2) "(" tableColumn=Column() { columns.add(tableColumn); } ("," tableColumn=Column() { columns.add(tableColumn); } )* ")"  ]
     (
@@ -940,15 +943,18 @@ Column Column() #Column :
     }
 }
 
-String RelObjectName() :
+/*
+Not all names should be allowed for aliases.
+*/
+String RelObjectNameWithoutValue() : 
 {    Token tk = null; }
 {
     (tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>
       | tk=<K_CAST> | tk=<K_DO> | tk=<K_EXTRACT> | tk=<K_FIRST> | tk=<K_FOLLOWING> 
       | tk=<K_LAST> | tk=<K_MATERIALIZED> | tk=<K_NULLS> | tk=<K_PARTITION> | tk=<K_RANGE> 
-      | tk=<K_ROW> | tk=<K_ROWS> | tk=<K_SIBLINGS> | tk=<K_VALUE> | tk=<K_XML>
+      | tk=<K_ROW> | tk=<K_ROWS> | tk=<K_SIBLINGS> | tk=<K_XML>
       | 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_OPEN> | tk=<K_OVER> | 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_PRECISION>
       | tk=<K_INSERT>
@@ -958,7 +964,21 @@ String RelObjectName() :
 }
 
 /*
-Extended usage of object names.
+Normal names.
+*/
+String RelObjectName() :
+{    Token tk = null; String result = null; }
+{
+    (result = RelObjectNameWithoutValue() | tk=<K_VALUE> | tk=<K_VALUES>)
+
+    { 
+		if (tk!=null) result=tk.image;
+		return result; 
+	}
+}
+
+/*
+Extended version of object names.
 */
 String RelObjectNameExt():
 { Token tk = null;

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

@@ -267,4 +267,9 @@ public void testInsertSetWithDuplicateEliminationInDeparsing() throws JSQLParser
                 + "ON DUPLICATE KEY UPDATE col2 = col2 + 1, col3 = 'saint'");
     }
 
+    @Test
+    public void testInsertTableWithAliasIssue526() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("INSERT INTO account t (name, addr, phone) SELECT * FROM user");
+    }
+    
 }