Merge branch 'release/V2.14.5'

Riverside-Software · Nov 29, 2021 · d80606f · d80606f
2 parents 645d363 + edc6baf
commit d80606f
Show file tree

Hide file tree

Showing 63 changed files with 807 additions and 719 deletions.
diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>coverage-report</artifactId>
-  <version>2.14.4</version>
+  <version>2.14.5</version>
 
   <name>JaCoCo report</name>
   <description>Fake module for code coverage report in SonarQube</description>
@@ -20,37 +20,37 @@
     <dependency>
       <groupId>eu.rssw.openedge.rcode</groupId>
       <artifactId>rcode-reader</artifactId>
-      <version>2.14.4</version>
+      <version>2.14.5</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.sonar.openedge</groupId>
       <artifactId>sonar-openedge-plugin</artifactId>
-      <version>2.14.4</version>
+      <version>2.14.5</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.14.4</version>
+      <version>2.14.5</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>2.14.4</version>
+      <version>2.14.5</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>2.14.4</version>
+      <version>2.14.5</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>2.14.4</version>
+      <version>2.14.5</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.checks</groupId>
       <artifactId>openedge-checks</artifactId>
-      <version>2.14.4</version>
+      <version>2.14.5</version>
     </dependency>
   </dependencies>
 
@@ -60,7 +60,7 @@
         <plugin>
           <groupId>org.sonarsource.scanner.maven</groupId>
           <artifactId>sonar-maven-plugin</artifactId>
-          <version>3.7.0.1746</version>
+          <version>3.9.0.2155</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -69,7 +69,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
         <executions>
           <execution>
             <goals>

diff --git a/database-parser/pom.xml b/database-parser/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>database-parser</artifactId>
-  <version>2.14.4</version>
+  <version>2.14.5</version>
 
   <name>OpenEdge database definition lexer and parser</name>
   <description>OpenEdge dump files parser</description>
@@ -56,12 +56,12 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>30.1.1-jre</version>
+      <version>31.0.1-jre</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.30</version>
+      <version>1.7.32</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.7.30</version>
+      <version>1.7.32</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -83,7 +83,7 @@
         <plugin>
           <groupId>org.sonarsource.scanner.maven</groupId>
           <artifactId>sonar-maven-plugin</artifactId>
-          <version>3.7.0.1746</version>
+          <version>3.9.0.2155</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -92,7 +92,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
         <executions>
           <execution>
             <goals>

diff --git a/database-parser/src/main/antlr4/eu/rssw/antlr/database/DumpFileGrammar.g4 b/database-parser/src/main/antlr4/eu/rssw/antlr/database/DumpFileGrammar.g4
@@ -296,6 +296,9 @@ addConstraintOption:
 footer:
  '.' 'PSC'? ('bufpool' '=' 'yes')? (UNQUOTED_STRING '=' UNQUOTED_STRING)? ( '.' NUMBER? )?;
 
+SINGLE_LINE_COMMENT:
+  '#' ~[\r\n]* -> channel(HIDDEN);
+
 fragment INT:
   ('0'..'9');
 

diff --git a/database-parser/src/main/java/eu/rssw/antlr/database/DumpFileVisitor.java b/database-parser/src/main/java/eu/rssw/antlr/database/DumpFileVisitor.java
@@ -48,6 +48,7 @@
 import eu.rssw.antlr.database.DumpFileGrammarParser.TableAreaContext;
 import eu.rssw.antlr.database.DumpFileGrammarParser.TableDescriptionContext;
 import eu.rssw.antlr.database.DumpFileGrammarParser.TableDumpNameContext;
+import eu.rssw.antlr.database.DumpFileGrammarParser.TableFrozenContext;
 import eu.rssw.antlr.database.DumpFileGrammarParser.TableTriggerContext;
 import eu.rssw.antlr.database.DumpFileGrammarParser.TableValMsgContext;
 import eu.rssw.antlr.database.DumpFileGrammarParser.UpdateIndexBPContext;
@@ -226,6 +227,14 @@ public Void visitTableTrigger(TableTriggerContext ctx) {
     return null;
   }
 
+  @Override
+  public Void visitTableFrozen(TableFrozenContext ctx) {
+    if (!tables.isEmpty())
+      tables.peek().setFrozen(true);
+
+    return null;
+  }
+
   // *************
   // INDEX SECTION
   // *************

