fixing up.

Author: AbhishekKumar9984

amazon-redshift-plugin/docs/Redshift-batchsource.md

@@ -31,6 +31,10 @@ contain the '$CONDITIONS' string. For example, 'SELECT * FROM table WHERE $CONDI
 The '$CONDITIONS' string will be replaced by 'splitBy' field limits specified by the bounding query.
 The '$CONDITIONS' string is not required if numSplits is set to one.
 
+**ImportQueryType**  - determines how data is extracted—either by using a Table Name or a custom Import Query.
+
+* **TableName**: Extracts data directly from a specified database table.
+
 **Bounding Query:** Bounding Query should return the min and max of the values of the 'splitBy' field.
 For example, 'SELECT MIN(id),MAX(id) FROM table'. Not required if numSplits is set to one.
 

database-commons/src/main/java/io/cdap/plugin/db/source/AbstractDBSource.java

@@ -49,6 +49,7 @@
 import io.cdap.plugin.db.DBRecord;
 import io.cdap.plugin.db.SchemaReader;
 import io.cdap.plugin.db.TransactionIsolationLevel;
+import io.cdap.plugin.db.config.AbstractDBSpecificSourceConfig;
 import io.cdap.plugin.db.config.DatabaseSourceConfig;
 import io.cdap.plugin.util.DBUtils;
 import io.cdap.plugin.util.DriverCleanup;
@@ -164,9 +165,9 @@ public Schema getSchema() throws SQLException {
     try (Connection connection = getConnection()) {
       executeInitQueries(connection, sourceConfig.getInitQueries());
       String query = sourceConfig.getImportQuery();
-      if ("importQuery".equalsIgnoreCase(sourceConfig.getImportQueryType())) {
+      if (AbstractDBSpecificSourceConfig.IMPORT_QUERY.equalsIgnoreCase(sourceConfig.getImportQueryType())) {
         return loadSchemaFromDBwithQuery(connection, query);
-      } else if ("tableName".equalsIgnoreCase(sourceConfig.getImportQueryType())) {
+      } else if (AbstractDBSpecificSourceConfig.TABLE_NAME.equalsIgnoreCase(sourceConfig.getImportQueryType())) {
         List<Schema.Field> fields = getSchemaReader().getSchemaFields(connection, sourceConfig.getTableName());
         return Schema.recordOf("schema", fields);
       } else {
@@ -210,7 +211,7 @@ private Schema loadSchemaFromDB(Class<? extends Driver> driverClass)
       executeInitQueries(connection, sourceConfig.getInitQueries());
       String importQuery = sourceConfig.getImportQuery();
       String tableName = sourceConfig.getTableName();
-      if ("importQuery".equalsIgnoreCase(sourceConfig.getImportQueryType())) {
+      if (AbstractDBSpecificSourceConfig.IMPORT_QUERY.equalsIgnoreCase(sourceConfig.getImportQueryType())) {
         return loadSchemaFromDBwithQuery(connection, importQuery);
       } else {
         return loadSchemaFromDBwithTableName(connection, tableName);
@@ -429,25 +430,6 @@ private String getJDBCPluginId() {
     return String.format("%s.%s.%s", "source", ConnectionConfig.JDBC_PLUGIN_TYPE, sourceConfig.getJdbcPluginName());
   }
 
-  private Schema.Type mapSqlTypeToSchemaType(int sqlType) {
-    switch (sqlType) {
-      case Types.INTEGER: return Schema.Type.INT;
-      case Types.BIGINT: return Schema.Type.LONG;
-      case Types.FLOAT:
-      case Types.REAL:
-      case Types.DOUBLE: return Schema.Type.DOUBLE;
-      case Types.VARCHAR:
-      case Types.CHAR:
-      case Types.LONGVARCHAR: return Schema.Type.STRING;
-      case Types.BOOLEAN:
-      case Types.BIT: return Schema.Type.BOOLEAN;
-      case Types.DATE:
-      case Types.TIMESTAMP:
-      default: return Schema.Type.STRING;
-    }
-  }
-
-
   protected abstract String createConnectionString();
 
   /**

postgresql-plugin/docs/Postgres-batchsource.md

@@ -38,6 +38,10 @@ contain the '$CONDITIONS' string. For example, 'SELECT * FROM table WHERE $CONDI
 The '$CONDITIONS' string will be replaced by 'splitBy' field limits specified by the bounding query.
 The '$CONDITIONS' string is not required if numSplits is set to one.
 
+**ImportQueryType**  - determines how data is extracted—either by using a Table Name or a custom Import Query.
+
+* **TableName**: Extracts data directly from a specified database table.
+
 **Bounding Query:** Bounding Query should return the min and max of the values of the 'splitBy' field.
 For example, 'SELECT MIN(id),MAX(id) FROM table'. Not required if numSplits is set to one.