Merge remote-tracking branch 'origin/master'

pom.xml

@@ -71,7 +71,7 @@
         <guava.version>19.0</guava.version>
         <checker.qual.version>3.10.0</checker.qual.version>
         <awaitility.version>4.2.0</awaitility.version>
-        <seatunnel-framework.version>2.3.2</seatunnel-framework.version>
+        <seatunnel-framework.version>2.3.3</seatunnel-framework.version>
         <oracle-jdbc.version>21.5.0.0</oracle-jdbc.version>
         <clickhouse.version>0.3.2-patch11</clickhouse.version>
         <postgresql.version>42.4.3</postgresql.version>

seatunnel-datasource/seatunnel-datasource-plugins/datasource-http/src/main/java/org/apache/seatunnel/datasource/plugin/http/HttpOptionRule.java

@@ -36,7 +36,7 @@ public class HttpOptionRule {
                     .withDescription("the default port to use for connections");
 
     public static final Option<Integer> REQUEST_PARAMS =
-            Options.key("requestparams")
+            Options.key("requestParams")
                     .intType()
                     .noDefaultValue()
                     .withDescription("the default port to use for connections");

seatunnel-datasource/seatunnel-datasource-plugins/datasource-jdbc-dameng/src/main/java/org/apache/seatunnel/datasource/plugin/demeng/jdbc/DamengJdbcDataSourceChannel.java

@@ -171,7 +171,7 @@ public class DamengJdbcDataSourceChannel implements DataSourceChannelExt {
 
             String sql =
                     " select * from  SYSCOLUMNS where id in (select id from  SYSOBJECTS where name='"
-                            + table.toUpperCase()
+                            + table
                             + "')";
             Statement statement = connection.createStatement();
             ResultSet resultSet = statement.executeQuery(sql);

seatunnel-datasource/seatunnel-datasource-plugins/datasource-jdbc-postgresql/src/main/java/org/apache/seatunnel/datasource/plugin/postgresql/jdbc/PostgresqlDataSourceChannel.java

@@ -139,23 +139,28 @@ public class PostgresqlDataSourceChannel implements DataSourceChannelExt {
                     }
 
                     tableField.setType(resultSet.getString("TYPE_NAME"));
-                    if (typeList.contains(tableField.getType().toLowerCase())) {
-                        tableField.setLen(resultSet.getString("CHARACTER_MAXIMUM_LENGTH"));
-                    } else {
-                        tableField.setLen(resultSet.getString("NUMERIC_PRECISION"));
-                        tableField.setScale(resultSet.getString("NUMERIC_SCALE"));
-                    }
-
-                    String extra = resultSet.getString("EXTRA");
-                    if (StringUtils.isNotBlank(extra)) {
-                        tableField.setHasAutoIncrement(true);
-                    }
+                    //                    if (typeList.contains(tableField.getType().toLowerCase()))
+                    // {
+                    // tableField.setLen(resultSet.getString("CHARACTER_MAXIMUM_LENGTH"));
+                    //                    } else {
+                    //
+                    // tableField.setLen(resultSet.getString("NUMERIC_PRECISION"));
+                    //
+                    // tableField.setScale(resultSet.getString("NUMERIC_SCALE"));
+                    //                                            }
+
+                    //                    String extra = resultSet.getString("EXTRA");
+                    //                    if (StringUtils.isNotBlank(extra)) {
+                    //                        tableField.setHasAutoIncrement(true);
+                    //                    }
                     tableField.setName(columnName);
 
                     tableField.setComment(resultSet.getString("REMARKS"));
-                    tableField.setDefaultValue(resultSet.getString("COLUMN_DEFAULT"));
+                    //
+                    // tableField.setDefaultValue(resultSet.getString("COLUMN_DEFAULT"));
                     Object nullable = resultSet.getObject("IS_NULLABLE");
-                    tableField.setNullable(Boolean.TRUE.toString().equals(nullable.toString()));
+                    //
+                    // tableField.setNullable(Boolean.TRUE.toString().equals(nullable.toString()));
                     tableFields.add(tableField);
                 }
             }