Merge branch 'postgresql' into develop

Author: Marcin Przepiorowski

bin/dx_provision_vdb.pl

@@ -51,6 +51,7 @@
 my $version = $Toolkit_helpers::version;
 
 my $archivelog = 'yes';
+my $datapatch = 'no';
 
 GetOptions(
   'help|?' => \(my $help),
@@ -123,6 +124,7 @@
   'tdecdbpassword=s' => \(my $tdecdbpassword),
   'tdekeyid=s' => \(my $tdekeyid),
   'customparameters=s@' => \(my $customparameters),
+  'datapatch=s' => \($datapatch),
   'dever=s' => \(my $dever),
   'debug:n' => \(my $debug),
   'all' => (\my $all),
@@ -557,7 +559,15 @@
       $db->setNewDBID();
     }
 
-
+    if (defined($datapatch)) {
+      if ((lc $datapatch ne 'no') || ( lc $datapatch eq 'yes') ) {
+        $db->setDataPatch($datapatch);
+      } else {
+        print "Datapatch argument should be yes or no. VDB won't be created\n" ;
+        $ret = $ret + 1;
+        next;
+      }
+    }
 
     if ( defined($template) ) {
       if ( $db->setTemplate($template) ) {

lib/Bookmark_obj.pm

@@ -217,6 +217,8 @@ sub createBookmark
         $bookmark_timeflow_type = 'AppDataTimeflowPoint'
     } elsif ($db->getDBType() eq 'vFiles') {
         $bookmark_timeflow_type = 'AppDataTimeflowPoint'
+    } elsif ($db->getDBType() eq 'postgresql') {
+        $bookmark_timeflow_type = 'AppDataTimeflowPoint'
     } else {
       print "Can't determine a DB type. Exiting\n";
       return 1;

lib/OracleVDB_obj.pm

@@ -318,6 +318,11 @@ sub getConfig
         $config = join($joinsep,($config, $tde));
       }
 
+      my $datapatch = $self->getDataPatch();
+      if (defined($datapatch)) {
+          $config = join($joinsep,($config, "-datapatch $datapatch"));
+      }
+
 
     } else {
       # dSource config for Oracle
@@ -1066,6 +1071,47 @@ sub setMountPoint {
     $self->{"NEWDB"}->{"source"}->{"mountBase"} = $mountpoint;
 }
 
+
+# Procedure getDataPatch
+# parameters:
+# Get mountpoint of DB.
+
+sub getDataPatch {
+    my $self = shift;
+    logger($self->{_debug}, "Entering OracleVDB_obj::getDataPatch",1);
+    my $ret;
+    if (version->parse($self->{_dlpxObject}->getApi()) >= version->parse(1.11.26)) {
+      if ($self->{"source"}->{"invokeDatapatch"}) {
+        $ret = "yes";
+      } else {
+        $ret = "no";
+      }
+    } 
+    return $ret;
+}
+
+# Procedure setDataPatch
+# parameters:
+# - mountpoint - mount point
+# Set mountpoint for new db.
+
+sub setDataPatch {
+    my $self = shift;
+    my $datapatch = shift;
+    logger($self->{_debug}, "Entering OracleVDB_obj::setDataPatch",1);
+
+    if (version->parse($self->{_dlpxObject}->getApi()) >= version->parse(1.11.26)) {
+      # only for 15 and higher
+      if (lc $datapatch eq 'no') {
+        $self->{"NEWDB"}->{"source"}->{"invokeDatapatch"} = JSON::false;
+      }
+      elsif (lc $datapatch eq 'yes') {
+        $self->{"NEWDB"}->{"source"}->{"invokeDatapatch"} = JSON::true;
+      } 
+    }
+}
+
+
 # Procedure setArchivelog
 # parameters:
 # - archivelog - type