Browse Source

Merge pull request #7910 in CORE/base-third from final/11.0 to persist/11.0

* commit 'f3eb38487691a15d9e51a912edb596a3ba38ebdc':
  REPORT-86792【迭代】【配置库适配GoldenDB】迁移GoldenDB失败
  REPORT-86562 v8 aarch64本地库依赖glibc2.17
  REPORT-85191【国产化】配置库适配GoldenDB
  REPORT-85397 patch fr之前做的适配
persist/11.0
superman 2 years ago
parent
commit
8c2063dff6
  1. 18
      fine-hibernate/src/main/java/com/fr/third/org/hibernate/dialect/Dialect.java
  2. 2
      fine-hibernate/src/main/java/com/fr/third/org/hibernate/mapping/Column.java
  3. 6
      fine-hibernate/src/main/java/com/fr/third/org/hibernate/mapping/PrimaryKey.java
  4. 2
      fine-hibernate/src/main/java/com/fr/third/org/hibernate/tool/schema/internal/StandardTableExporter.java
  5. BIN
      fine-j2v8/src/main/resources/libj2v8-linux-aarch_64.so

18
fine-hibernate/src/main/java/com/fr/third/org/hibernate/dialect/Dialect.java

@ -2806,4 +2806,22 @@ public abstract class Dialect implements ConversionContext {
return buf.append(')').toString(); return buf.append(')').toString();
} }
/**
* 获取建表时分发策略字符串
*
* @param columnList 主键列集合
* @return String
*/
public String sqlDistributeString(List<Column> columnList) {
return "";
}
/**
* 是否强制添加引用符号
*
* @return /
*/
public boolean forceQuote() {
return false;
}
} }

2
fine-hibernate/src/main/java/com/fr/third/org/hibernate/mapping/Column.java

@ -96,7 +96,7 @@ public class Column implements Selectable, Serializable, Cloneable {
} }
public String getQuotedName(Dialect d) { public String getQuotedName(Dialect d) {
return quoted ? return quoted || d.forceQuote() ?
d.openQuote() + name + d.closeQuote() : d.openQuote() + name + d.closeQuote() :
name; name;
} }

6
fine-hibernate/src/main/java/com/fr/third/org/hibernate/mapping/PrimaryKey.java

@ -74,7 +74,11 @@ public class PrimaryKey extends Constraint {
} }
return buf.append(')').toString(); return buf.append(')').toString();
} }
public String sqlDistributeString(Dialect dialect) {
return dialect.sqlDistributeString(getColumns());
}
public String generatedConstraintNamePrefix() { public String generatedConstraintNamePrefix() {
return "PK_"; return "PK_";
} }

2
fine-hibernate/src/main/java/com/fr/third/org/hibernate/tool/schema/internal/StandardTableExporter.java

@ -147,6 +147,8 @@ public class StandardTableExporter implements Exporter<Table> {
applyTableTypeString( buf ); applyTableTypeString( buf );
buf.append(table.getPrimaryKey().sqlDistributeString(dialect));
List<String> sqlStrings = new ArrayList<String>(); List<String> sqlStrings = new ArrayList<String>();
sqlStrings.add( buf.toString() ); sqlStrings.add( buf.toString() );

BIN
fine-j2v8/src/main/resources/libj2v8-linux-aarch_64.so

Binary file not shown.
Loading…
Cancel
Save