Patch (#235)

* Fix permissions for containers.

* Verify container db

* Bump version

Author: wpuziewicz

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.2.1
+current_version = 4.2.2
 commit = True
 tag = False
 

scripts/collector/oracle/collect-data.sh

@@ -47,7 +47,7 @@ fi
 if [ ! -d ${OUTPUT_DIR} ]; then
    mkdir -p ${OUTPUT_DIR}
 fi
-OpVersion="4.2.1"
+OpVersion="4.2.2"
 ### Import logging & helper functions
 #############################################################################
 

scripts/collector/oracle/sql/setup/grants_wrapper.sql

@@ -60,7 +60,6 @@ DECLARE
     v_table_priv        VARCHAR2(30);
     v_cnt               NUMBER;
     v_err_ind           BOOLEAN := FALSE;
-    v_container_db      BOOLEAN := FALSE;
 
     v_infosep           VARCHAR2(100) := rpad('-', 100, '-');
     v_errsep            VARCHAR2(100) := rpad('!', 100, '!');
@@ -120,11 +119,16 @@ DECLARE
           END IF;  
         END;
      END LOOP;
-    IF v_container_db THEN
-       v_sql := 'ALTER USER  "&dbusername"  SET CONTAINER_DATA=ALL CONTAINER = CURRENT';
-       dbms_output.put_line(v_sql || ';' );
-       EXECUTE IMMEDIATE v_sql;
-       list_pdbs;
+    
+    SELECT count(1) INTO v_cnt FROM dba_tab_columns WHERE table_name ='V_$DATABASE' AND column_name ='CDB';
+    IF (v_cnt > 0) THEN
+       EXECUTE IMMEDIATE 'SELECT count(1) FROM v$containers' INTO v_cnt;
+       IF (v_cnt > 1) THEN
+         v_sql := 'ALTER USER  "&dbusername"  SET CONTAINER_DATA=ALL CONTAINER = CURRENT';
+         dbms_output.put_line(v_sql || ';' );
+         EXECUTE IMMEDIATE v_sql;
+         list_pdbs;
+       END IF;
     END IF;
     END;