diff --git a/database-parser/src/main/java/eu/rssw/antlr/database/objects/Table.java b/database-parser/src/main/java/eu/rssw/antlr/database/objects/Table.java
@@ -29,6 +29,7 @@ public class Table {
   private String description;
   private String dumpName;
   private String valMsg;
+  private boolean frozen;
 
   private Collection<Field> fields = new ArrayList<>();
   private Collection<Index> indexes = new ArrayList<>();
@@ -53,6 +54,14 @@ public void setArea(String area) {
     this.area = area;
   }
 
+  public boolean isFrozen() {
+    return frozen;
+  }
+
+  public void setFrozen(boolean frozen) {
+    this.frozen = frozen;
+  }
+
   public String getLabel() {
     return label;
   }

diff --git a/database-parser/src/test/java/eu/rssw/antlr/database/TestDumpFile.java b/database-parser/src/test/java/eu/rssw/antlr/database/TestDumpFile.java
@@ -22,6 +22,7 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
@@ -53,6 +54,15 @@ public void testInputStream() throws IOException {
     assertEquals(db2.getTable("Tbl1").getDescription(), "Ã©Ã§");
   }
 
+  @Test
+  public void testComments() throws IOException {
+    InputStream stream = new FileInputStream("src/test/resources/comments.df");
+    DatabaseDescription db = DumpFileUtils.getDatabaseDescription(stream, Charset.forName("utf-8"), "sp2k");
+    assertNull(db.getTable("Tbl1").getDescription());
+    assertEquals(db.getTable("Tbl1").getArea(), "XXX");
+    assertTrue(db.getTable("Tbl1").isFrozen());
+  }
+
   @Test
   public void testSports2000() throws IOException {
     DatabaseDescription db = DumpFileUtils.getDatabaseDescription(new File("src/test/resources/sp2k.df"));

diff --git a/database-parser/src/test/resources/ascIndex.df b/database-parser/src/test/resources/ascIndex.df
@@ -11,7 +11,7 @@ ADD FIELD "Fld2" OF "Tab1" AS character
   FORMAT "x(24)"
   MANDATORY
 
-ADD FIELD "Fld2" OF "Tab1" AS character
+ADD FIELD "Fld3" OF "Tab1" AS character
   FORMAT "x(24)"
   MANDATORY
 

diff --git a/database-parser/src/test/resources/comments.df b/database-parser/src/test/resources/comments.df
@@ -0,0 +1,12 @@
+# Comment here, just make sure it doesn't break anything
+# Nested (?) # comments
+ADD TABLE "Tbl1"
+  AREA "XXX" # Comment on area name
+  # DESCRIPTION "xyz"
+  FROZEN
+
+.
+PSC
+cpstream=iso8859-1
+.
+0000000000
diff --git a/listing-parser/pom.xml b/listing-parser/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>listing-parser</artifactId>
-  <version>2.14.4</version>
+  <version>2.14.5</version>
 
   <name>OpenEdge listing so-called parser</name>
   <description>OpenEdge listing files parser</description>
@@ -49,12 +49,12 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>30.1.1-jre</version>
+      <version>31.0.1-jre</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.30</version>
+      <version>1.7.32</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.7.30</version>
+      <version>1.7.32</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -76,7 +76,7 @@
         <plugin>
           <groupId>org.sonarsource.scanner.maven</groupId>
           <artifactId>sonar-maven-plugin</artifactId>
-          <version>3.7.0.1746</version>
+          <version>3.9.0.2155</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -85,7 +85,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
         <executions>
           <execution>
             <goals>

diff --git a/openedge-checks/pom.xml b/openedge-checks/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.checks</groupId>
   <artifactId>openedge-checks</artifactId>
-  <version>2.14.4</version>
+  <version>2.14.5</version>
 
   <name>OpenEdge checks</name>
   <description>OpenEdge checks</description>
@@ -49,18 +49,18 @@
     <dependency>
       <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
-      <version>7.9.4</version>
+      <version>7.9.6</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>2.14.4</version>
+      <version>2.14.5</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.14.4</version>
+      <version>2.14.5</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.7.30</version>
+      <version>1.7.32</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -82,7 +82,7 @@
         <plugin>
           <groupId>org.sonarsource.scanner.maven</groupId>
           <artifactId>sonar-maven-plugin</artifactId>
-          <version>3.7.0.1746</version>
+          <version>3.9.0.2155</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -91,7 +91,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
         <executions>
           <execution>
             <goals>

diff --git a/openedge-checks/src/main/java/org/sonar/plugins/openedge/api/objects/TableWrapper.java b/openedge-checks/src/main/java/org/sonar/plugins/openedge/api/objects/TableWrapper.java
@@ -129,4 +129,8 @@ public int getStoretype() {
     return IConstants.ST_DBTABLE;
   }
 
+  @Override
+  public boolean isNoUndo() {
+    return false;
+  }
 }