Skip to content

Fix pgsql table ddl #1430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
openai0229 wants to merge 7 commits into
base: dev
Choose a base branch
from
Open

Fix pgsql table ddl #1430

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6d254be
fix(chat2db-dm): correct spelling of NUMERIC in DMColumnTypeEnum
pdxzzz Jun 13, 2024
959f825
Revert "fix(chat2db-dm): correct spelling of NUMERIC in DMColumnTypeE…
pdxzzz Jun 13, 2024
931b316
fix-pgsql-table-ddl
pdxzzz Jun 15, 2024
5727306
Merge branch 'dev' into fix-pgsql-table-ddl
openai0229 Jun 15, 2024
03cfa4a
fix-pgsql-table-ddl
pdxzzz Jun 15, 2024
fb14ae3
fix serial
pdxzzz Jun 18, 2024
f05d151
fix(postgres): correct table options
pdxzzz Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix(postgres): correct table options
  • Loading branch information
@pdxzzz
pdxzzz committed Jun 18, 2024
commit f05d1512c5dcee6bf8d8798c3c60477b49f200df
4 changes: 2 additions & 2 deletions ...ins/chat2db-postgresql/src/main/java/ai/chat2db/plugin/postgresql/PostgreSQLMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ public String tableDDL(Connection connection, String databaseName, String schema
String tableOptions = resultSet.getString("table_options");
if (StringUtils.isNotBlank(tableOptions)) {
tableOptions = tableOptions.replace("{", "(").replace("}", ")");
return optionBuilder.append("with ").append(tableOptions).toString();
return optionBuilder.append(" with ").append(tableOptions).toString();
}
}
return null;
Expand Down Expand Up @@ -380,7 +380,7 @@ public String tableDDL(Connection connection, String databaseName, String schema
});
if (subTable) {
if (StringUtils.isNotBlank(options)) {
ddlBuilder.append("WITH ").append(options);
ddlBuilder.append(options);
}
return ddlBuilder.append("\n").append(tablespace).toString();
}
Expand Down
2 changes: 1 addition & 1 deletion ...server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/TableServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ private long addDBCache(Long dataSourceId, String databaseName, String schemaNam
Connection connection = Chat2DBContext.getConnection();
long n = 0;
try (ResultSet resultSet = connection.getMetaData().getTables(databaseName, schemaName, null,
new String[]{"TABLE", "SYSTEM TABLE","PARTITIONED TABLE"})) {
new String[]{"TABLE", "SYSTEM TABLE"})) {
List<TableCacheDO> cacheDOS = new ArrayList<>();
while (resultSet.next()) {
TableCacheDO tableCacheDO = new TableCacheDO();
Expand Down