Merge pull request #242 from data-integrations/connector-spec-fix

Removed database from connector spec

Author: itsankit-google

cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLConnector.java

@@ -107,7 +107,6 @@ protected void setConnectorSpec(ConnectorSpecRequest request, DBConnectorPath pa
       .addRelatedPlugin(new PluginSpec(CloudSQLPostgreSQLConstants.PLUGIN_NAME,
                                        BatchSink.PLUGIN_TYPE, sinkProperties));
 
-    sinkProperties.put(ConnectionConfig.DATABASE, config.getDatabase());
     String schema = path.getSchema();
     if (schema != null) {
       sinkProperties.put(CloudSQLPostgreSQLSink.CloudSQLPostgreSQLSinkConfig.DB_SCHEMA_NAME, schema);

cloudsql-postgresql-plugin/widgets/CloudSQLPostgreSQL-batchsink.json

@@ -185,6 +185,10 @@
           "type": "property",
           "name": "password"
         },
+        {
+          "type": "property",
+          "name": "database"
+        },
         {
           "type": "property",
           "name": "connectionArguments"

oracle-plugin/src/main/java/io/cdap/plugin/oracle/OracleConnector.java

@@ -80,7 +80,6 @@ protected void setConnectorSpec(ConnectorSpecRequest request, DBConnectorPath pa
       .addRelatedPlugin(new PluginSpec(OracleConstants.PLUGIN_NAME, BatchSource.PLUGIN_TYPE, sourceProperties))
       .addRelatedPlugin(new PluginSpec(OracleConstants.PLUGIN_NAME, BatchSink.PLUGIN_TYPE, sinkProperties));
 
-    sinkProperties.put(OracleConstants.NAME_DATABASE, config.getDatabase());
     String schema = path.getSchema();
     if (schema != null) {
       sinkProperties.put(OracleSink.OracleSinkConfig.DB_SCHEMA_NAME, schema);

oracle-plugin/widgets/Oracle-batchsink.json

@@ -216,6 +216,10 @@
         {
           "type": "property",
           "name": "connectionArguments"
+        },
+        {
+          "type": "property",
+          "name": "database"
         }
       ]
     },

postgresql-plugin/src/main/java/io/cdap/plugin/postgres/PostgresConnector.java

@@ -81,7 +81,6 @@ protected void setConnectorSpec(ConnectorSpecRequest request, DBConnectorPath pa
       .addRelatedPlugin(new PluginSpec(PostgresConstants.PLUGIN_NAME, BatchSource.PLUGIN_TYPE, sourceProperties))
       .addRelatedPlugin(new PluginSpec(PostgresConstants.PLUGIN_NAME, BatchSink.PLUGIN_TYPE, sinkProperties));
 
-    sinkProperties.put(PostgresConnectorConfig.NAME_DATABASE, config.getDatabase());
     String schema = path.getSchema();
     if (schema != null) {
       sinkProperties.put(PostgresSink.PostgresSinkConfig.DB_SCHEMA_NAME, schema);

postgresql-plugin/widgets/Postgres-batchsink.json

@@ -157,6 +157,10 @@
           "type": "property",
           "name": "port"
         },
+        {
+          "type": "property",
+          "name": "database"
+        },
         {
           "type": "property",
           "name": "connectionArguments"