Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions crates/dbx-core/src/object_source_sql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ fn object_type_keyword(object_type: &ObjectSourceKind) -> &'static str {
ObjectSourceKind::Event => "EVENT",
ObjectSourceKind::Sequence => "SEQUENCE",
ObjectSourceKind::Synonym => "SYNONYM",
ObjectSourceKind::Job => "JOB",
ObjectSourceKind::Package => "PACKAGE",
ObjectSourceKind::PackageBody => "PACKAGE BODY",
ObjectSourceKind::Type => "TYPE",
Expand Down Expand Up @@ -947,6 +948,8 @@ fn parse_object_source_kind(value: &str) -> Option<ObjectSourceKind> {
Some(ObjectSourceKind::Sequence)
} else if value.eq_ignore_ascii_case("SYNONYM") {
Some(ObjectSourceKind::Synonym)
} else if value.eq_ignore_ascii_case("JOB") {
Some(ObjectSourceKind::Job)
} else if value.eq_ignore_ascii_case("PACKAGE") {
Some(ObjectSourceKind::Package)
} else if value.eq_ignore_ascii_case("PACKAGE BODY") || value.eq_ignore_ascii_case("PACKAGE_BODY") {
Expand Down Expand Up @@ -1736,6 +1739,7 @@ mod tests {
fn parses_programmable_metadata_object_kinds() {
assert_eq!(parse_object_source_kind("TRIGGER"), Some(ObjectSourceKind::Trigger));
assert_eq!(parse_object_source_kind("SYNONYM"), Some(ObjectSourceKind::Synonym));
assert_eq!(parse_object_source_kind("JOB"), Some(ObjectSourceKind::Job));
assert_eq!(parse_object_source_kind("TYPE"), Some(ObjectSourceKind::Type));
assert_eq!(parse_object_source_kind("TYPE_BODY"), Some(ObjectSourceKind::TypeBody));
assert_eq!(parse_object_source_kind("PACKAGE BODY"), Some(ObjectSourceKind::PackageBody));
Expand Down
13 changes: 13 additions & 0 deletions crates/dbx-core/src/schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8168,6 +8168,7 @@ fn sqlite_object_type(kind: &db::ObjectSourceKind) -> &'static str {
| db::ObjectSourceKind::Event
| db::ObjectSourceKind::Sequence
| db::ObjectSourceKind::Synonym
| db::ObjectSourceKind::Job
| db::ObjectSourceKind::Package
| db::ObjectSourceKind::PackageBody
| db::ObjectSourceKind::Type
Expand All @@ -8184,6 +8185,7 @@ fn sqlserver_object_type_filter(kind: &db::ObjectSourceKind) -> &'static str {
db::ObjectSourceKind::Event
| db::ObjectSourceKind::Sequence
| db::ObjectSourceKind::Synonym
| db::ObjectSourceKind::Job
| db::ObjectSourceKind::Package
| db::ObjectSourceKind::PackageBody
| db::ObjectSourceKind::Type
Expand Down Expand Up @@ -8429,6 +8431,7 @@ fn postgres_object_source_sql_inner(
db::ObjectSourceKind::Trigger
| db::ObjectSourceKind::Event
| db::ObjectSourceKind::Synonym
| db::ObjectSourceKind::Job
| db::ObjectSourceKind::Package
| db::ObjectSourceKind::PackageBody
| db::ObjectSourceKind::Type
Expand All @@ -8437,6 +8440,12 @@ fn postgres_object_source_sql_inner(
}

pub fn oracle_object_source_sql(schema: &str, name: &str, kind: &db::ObjectSourceKind) -> String {
// Scheduler jobs are currently an Xugu-specific Agent object. Do not
// manufacture an Oracle DBMS_METADATA request for a kind Oracle does not
// expose through this generic source-SQL helper.
if matches!(kind, db::ObjectSourceKind::Job) {
return String::new();
}
let object_type = match kind {
db::ObjectSourceKind::View => "VIEW",
db::ObjectSourceKind::MaterializedView => "MATERIALIZED_VIEW",
Expand All @@ -8446,6 +8455,7 @@ pub fn oracle_object_source_sql(schema: &str, name: &str, kind: &db::ObjectSourc
db::ObjectSourceKind::Event => "EVENT",
db::ObjectSourceKind::Sequence => "SEQUENCE",
db::ObjectSourceKind::Synonym => "SYNONYM",
db::ObjectSourceKind::Job => "",
db::ObjectSourceKind::Package => "PACKAGE",
db::ObjectSourceKind::PackageBody => "PACKAGE_BODY",
db::ObjectSourceKind::Type => "TYPE",
Expand Down Expand Up @@ -8503,6 +8513,7 @@ pub fn mysql_object_source_sql(database: &str, name: &str, kind: &db::ObjectSour
db::ObjectSourceKind::Event => format!("SHOW CREATE EVENT {qualified_name}"),
db::ObjectSourceKind::Sequence
| db::ObjectSourceKind::Synonym
| db::ObjectSourceKind::Job
| db::ObjectSourceKind::Package
| db::ObjectSourceKind::PackageBody
| db::ObjectSourceKind::Type
Expand Down Expand Up @@ -8539,6 +8550,7 @@ pub(crate) fn mysql_object_source_ddl_column_index(kind: &db::ObjectSourceKind)
| db::ObjectSourceKind::Trigger
| db::ObjectSourceKind::Sequence
| db::ObjectSourceKind::Synonym
| db::ObjectSourceKind::Job
| db::ObjectSourceKind::Package
| db::ObjectSourceKind::PackageBody
| db::ObjectSourceKind::Type
Expand Down Expand Up @@ -9762,6 +9774,7 @@ mod object_source_tests {
oracle_object_source_sql("HR", "ORDER_SEQ", &ObjectSourceKind::Sequence),
"SELECT DBMS_METADATA.GET_DDL('SEQUENCE', 'ORDER_SEQ', 'HR') FROM DUAL"
);
assert_eq!(oracle_object_source_sql("HR", "NIGHTLY_JOB", &ObjectSourceKind::Job), "");
}

#[test]
Expand Down
1 change: 1 addition & 0 deletions crates/dbx-core/src/transfer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8256,6 +8256,7 @@ where
}
db::ObjectSourceKind::Sequence
| db::ObjectSourceKind::Synonym
| db::ObjectSourceKind::Job
| db::ObjectSourceKind::Package
| db::ObjectSourceKind::PackageBody => object.source.clone(),
db::ObjectSourceKind::Trigger
Expand Down
9 changes: 9 additions & 0 deletions crates/dbx-core/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ pub enum ObjectSourceKind {
Event,
Sequence,
Synonym,
Job,
Package,
PackageBody,
Type,
Expand Down Expand Up @@ -850,6 +851,14 @@ mod tests {
assert_eq!(serde_json::to_string(&kind).unwrap(), "\"SYNONYM\"");
}

#[test]
fn object_source_kind_accepts_job_wire_value() {
let kind: ObjectSourceKind = serde_json::from_str("\"JOB\"").unwrap();

assert_eq!(kind, ObjectSourceKind::Job);
assert_eq!(serde_json::to_string(&kind).unwrap(), "\"JOB\"");
}

#[test]
fn completion_candidate_kind_accepts_uppercase_agent_wire_values() {
for (wire_value, expected) in [
Expand Down
Loading