Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix #1758: columns duplicated in Postgres structure (#1767)

Browse Source
This commit is contained in:
Shrikant Sharat Kandula 2020-11-18 11:19:55 +05:30 committed by GitHub
parent 2c2aa06e32
commit 2ca15ba57d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/PostgresPlugin.java vendored
View File

@ -79,7 +79,7 @@ public class PostgresPlugin extends BasePlugin {
" left join pg_catalog.pg_type t1 on t1.oid = a.atttypid\n" +
" inner join pg_catalog.pg_class c on a.attrelid = c.oid\n" +
" left join pg_catalog.pg_namespace n on c.relnamespace = n.oid\n" +
" left join pg_catalog.pg_attrdef d on d.adrelid = c.oid\n" +
" left join pg_catalog.pg_attrdef d on d.adrelid = c.oid and d.adnum = a.attnum\n" +
"where a.attnum > 0\n" +
" and not a.attisdropped\n" +
" and n.nspname not in ('information_schema', 'pg_catalog')\n" +

24
app/server/appsmith-plugins/postgresPlugin/src/test/java/com/external/plugins/PostgresPluginTest.java vendored
View File

@ -104,6 +104,12 @@ public class PostgresPluginTest {
" user_id int NOT NULL,\n" +
" constraint user_fk foreign key (user_id) references users(id)" +
")");
// Testing <https://github.com/appsmithorg/appsmith/issues/1758>.
statement.execute("CREATE TABLE campus (\n" +
" id timestamptz default now(),\n" +
" name timestamptz default now()\n" +
")");
}
try (Statement statement = connection.createStatement()) {
@ -277,9 +283,21 @@ public class PostgresPluginTest {
StepVerifier.create(structureMono)
.assertNext(structure -> {
assertNotNull(structure);
assertEquals(2, structure.getTables().size());
assertEquals(3, structure.getTables().size());
final DatasourceStructure.Table possessionsTable = structure.getTables().get(0);
final DatasourceStructure.Table campusTable = structure.getTables().get(0);
assertEquals("public.campus", campusTable.getName());
assertEquals(DatasourceStructure.TableType.TABLE, campusTable.getType());
assertArrayEquals(
new DatasourceStructure.Column[]{
new DatasourceStructure.Column("id", "timestamptz", "now()"),
new DatasourceStructure.Column("name", "timestamptz", "now()")
},
campusTable.getColumns().toArray()
);
assertEquals(campusTable.getKeys().size(), 0);
final DatasourceStructure.Table possessionsTable = structure.getTables().get(1);
assertEquals("public.possessions", possessionsTable.getName());
assertEquals(DatasourceStructure.TableType.TABLE, possessionsTable.getType());
assertArrayEquals(
@ -318,7 +336,7 @@ public class PostgresPluginTest {
possessionsTable.getTemplates().toArray()
);
final DatasourceStructure.Table usersTable = structure.getTables().get(1);
final DatasourceStructure.Table usersTable = structure.getTables().get(2);
assertEquals("public.users", usersTable.getName());
assertEquals(DatasourceStructure.TableType.TABLE, usersTable.getType());
assertArrayEquals(