Skip to content

Commit 1071ddf

Browse files
author
Marcin Przepiorowski
committed
version 2.4.9
2 parents d1fe703 + 99a1f69 commit 1071ddf

File tree

2 files changed

+54
-3
lines changed

2 files changed

+54
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
### Added
44
- dx_get_dsourcesize - flag -license added to display a license for ingestion model using a new API
55
- dx_undo_db - new script to undo last rollback or refresh
6+
- support of 6.0.4 engine
67

78
### Changed
89
- dx_get_db_env: fix for displaying a parent time

lib/OracleVDB_obj.pm

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,7 +1411,7 @@ sub attach_dsource
14111411
"environmentUser" => $source_os_ref
14121412
}
14131413
);
1414-
} else {
1414+
} elsif (version->parse($self->{_dlpxObject}->getApi()) == version->parse(1.11.3)) {
14151415
# 6.0.3
14161416
%attach_data = (
14171417
"type" => "AttachSourceParameters",
@@ -1423,6 +1423,21 @@ sub attach_dsource
14231423
"environmentUser" => $source_os_ref
14241424
}
14251425
);
1426+
} else {
1427+
# 6.0.4 and above so far
1428+
%attach_data = (
1429+
"type" => "AttachSourceParameters",
1430+
"attachData" => {
1431+
"type" => "OracleAttachData",
1432+
"config" => $config->{reference},
1433+
"oracleFallbackCredentials" => {
1434+
"type" => "PasswordCredential",
1435+
"password" => $password
1436+
},
1437+
"oracleFallbackUser" => $dbuser,
1438+
"environmentUser" => $source_os_ref
1439+
}
1440+
);
14261441
}
14271442

14281443
if ($config->{type} eq 'OraclePDBConfig') {
@@ -1570,7 +1585,13 @@ sub discoverPDB {
15701585
return 1;
15711586
}
15721587

1588+
1589+
# sleep to allow change to propagte for next API call ?
1590+
sleep(10);
1591+
15731592
$self->{_sourceconfig}->refresh();
1593+
1594+
15741595
if ($self->{_sourceconfig}->getSourceConfig($cdb->{reference})->{'cdbType'} eq 'ROOT_CDB') {
15751596
return 0;
15761597
} else {
@@ -1747,8 +1768,8 @@ sub addSource {
17471768
$dsource_params{"linkData"}{"type"} = "OraclePDBLinkFromExternal";
17481769
}
17491770

1750-
} else {
1751-
# Delphix 6.0
1771+
} elsif (version->parse($self->{_dlpxObject}->getApi()) == version->parse(1.11.3)) {
1772+
# Delphix 6.0.3
17521773
%dsource_params = (
17531774
"type" => "LinkParameters",
17541775
"group" => $self->{"NEWDB"}->{"container"}->{"group"},
@@ -1772,6 +1793,35 @@ sub addSource {
17721793
$dsource_params{"linkData"}{"type"} = "OraclePDBLinkFromExternal";
17731794
}
17741795

1796+
} else {
1797+
# Delphix 6.0.4 and above - so far
1798+
1799+
%dsource_params = (
1800+
"type" => "LinkParameters",
1801+
"group" => $self->{"NEWDB"}->{"container"}->{"group"},
1802+
"name" => $dsource_name,
1803+
"linkData" => {
1804+
"type" => "OracleLinkFromExternal",
1805+
"config" => $config->{reference},
1806+
"sourcingPolicy" => {
1807+
"type" => "OracleSourcingPolicy",
1808+
"logsyncEnabled" => $logsync_param
1809+
},
1810+
"oracleFallbackCredentials" => {
1811+
"type" => "PasswordCredential",
1812+
"password" => $password
1813+
},
1814+
"oracleFallbackUser" => $dbuser,
1815+
"environmentUser" => $source_os_ref,
1816+
"linkNow" => JSON::true,
1817+
"compressedLinkingEnabled" => JSON::true
1818+
}
1819+
);
1820+
1821+
if ($config->{type} eq 'OraclePDBConfig') {
1822+
$dsource_params{"linkData"}{"type"} = "OraclePDBLinkFromExternal";
1823+
}
1824+
17751825
}
17761826

17771827

0 commit comments

Comments
 (0)