feat(oceanbase-oracle): support sequences, synonyms and db links
This commit is contained in:
1 parent
a19a4f595d
commit
04376ef3fb
31 files changed
+1225
-91
No files matched your search
+9
-2
@@ -383,6 +383,10 @@ public final class OceanBaseOracleAgent extends ConfiguredJdbcAgent {
|
||||
}
|
||||
|
||||
private String queryDbmsMetadataSource(String owner, String name, String objectType) throws SQLException {
|
||||
if ("SYNONYM".equals(objectType)) {
|
||||
// GET_DDL does not cover synonyms on every supported OB version.
|
||||
return OceanBaseSchemaObjects.synonymSource(requireConnection(), owner, name);
|
||||
}
|
||||
String sql = "SELECT DBMS_METADATA.GET_DDL(?, ?, ?) FROM DUAL";
|
||||
try (var stmt = requireConnection().prepareStatement(sql)) {
|
||||
stmt.setString(1, objectType);
|
||||
@@ -395,6 +399,9 @@ public final class OceanBaseOracleAgent extends ConfiguredJdbcAgent {
|
||||
}
|
||||
|
||||
private String queryDictionarySource(String owner, String name, String objectType) throws SQLException {
|
||||
if ("SEQUENCE".equals(objectType)) {
|
||||
return OceanBaseSchemaObjects.sequenceSource(requireConnection(), owner, name);
|
||||
}
|
||||
if ("VIEW".equals(objectType)) {
|
||||
String sql = "SELECT TEXT FROM ALL_VIEWS WHERE OWNER = ? AND VIEW_NAME = ?";
|
||||
try (var stmt = requireConnection().prepareStatement(sql)) {
|
||||
@@ -435,7 +442,7 @@ public final class OceanBaseOracleAgent extends ConfiguredJdbcAgent {
|
||||
? ""
|
||||
: objectType.trim().toUpperCase(Locale.ROOT).replace(' ', '_');
|
||||
return switch (normalized) {
|
||||
case "VIEW", "MATERIALIZED_VIEW", "PROCEDURE", "FUNCTION", "TRIGGER", "SEQUENCE",
|
||||
case "VIEW", "MATERIALIZED_VIEW", "PROCEDURE", "FUNCTION", "TRIGGER", "SEQUENCE", "SYNONYM",
|
||||
"PACKAGE", "PACKAGE_BODY", "TYPE", "TYPE_BODY" -> normalized;
|
||||
default -> throw new IllegalArgumentException("Unsupported object type: " + objectType);
|
||||
};
|
||||
@@ -443,7 +450,7 @@ public final class OceanBaseOracleAgent extends ConfiguredJdbcAgent {
|
||||
|
||||
private static boolean supportsDictionarySource(String objectType) {
|
||||
return switch (objectType) {
|
||||
case "VIEW", "PROCEDURE", "FUNCTION", "TRIGGER", "PACKAGE", "PACKAGE_BODY", "TYPE", "TYPE_BODY" -> true;
|
||||
case "VIEW", "PROCEDURE", "FUNCTION", "TRIGGER", "PACKAGE", "PACKAGE_BODY", "TYPE", "TYPE_BODY", "SEQUENCE" -> true;
|
||||
default -> false;
|
||||
};
|
||||
}
|
||||
|
||||
+77
@@ -0,0 +1,77 @@
|
||||
package com.dbx.agent.oceanbaseoracle;
|
||||
|
||||
import java.math.BigInteger;
|
||||
import java.sql.Connection;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
|
||||
/** Dictionary-backed DDL for objects not consistently covered by OB GET_DDL. */
|
||||
final class OceanBaseSchemaObjects {
|
||||
private OceanBaseSchemaObjects() {}
|
||||
|
||||
static String synonymSource(Connection connection, String owner, String name) throws SQLException {
|
||||
String sql = "SELECT TABLE_OWNER, TABLE_NAME, DB_LINK FROM ALL_SYNONYMS WHERE OWNER = ? AND SYNONYM_NAME = ?";
|
||||
try (var statement = connection.prepareStatement(sql)) {
|
||||
statement.setString(1, owner);
|
||||
statement.setString(2, name);
|
||||
try (var rs = statement.executeQuery()) {
|
||||
if (!rs.next()) return null;
|
||||
String targetOwner = rs.getString("TABLE_OWNER");
|
||||
String target = quote(rs.getString("TABLE_NAME"));
|
||||
if (targetOwner != null && !targetOwner.isEmpty()) target = quote(targetOwner) + "." + target;
|
||||
String link = rs.getString("DB_LINK");
|
||||
if (link != null && !link.isEmpty()) {
|
||||
// A link's domain is part of its name, not a schema qualifier.
|
||||
if (!link.matches("[A-Za-z][A-Za-z0-9_$#]*(?:\\.[A-Za-z0-9_$#]+)*") || link.length() > 128) {
|
||||
throw new SQLException("Unsupported database link identifier in synonym metadata");
|
||||
}
|
||||
target += "@" + link;
|
||||
}
|
||||
String declaration = "PUBLIC".equals(owner) ? "PUBLIC SYNONYM " + quote(name)
|
||||
: "SYNONYM " + quote(owner) + "." + quote(name);
|
||||
return "CREATE OR REPLACE " + declaration + " FOR " + target + ";";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static String sequenceSource(Connection connection, String owner, String name) throws SQLException {
|
||||
String sql = "SELECT MIN_VALUE, MAX_VALUE, INCREMENT_BY, CYCLE_FLAG, ORDER_FLAG, CACHE_SIZE, LAST_NUMBER "
|
||||
+ "FROM ALL_SEQUENCES WHERE SEQUENCE_OWNER = ? AND SEQUENCE_NAME = ?";
|
||||
try (var statement = connection.prepareStatement(sql)) {
|
||||
statement.setString(1, owner);
|
||||
statement.setString(2, name);
|
||||
try (var rs = statement.executeQuery()) {
|
||||
if (!rs.next()) return null;
|
||||
// LAST_NUMBER is the dictionary/cache boundary, not session CURRVAL.
|
||||
// Never consume NEXTVAL while displaying or editing a sequence.
|
||||
String cache = integer(rs, "CACHE_SIZE");
|
||||
return "CREATE SEQUENCE " + quote(owner) + "." + quote(name)
|
||||
+ "\n MINVALUE " + integer(rs, "MIN_VALUE")
|
||||
+ "\n MAXVALUE " + integer(rs, "MAX_VALUE")
|
||||
+ "\n INCREMENT BY " + integer(rs, "INCREMENT_BY")
|
||||
+ "\n START WITH " + integer(rs, "LAST_NUMBER")
|
||||
+ "\n " + ("0".equals(cache) ? "NOCACHE" : "CACHE " + cache)
|
||||
+ "\n " + flag(rs, "CYCLE_FLAG", "CYCLE", "NOCYCLE")
|
||||
+ "\n " + flag(rs, "ORDER_FLAG", "ORDER", "NOORDER") + ";";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static String integer(ResultSet rs, String column) throws SQLException {
|
||||
String value = rs.getString(column);
|
||||
if (value == null || !value.matches("[+-]?[0-9]+")) throw new SQLException("Invalid sequence metadata: " + column);
|
||||
return new BigInteger(value).toString();
|
||||
}
|
||||
|
||||
private static String flag(ResultSet rs, String column, String yes, String no) throws SQLException {
|
||||
String value = rs.getString(column);
|
||||
if ("Y".equals(value)) return yes;
|
||||
if ("N".equals(value)) return no;
|
||||
throw new SQLException("Invalid sequence metadata: " + column);
|
||||
}
|
||||
|
||||
private static String quote(String name) throws SQLException {
|
||||
if (name == null || name.isEmpty() || name.indexOf('\0') >= 0) throw new SQLException("Missing object identifier");
|
||||
return "\"" + name.replace("\"", "\"\"") + "\"";
|
||||
}
|
||||
}
|
||||
+70
@@ -481,6 +481,76 @@ class OceanBaseOracleAgentTest {
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void synonymSourcePreservesOwnersQuotedNamesAndRemoteLinkDomains() {
|
||||
for (String owner : List.of("Mixed.Owner", "PUBLIC")) {
|
||||
List<String> sql = new ArrayList<>();
|
||||
List<String> params = new ArrayList<>();
|
||||
OceanBaseOracleAgent agent = new OceanBaseOracleAgent();
|
||||
TestSupport.setPrivateConnection(agent, preparedConnection(sql, params, resultSet(
|
||||
new String[]{"TABLE_OWNER", "TABLE_NAME", "DB_LINK"},
|
||||
new Object[][]{{"Target.Owner", "A\"B", "REMOTE.EXAMPLE"}}
|
||||
)));
|
||||
ObjectSource source = agent.getObjectSource(owner, "Syn.Name", "SYNONYM");
|
||||
String declaration = owner.equals("PUBLIC") ? "PUBLIC SYNONYM \"Syn.Name\"" : "SYNONYM \"Mixed.Owner\".\"Syn.Name\"";
|
||||
Assertions.assertEquals("CREATE OR REPLACE " + declaration + " FOR \"Target.Owner\".\"A\"\"B\"@REMOTE.EXAMPLE;", source.getSource());
|
||||
Assertions.assertEquals(List.of(owner, "Syn.Name"), params);
|
||||
Assertions.assertEquals(1, sql.size());
|
||||
Assertions.assertTrue(sql.get(0).contains("ALL_SYNONYMS"));
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void synonymSourceHandlesMissingAndLocalTargetsWithoutGuessing() {
|
||||
OceanBaseOracleAgent agent = new OceanBaseOracleAgent();
|
||||
TestSupport.setPrivateConnection(agent, preparedConnection(new ArrayList<>(), resultSet(
|
||||
new String[]{"TABLE_OWNER", "TABLE_NAME", "DB_LINK"}, new Object[][]{{null, "T", null}}
|
||||
)));
|
||||
Assertions.assertEquals("CREATE OR REPLACE SYNONYM \"APP\".\"S\" FOR \"T\";", agent.getObjectSource("APP", "S", "SYNONYM").getSource());
|
||||
TestSupport.setPrivateConnection(agent, preparedConnection(new ArrayList<>(), resultSet(
|
||||
new String[]{"TABLE_OWNER", "TABLE_NAME", "DB_LINK"}, new Object[][]{}
|
||||
)));
|
||||
Assertions.assertEquals("", agent.getObjectSource("APP", "missing", "SYNONYM").getSource());
|
||||
}
|
||||
|
||||
@Test
|
||||
void synonymSourceRejectsUnsafeRemoteMetadata() {
|
||||
for (String link : List.of("x; DROP TABLE T", "x--", "a..b")) {
|
||||
OceanBaseOracleAgent agent = new OceanBaseOracleAgent();
|
||||
TestSupport.setPrivateConnection(agent, preparedConnection(new ArrayList<>(), resultSet(
|
||||
new String[]{"TABLE_OWNER", "TABLE_NAME", "DB_LINK"}, new Object[][]{{"APP", "T", link}}
|
||||
)));
|
||||
Assertions.assertThrows(RuntimeException.class, () -> agent.getObjectSource("APP", "S", "SYNONYM"));
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void sequenceFallbackUsesExactIntegerMetadataWithoutConsumingNextValue() {
|
||||
List<String> sql = new ArrayList<>();
|
||||
List<String> params = new ArrayList<>();
|
||||
OceanBaseOracleAgent agent = new OceanBaseOracleAgent();
|
||||
TestSupport.setPrivateConnection(agent, objectSourceFallbackConnection(sql, params, resultSet(
|
||||
new String[]{"MIN_VALUE", "MAX_VALUE", "INCREMENT_BY", "CYCLE_FLAG", "ORDER_FLAG", "CACHE_SIZE", "LAST_NUMBER"},
|
||||
new Object[][]{{"-999", "9999999999999999999999999999", "-2", "N", "Y", "0", "40"}}
|
||||
)));
|
||||
String source = agent.getObjectSource("Mixed.Owner", "S\"Q", "SEQUENCE").getSource();
|
||||
Assertions.assertEquals("CREATE SEQUENCE \"Mixed.Owner\".\"S\"\"Q\"\n MINVALUE -999\n MAXVALUE 9999999999999999999999999999\n INCREMENT BY -2\n START WITH 40\n NOCACHE\n NOCYCLE\n ORDER;", source);
|
||||
Assertions.assertEquals(List.of("SEQUENCE", "S\"Q", "Mixed.Owner", "Mixed.Owner", "S\"Q"), params);
|
||||
Assertions.assertFalse(sql.stream().anyMatch(query -> query.contains("NEXTVAL")));
|
||||
}
|
||||
|
||||
@Test
|
||||
void sequenceFallbackRejectsIncompleteOrNonIntegerMetadata() {
|
||||
for (String maximum : Arrays.asList(null, "1.5", "1E28", "1; DROP TABLE T")) {
|
||||
OceanBaseOracleAgent agent = new OceanBaseOracleAgent();
|
||||
TestSupport.setPrivateConnection(agent, objectSourceFallbackConnection(new ArrayList<>(), new ArrayList<>(), resultSet(
|
||||
new String[]{"MIN_VALUE", "MAX_VALUE", "INCREMENT_BY", "CYCLE_FLAG", "ORDER_FLAG", "CACHE_SIZE", "LAST_NUMBER"},
|
||||
new Object[][]{{"1", maximum, "1", "N", "N", "20", "40"}}
|
||||
)));
|
||||
Assertions.assertThrows(RuntimeException.class, () -> agent.getObjectSource("APP", "SEQ", "SEQUENCE"));
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void rejectsUnsupportedObjectSourceTypesBeforeQuerying() {
|
||||
OceanBaseOracleAgent agent = new OceanBaseOracleAgent();
|
||||
|
||||
Reference in new issue
Block a user