liuxm/screw
1
0
Fork 0
forked from lxm_tools/screw
Code Issues Pull Requests Projects Releases Wiki Activity

♻️ 重构代码

Browse Source
This commit is contained in:
SanLi
2020-08-26 16:22:07 +08:00
parent bb9bfebec5
commit cc88d5d5b1
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
screw-core/src/main/java/cn/smallbun/screw/core/query/oracle/OracleDataBaseQuery.java
View File

@@ -141,9 +141,9 @@ public class OracleDataBaseQuery extends AbstractDatabaseQuery {
if (CollectionUtils.isEmpty(columnsCaching)) {
//查询全部
if (table.equals(PERCENT_SIGN)) {
String sql = "SELECT ut.TABLE_NAME, -- 表名称 ut.COLUMN_NAME,--字段名称 uc.comments as REMARKS,--字段注释 concat(concat(concat(ut.DATA_TYPE, '('), ut.DATA_LENGTH), ')') AS COLUMN_TYPE,--字典类型 ut.DATA_LENGTH as COLUMN_LENGTH--字典长度 FROM user_tab_columns ut INNER JOIN user_col_comments uc ON ut.TABLE_NAME = uc.table_name AND ut.COLUMN_NAME = uc.column_name";
String sql = "SELECT ut.TABLE_NAME, ut.COLUMN_NAME, uc.comments as REMARKS, concat(concat(concat(ut.DATA_TYPE, '('), ut.DATA_LENGTH), ')') AS COLUMN_TYPE, ut.DATA_LENGTH as COLUMN_LENGTH FROM user_tab_columns ut INNER JOIN user_col_comments uc ON ut.TABLE_NAME = uc.table_name AND ut.COLUMN_NAME = uc.column_name";
if (isDda()) {
sql = "SELECT ut.TABLE_NAME, -- 表名称 ut.COLUMN_NAME,--字段名称 uc.comments as REMARKS,--字段注释 concat(concat(concat(ut.DATA_TYPE, '('), ut.DATA_LENGTH), ')') AS COLUMN_TYPE,--字典类型 ut.DATA_LENGTH as COLUMN_LENGTH--字典长度 FROM dba_tab_columns ut INNER JOIN dba_col_comments uc ON ut.TABLE_NAME = uc.table_name AND ut.COLUMN_NAME = uc.column_name and ut.OWNER = uc.OWNER WHERE ut.OWNER = '"
sql = "SELECT ut.TABLE_NAME, ut.COLUMN_NAME, uc.comments as REMARKS, concat(concat(concat(ut.DATA_TYPE, '('), ut.DATA_LENGTH), ')') AS COLUMN_TYPE, ut.DATA_LENGTH as COLUMN_LENGTH FROM dba_tab_columns ut INNER JOIN dba_col_comments uc ON ut.TABLE_NAME = uc.table_name AND ut.COLUMN_NAME = uc.column_name and ut.OWNER = uc.OWNER WHERE ut.OWNER = '"
+ getDataBase() + "'";
}
PreparedStatement statement = prepareStatement(sql);
@@ -155,9 +155,9 @@ public class OracleDataBaseQuery extends AbstractDatabaseQuery {
}
//单表查询
else {
String sql = "SELECT ut.TABLE_NAME, -- 表名称 ut.COLUMN_NAME,--字段名称 uc.comments as REMARKS,--字段注释 concat(concat(concat(ut.DATA_TYPE, '('), ut.DATA_LENGTH), ')') AS COLUMN_TYPE,--字典类型 ut.DATA_LENGTH as COLUMN_LENGTH--字典长度 FROM user_tab_columns ut INNER JOIN user_col_comments uc ON ut.TABLE_NAME = uc.table_name AND ut.COLUMN_NAME = uc.column_name WHERE ut.Table_Name = '%s'";
String sql = "SELECT ut.TABLE_NAME, ut.COLUMN_NAME, uc.comments as REMARKS, concat(concat(concat(ut.DATA_TYPE, '('), ut.DATA_LENGTH), ')') AS COLUMN_TYPE, ut.DATA_LENGTH as COLUMN_LENGTH FROM user_tab_columns ut INNER JOIN user_col_comments uc ON ut.TABLE_NAME = uc.table_name AND ut.COLUMN_NAME = uc.column_name WHERE ut.Table_Name = '%s'";
if (isDda()) {
sql = "SELECT ut.TABLE_NAME, -- 表名称 ut.COLUMN_NAME,--字段名称 uc.comments as REMARKS,--字段注释 concat(concat(concat(ut.DATA_TYPE, '('), ut.DATA_LENGTH), ')') AS COLUMN_TYPE,--字典类型 ut.DATA_LENGTH as COLUMN_LENGTH--字典长度 FROM dba_tab_columns ut INNER JOIN dba_col_comments uc ON ut.TABLE_NAME = uc.table_name AND ut.COLUMN_NAME = uc.column_name and ut.OWNER = uc.OWNER WHERE ut.Table_Name = '%s' ut.OWNER = '"
sql = "SELECT ut.TABLE_NAME, ut.COLUMN_NAME, uc.comments as REMARKS, concat(concat(concat(ut.DATA_TYPE, '('), ut.DATA_LENGTH), ')') AS COLUMN_TYPE, ut.DATA_LENGTH as COLUMN_LENGTH FROM dba_tab_columns ut INNER JOIN dba_col_comments uc ON ut.TABLE_NAME = uc.table_name AND ut.COLUMN_NAME = uc.column_name and ut.OWNER = uc.OWNER WHERE ut.Table_Name = '%s' ut.OWNER = '"
+ getDataBase() + "'";
}
resultSet = prepareStatement(String.format(sql, table)).executeQuery();

3
screw-core/src/test/java/cn/smallbun/screw/core/produce/OracleDocumentationBuilderTest.java
View File

@@ -49,7 +49,6 @@ public class OracleDocumentationBuilderTest extends AbstractDocumentationExecute
hikariConfig.setJdbcUrl(getUrl());
hikariConfig.setUsername(getUserName());
hikariConfig.setPassword(getPassword());
// hikariConfig.addDataSourceProperty("remarks", "true");
hikariConfig.setMinimumIdle(2);
hikariConfig.setMaximumPoolSize(5);
HikariDataSource dataSource = new HikariDataSource(hikariConfig);
@@ -58,7 +57,7 @@ public class OracleDocumentationBuilderTest extends AbstractDocumentationExecute
//生成文件路径
.fileOutputDir(fileOutputDir)
//文件类型
.fileType(EngineFileType.HTML)
.fileType(EngineFileType.WORD)
//打开文件夹
.openOutputDir(true)
//生成模板实现