Merge pull request #459 from data-integrations/PLUGIN-1681

[PLUGIN-1681] Add macro support back for database config in postgres connector

postgresql-plugin/src/e2e-test/features/postgresql/source/PostgresqlDesignTimeWithMacro.feature

@@ -28,7 +28,7 @@ Feature: PostgreSQL source- Verify PostgreSQL source plugin design time macro sc
     Then Click on the Macro button of Property: "user" and set the value to: "postGreSQLUser"
     Then Click on the Macro button of Property: "password" and set the value to: "postGreSQLPassword"
     Then Click on the Macro button of Property: "connectionArguments" and set the value to: "postGreSQLConnectionArguments"
-    Then Replace input plugin property: "database" with value: "databaseName"
+    Then Click on the Macro button of Property: "database" and set the value to: "postGreSQLDatabase"
     Then Enter input plugin property: "referenceName" with value: "sourceRef"
     Then Enter textarea plugin property: "importQuery" with value: "selectQuery"
     Then Validate "PostgreSQL" plugin properties

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

@@ -17,6 +17,7 @@
 package io.cdap.plugin.postgres;
 
 import io.cdap.cdap.api.annotation.Description;
+import io.cdap.cdap.api.annotation.Macro;
 import io.cdap.cdap.api.annotation.Name;
 import io.cdap.plugin.db.connector.AbstractDBSpecificConnectorConfig;
 
@@ -38,6 +39,7 @@ public PostgresConnectorConfig(String host, int port, String user, String passwo
 
   @Name(NAME_DATABASE)
   @Description("Database to connect to.")
+  @Macro
   private String database;
 
   @Override