fix: restore lines dropped during conflict resolution and fix LOAD DATA lookahead

The merge of master resolved 26 conflict hunks by concatenating both
sides while dropping the closing braces, @OverRide annotations and
return statements that git had hoisted out of the conflict markers,
leaving 6 visitor/deparser classes and the grammar unparseable.

Also exclude LOAD DATA from the ExtensionStatement lookahead so
BigQuery's LOAD DATA statement is not swallowed by DuckDB's
LOAD extension alternative.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: hayssams

src/main/java/net/sf/jsqlparser/statement/StatementFeatureVisitor.java

@@ -529,6 +529,10 @@ public <S> Void visit(Drop drop, S context) {
     public <S> Void visit(PragmaStatement pragmaStatement, S context) {
         analysis.claimTopLevel();
         analysis.certain(StmtFeature.MODIFIES_SESSION);
+        return null;
+    }
+
+    @Override
     public <S> Void visit(AssertStatement assertStatement, S context) {
         analysis.claimTopLevel();
         analysis.certain(StmtFeature.READS_DATA);
@@ -586,6 +590,12 @@ public <S> Void visit(DeallocateStatement deallocateStatement, S context) {
 
     @Override
     public <S> Void visit(CopyStatement copyStatement, S context) {
+        analysis.claimTopLevel();
+        analysis.certain(StmtFeature.READS_DATA, StmtFeature.MODIFIES_DATA);
+        return null;
+    }
+
+    @Override
     public <S> Void visit(ExportDataStatement exportDataStatement, S context) {
         analysis.claimTopLevel();
         analysis.certain(StmtFeature.READS_DATA, StmtFeature.MODIFIES_DATA);
@@ -603,6 +613,10 @@ public <S> Void visit(CreateMacro createMacro, S context) {
     public <S> Void visit(CreateExtensionRepository createExtensionRepository, S context) {
         analysis.claimTopLevel();
         analysis.certain(StmtFeature.MODIFIES_SCHEMA);
+        return null;
+    }
+
+    @Override
     public <S> Void visit(LoadDataStatement loadDataStatement, S context) {
         analysis.claimTopLevel();
         analysis.certain(StmtFeature.MODIFIES_DATA);

src/main/java/net/sf/jsqlparser/statement/StatementVisitor.java

@@ -439,6 +439,8 @@ default void visit(CreateMacro createMacro) {
 
     default void visit(CreateExtensionRepository createExtensionRepository) {
         this.visit(createExtensionRepository, null);
+    }
+
     <S> T visit(AssertStatement assertStatement, S context);
 
     default void visit(AssertStatement assertStatement) {

src/main/java/net/sf/jsqlparser/statement/StatementVisitorAdapter.java

@@ -622,12 +622,20 @@ public <S> T visit(RenameTableStatement renameTableStatement, S context) {
 
     @Override
     public <S> T visit(PragmaStatement pragmaStatement, S context) {
+        return null;
+    }
+
+    @Override
     public <S> T visit(AssertStatement assertStatement, S context) {
         return null;
     }
 
     @Override
     public <S> T visit(ExtensionStatement extensionStatement, S context) {
+        return null;
+    }
+
+    @Override
     public <S> T visit(ExportDataStatement exportDataStatement, S context) {
         return null;
     }
@@ -674,6 +682,10 @@ public <S> T visit(CreateMacro createMacro, S context) {
 
     @Override
     public <S> T visit(CreateExtensionRepository createExtensionRepository, S context) {
+        return null;
+    }
+
+    @Override
     public <S> T visit(LoadDataStatement loadDataStatement, S context) {
         return null;
     }

src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java

@@ -2519,6 +2519,10 @@ public void visit(RenameTableStatement renameTableStatement) {
     @Override
     public <S> Void visit(PragmaStatement pragmaStatement, S context) {
         // no tables involved in this statement
+        return null;
+    }
+
+    @Override
     public <S> Void visit(AssertStatement assertStatement, S context) {
         assertStatement.getExpression().accept(this, context);
         return null;
@@ -2532,6 +2536,10 @@ public void visit(PragmaStatement pragmaStatement) {
     @Override
     public <S> Void visit(ExtensionStatement extensionStatement, S context) {
         // no tables involved in this statement
+        return null;
+    }
+
+    @Override
     public void visit(AssertStatement assertStatement) {
         StatementVisitor.super.visit(assertStatement);
     }
@@ -2550,6 +2558,10 @@ public void visit(ExtensionStatement extensionStatement) {
     @Override
     public <S> Void visit(AttachStatement attachStatement, S context) {
         // no tables involved in this statement
+        return null;
+    }
+
+    @Override
     public void visit(ExportDataStatement exportDataStatement) {
         StatementVisitor.super.visit(exportDataStatement);
     }
@@ -2657,6 +2669,9 @@ public <S> Void visit(CreateExtensionRepository createExtensionRepository, S con
     @Override
     public void visit(CreateExtensionRepository createExtensionRepository) {
         StatementVisitor.super.visit(createExtensionRepository);
+    }
+
+    @Override
     public void visit(LoadDataStatement loadDataStatement) {
         StatementVisitor.super.visit(loadDataStatement);
     }

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

@@ -576,6 +576,10 @@ public <S> StringBuilder visit(RenameTableStatement renameTableStatement, S cont
     @Override
     public <S> StringBuilder visit(PragmaStatement pragmaStatement, S context) {
         pragmaStatement.appendTo(builder);
+        return builder;
+    }
+
+    @Override
     public <S> StringBuilder visit(AssertStatement assertStatement, S context) {
         assertStatement.appendTo(builder);
         return builder;
@@ -584,6 +588,10 @@ public <S> StringBuilder visit(AssertStatement assertStatement, S context) {
     @Override
     public <S> StringBuilder visit(ExtensionStatement extensionStatement, S context) {
         extensionStatement.appendTo(builder);
+        return builder;
+    }
+
+    @Override
     public <S> StringBuilder visit(ExportDataStatement exportDataStatement, S context) {
         exportDataStatement.appendTo(builder);
         return builder;
@@ -640,6 +648,10 @@ public <S> StringBuilder visit(CreateMacro createMacro, S context) {
     @Override
     public <S> StringBuilder visit(CreateExtensionRepository createExtensionRepository, S context) {
         createExtensionRepository.appendTo(builder);
+        return builder;
+    }
+
+    @Override
     public <S> StringBuilder visit(LoadDataStatement loadDataStatement, S context) {
         loadDataStatement.appendTo(builder);
         return builder;

src/main/java/net/sf/jsqlparser/util/validation/validator/StatementValidator.java

@@ -487,13 +487,23 @@ public <S> Void visit(RenameTableStatement renameTableStatement, S context) {
 
     @Override
     public <S> Void visit(PragmaStatement pragmaStatement, S context) {
+        // TODO: not yet implemented
+        return null;
+    }
+
+    @Override
     public <S> Void visit(AssertStatement assertStatement, S context) {
         // TODO: not yet implemented
         return null;
     }
 
     @Override
     public <S> Void visit(ExtensionStatement extensionStatement, S context) {
+        // TODO: not yet implemented
+        return null;
+    }
+
+    @Override
     public <S> Void visit(ExportDataStatement exportDataStatement, S context) {
         // TODO: not yet implemented
         return null;
@@ -549,6 +559,11 @@ public <S> Void visit(CreateMacro createMacro, S context) {
 
     @Override
     public <S> Void visit(CreateExtensionRepository createExtensionRepository, S context) {
+        // TODO: not yet implemented
+        return null;
+    }
+
+    @Override
     public <S> Void visit(LoadDataStatement loadDataStatement, S context) {
         // TODO: not yet implemented
         return null;
@@ -812,6 +827,8 @@ public void visit(CreateMacro createMacro) {
 
     public void visit(CreateExtensionRepository createExtensionRepository) {
         visit(createExtensionRepository, null);
+    }
+
     public void visit(AssertStatement assertStatement) {
         visit(assertStatement, null);
     }

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

@@ -3051,7 +3051,8 @@ Statement SingleStatement() :
             |
             LOOKAHEAD({ getToken(1).kind == K_PRAGMA }) stm = PragmaStatement()
             |
-            LOOKAHEAD({ getToken(1).kind == K_INSTALL || getToken(1).kind == K_LOAD
+            LOOKAHEAD({ getToken(1).kind == K_INSTALL
+                    || (getToken(1).kind == K_LOAD && getToken(2).kind != K_DATA)
                     || (getToken(1).kind == K_FORCE && getToken(2).kind == K_INSTALL) })
             stm = ExtensionStatement()
             |
@@ -3070,6 +3071,7 @@ Statement SingleStatement() :
             LOOKAHEAD({ getToken(1).kind == K_DEALLOCATE }) stm = DeallocateStatement()
             |
             LOOKAHEAD({ getToken(1).kind == K_COPY }) stm = CopyStatement()
+            |
             LOOKAHEAD({ getToken(1).kind == K_ASSERT }) stm = AssertStatement()
             |
             LOOKAHEAD({ getToken(1).kind == K_EXPORT && getToken(2).kind == K_DATA }) stm = ExportDataStatement()
@@ -4756,6 +4758,9 @@ PragmaStatement PragmaStatement() #PragmaStatement:
         )
     ]
     { return pragmaStatement; }
+}
+
+/**
  * BigQuery's LOAD DATA {INTO | OVERWRITE} table [(column_definitions)] [OPTIONS (option_list)]
  * FROM FILES (file_options) [WITH PARTITION COLUMNS] [WITH CONNECTION connection].
  */