增加对虚拟列的属性获取.

baomidou · Jun 22, 2024 · a4d6259 · a4d6259
1 parent 19055a8
commit a4d6259
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/...plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/po/TableField.java b/...plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/po/TableField.java
@@ -405,6 +405,13 @@ public static class MetaInfo {
  */
  private String typeName;
 
+ /**
+ * 是否为生成列
+ *
+ * @since 3.5.8
+ */
+ private boolean generatedColumn;
+
  public MetaInfo(DatabaseMetaDataWrapper.Column column, TableInfo tableInfo) {
  if (column != null) {
  this.tableName = tableInfo.getName();
@@ -416,6 +423,7 @@ public MetaInfo(DatabaseMetaDataWrapper.Column column, TableInfo tableInfo) {
  this.scale = column.getScale();
  this.jdbcType = column.getJdbcType();
  this.typeName = column.getTypeName();
+ this.generatedColumn = column.isGeneratedColumn();
  }
  }
 
@@ -467,6 +475,7 @@ public String toString() {
  ", scale=" + scale +
  ", jdbcType=" + jdbcType +
  ", typeName='" + typeName + '\'' +
+ ", generatedColumn=" + generatedColumn +
  '}';
  }
  }

diff --git a/...erator/src/main/java/com/baomidou/mybatisplus/generator/jdbc/DatabaseMetaDataWrapper.java b/...erator/src/main/java/com/baomidou/mybatisplus/generator/jdbc/DatabaseMetaDataWrapper.java
@@ -118,11 +118,8 @@ public Map<String, Column> getColumnsInfo(String catalog, String schema, String
  column.remarks = formatComment(resultSet.getString("REMARKS"));
  column.defaultValue = resultSet.getString("COLUMN_DEF");
  column.nullable = resultSet.getInt("NULLABLE") == DatabaseMetaData.columnNullable;
- try {
- column.autoIncrement = "YES".equals(resultSet.getString("IS_AUTOINCREMENT"));
- } catch (SQLException sqlException) {
- //TODO 目前测试在oracle旧驱动下存在问题，降级成false.
- }
+ column.generatedColumn = isGeneratedOrAutoIncrementColumn(resultSet, "IS_GENERATEDCOLUMN");
+ column.autoIncrement = isGeneratedOrAutoIncrementColumn(resultSet, "IS_AUTOINCREMENT");
  columnsInfoMap.put(name.toLowerCase(), column);
  }
  return Collections.unmodifiableMap(columnsInfoMap);
@@ -131,6 +128,15 @@ public Map<String, Column> getColumnsInfo(String catalog, String schema, String
  }
  }
 
+ private boolean isGeneratedOrAutoIncrementColumn(ResultSet resultSet, String columnLabel) {
+ try {
+ return "YES".equals(resultSet.getString(columnLabel));
+ } catch (SQLException e) {
+ // ignore
+ }
+ return false;
+ }
+
  public String formatComment(String comment) {
  return StringUtils.isBlank(comment) ? StringPool.EMPTY : comment.replaceAll("\r\n", "\t");
  }
@@ -214,5 +220,7 @@ public static class Column {
  @Setter
  private String typeName;
 
+ private boolean generatedColumn;
+
  }
 }