github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#11263] Add KeyColumnUsage.positionInUniqueConstraint to the InformationSchema for use with XMLDatabase

Browse Source
This commit is contained in:
Lukas Eder 2023-10-24 09:35:34 +02:00
parent 6f93425854
commit 85c42745ee
4 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
jOOQ-meta/src/main/java/org/jooq/meta/DefaultRelations.java
View File

@ -240,6 +240,42 @@ public class DefaultRelations implements Relations {
return index < uk.getKeyColumns().size() ? uk.getKeyColumns().get(index) : null;
}
public void addForeignKey(
String foreignKeyName,
TableDefinition foreignKeyTable,
ColumnDefinition foreignKeyColumn,
String uniqueKeyName,
TableDefinition uniqueKeyTable,
Integer positionInUniqueKey,
boolean enforced
) {
if (positionInUniqueKey == null) {
addForeignKey(
foreignKeyName,
foreignKeyTable,
foreignKeyColumn,
uniqueKeyName,
uniqueKeyTable,
enforced
);
}
else {
UniqueKeyDefinition uniqueKey = keys.get(key(uniqueKeyTable, uniqueKeyName));
if (uniqueKey != null) {
addForeignKey(
foreignKeyName,
foreignKeyTable,
foreignKeyColumn,
uniqueKeyName,
uniqueKeyTable,
uniqueKey.getKeyColumns().get(positionInUniqueKey - 1),
enforced
);
}
}
}
public void addForeignKey(
String foreignKeyName,
TableDefinition foreignKeyTable,

1
jOOQ-meta/src/main/java/org/jooq/meta/xml/XMLDatabase.java
View File

@ -437,6 +437,7 @@ public class XMLDatabase extends AbstractDatabase {
foreignKeyTable.getColumn(foreignKeyColumn),
uniqueKey,
uniqueKeyTable,
usage.getPositionInUniqueConstraint(),
!FALSE.equals(fktc.isEnforced())
);
}

27
jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java
View File

@ -27,6 +27,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder;
* &lt;element name="constraint_schema" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
* &lt;element name="constraint_name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
* &lt;element name="ordinal_position" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
* &lt;element name="position_in_unique_constraint" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/&gt;
* &lt;element name="table_catalog" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
* &lt;element name="table_schema" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
* &lt;element name="table_name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
@ -63,6 +64,8 @@ public class KeyColumnUsage implements Serializable, XMLAppendable
protected String constraintName;
@XmlElement(name = "ordinal_position")
protected int ordinalPosition;
@XmlElement(name = "position_in_unique_constraint")
protected Integer positionInUniqueConstraint;
@XmlElement(name = "table_catalog")
@XmlJavaTypeAdapter(StringAdapter.class)
protected String tableCatalog;
@ -113,6 +116,14 @@ public class KeyColumnUsage implements Serializable, XMLAppendable
this.ordinalPosition = value;
}
public Integer getPositionInUniqueConstraint() {
return positionInUniqueConstraint;
}
public void setPositionInUniqueConstraint(Integer value) {
this.positionInUniqueConstraint = value;
}
public String getTableCatalog() {
return tableCatalog;
}
@ -162,6 +173,11 @@ public class KeyColumnUsage implements Serializable, XMLAppendable
return this;
}
public KeyColumnUsage withPositionInUniqueConstraint(Integer value) {
setPositionInUniqueConstraint(value);
return this;
}
public KeyColumnUsage withTableCatalog(String value) {
setTableCatalog(value);
return this;
@ -184,6 +200,7 @@ public class KeyColumnUsage implements Serializable, XMLAppendable
builder.append("constraint_schema", constraintSchema);
builder.append("constraint_name", constraintName);
builder.append("ordinal_position", ordinalPosition);
builder.append("position_in_unique_constraint", positionInUniqueConstraint);
builder.append("table_catalog", tableCatalog);
builder.append("table_schema", tableSchema);
builder.append("table_name", tableName);
@ -247,6 +264,15 @@ public class KeyColumnUsage implements Serializable, XMLAppendable
if (ordinalPosition!= other.ordinalPosition) {
return false;
}
if (positionInUniqueConstraint == null) {
if (other.positionInUniqueConstraint!= null) {
return false;
}
} else {
if (!positionInUniqueConstraint.equals(other.positionInUniqueConstraint)) {
return false;
}
}
if (tableCatalog == null) {
if (other.tableCatalog!= null) {
return false;
@ -286,6 +312,7 @@ public class KeyColumnUsage implements Serializable, XMLAppendable
result = ((prime*result)+((constraintSchema == null)? 0 :constraintSchema.hashCode()));
result = ((prime*result)+((constraintName == null)? 0 :constraintName.hashCode()));
result = ((prime*result)+ ordinalPosition);
result = ((prime*result)+((positionInUniqueConstraint == null)? 0 :positionInUniqueConstraint.hashCode()));
result = ((prime*result)+((tableCatalog == null)? 0 :tableCatalog.hashCode()));
result = ((prime*result)+((tableSchema == null)? 0 :tableSchema.hashCode()));
result = ((prime*result)+((tableName == null)? 0 :tableName.hashCode()));

1
jOOQ/src/main/resources/org/jooq/xsd/jooq-meta-3.19.0.xsd
View File

@ -201,6 +201,7 @@
<element name="constraint_schema" type="string" minOccurs="0" maxOccurs="1" />
<element name="constraint_name" type="string" minOccurs="1" maxOccurs="1" />
<element name="ordinal_position" type="int" minOccurs="1" maxOccurs="1" />
<element name="position_in_unique_constraint" type="int" minOccurs="0" maxOccurs="1" />
<element name="table_catalog" type="string" minOccurs="0" maxOccurs="1" />
<element name="table_schema" type="string" minOccurs="0" maxOccurs="1" />
<element name="table_name" type="string" minOccurs="1" maxOccurs="1" />