Improve print table to set the number of rows

Clean the API
orbisgis · Sep 19, 2024 · 0f68f64 · 0f68f64
1 parent 7e21125
commit 0f68f64
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 840 deletions.
diff --git a/.github/workflows/CI build.yml b/.github/workflows/CI build.yml
@@ -18,11 +18,11 @@ jobs:
     steps:
       # Checkout the source code of the project
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       # Setup the jdk using version 11 of Adoptium Temurin
       - name: Setup java 11 using Adoptium Temurin
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'

diff --git a/.github/workflows/CI release.yml b/.github/workflows/CI release.yml
@@ -14,11 +14,11 @@ jobs:
     steps:
       # Checkout the source code of the project
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       # Setup the jdk using version 11 of Adoptium Temurin
       - name: Setup java 11 using Adoptium Temurin
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'

diff --git a/.github/workflows/CI snapshot.yml b/.github/workflows/CI snapshot.yml
@@ -17,11 +17,11 @@ jobs:
     steps:
       # Checkout the source code of the project
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       # Setup the jdk using version 11 of Adoptium Temurin
       - name: Setup java 11 using Adoptium Temurin
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'

diff --git a/data/data-api/src/main/java/org/orbisgis/data/api/dataset/IColumn.java b/data/data-api/src/main/java/org/orbisgis/data/api/dataset/IColumn.java
diff --git a/data/data-api/src/main/java/org/orbisgis/data/api/dataset/IJdbcColumn.java b/data/data-api/src/main/java/org/orbisgis/data/api/dataset/IJdbcColumn.java
diff --git a/data/data-api/src/main/java/org/orbisgis/data/api/datasource/IJdbcDataSource.java b/data/data-api/src/main/java/org/orbisgis/data/api/datasource/IJdbcDataSource.java
@@ -1145,8 +1145,16 @@ default void setProperty(String propertyName, Object newValue) {
 
     /**
      * Print the content of the table
-     * @param tableName
+     * @param tableName name of table
      */
     void print(String tableName) throws Exception;
 
+
+    /**
+     * Print the content of the table
+     * @param tableName name of the table
+     * @param numberOfRows number of rows to print
+     */
+    void print(String tableName, int numberOfRows) throws Exception;
+
 }
diff --git a/data/data-api/src/test/java/org/orbisgis/data/api/datasource/IJdbcDataSourceTest.java b/data/data-api/src/test/java/org/orbisgis/data/api/datasource/IJdbcDataSourceTest.java
@@ -523,6 +523,11 @@ public boolean isEmpty(String tableName) {
         public void print(String tableName) {
         }
 
+        @Override
+        public void print(String tableName, int numberOfRows) throws Exception {
+
+        }
+
         @Override
         public String link(Map dataSourceProperties, String tableName) {
             return null;

diff --git a/data/h2gis/src/test/groovy/org/orbisgis/data/GroovyH2GISTest.groovy b/data/h2gis/src/test/groovy/org/orbisgis/data/GroovyH2GISTest.groovy
@@ -1105,8 +1105,9 @@ class GroovyH2GISTest {
                 INSERT INTO orbisgis VALUES (1, 'POINT(10 10)'::GEOMETRY, 'just a string a bit too long'), 
                 (2, 'POINT(1 1)'::GEOMETRY, 'another string');
         """)
+        h2GIS.print("orbisgis", -1)
         h2GIS.print("orbisgis")
-        h2GIS.print("(SELECT * FROM generate_series(0, 10000) where x > 1000 limit 10)")
+        h2GIS.print("(SELECT * FROM generate_series(0, 10000))", 10)
         h2GIS.print("(SELECT * FROM generate_series(0, 10000))")
     }