Fixed services queries

Author: afumagalli98

sql/services.sql

@@ -16,6 +16,30 @@
 set lines 8000 pages 0 feedback off verify off timing off
 set colsep "|||"
 
-select name,FAILOVER_METHOD,FAILOVER_TYPE,FAILOVER_RETRIES,FAILOVER_DELAY,ENABLED from dba_services where NAME not in('SYS$BACKGROUND','SYS$USERS');
+define TABLENAME = 'dba_services'
+col :TABLENAME_ new_val TABLENAME noprint
+variable TABLENAME_ varchar2(30) 
+
+define NAMECOLUMNS = '-1 pdb,name,FAILOVER_METHOD,FAILOVER_TYPE,FAILOVER_RETRIES,FAILOVER_DELAY,ENABLED'
+col :NAMECOLUMNS_ new_val NAMECOLUMNS noprint
+variable NAMECOLUMNS_ varchar2(100)
+
+DECLARE 
+DB_VERSION number;
+begin
+	DB_VERSION := dbms_db_version.version + (dbms_db_version.release / 10);
+	if DB_VERSION < 12.1 then
+		:TABLENAME_ := 'dba_services';
+		:NAMECOLUMNS_ := ''''' pdb,name,FAILOVER_METHOD,FAILOVER_TYPE,FAILOVER_RETRIES,FAILOVER_DELAY,ENABLED';
+	else
+		:TABLENAME_ := 'cdb_services';
+		:NAMECOLUMNS_ := 'pdb,name,FAILOVER_METHOD,FAILOVER_TYPE,FAILOVER_RETRIES,FAILOVER_DELAY,ENABLED';
+	end if;	
+end;
+/
+
+select :TABLENAME_, :NAMECOLUMNS_ from dual;
+
+select &NAMECOLUMNS from &TABLENAME where NAME not in('SYS$BACKGROUND','SYS$USERS');
 
 exit

sql/services_pdb.sql

@@ -16,30 +16,8 @@
 set lines 8000 pages 0 feedback off verify off timing off
 set colsep "|||"
 
-define TABLENAME = 'dba_services'
-col :TABLENAME_ new_val TABLENAME noprint
-variable TABLENAME_ varchar2(30) 
+alter session set container=&1;
 
-define NAMECOLUMNS = '-1 pdb,name,FAILOVER_METHOD,FAILOVER_TYPE,FAILOVER_RETRIES,FAILOVER_DELAY,ENABLED'
-col :NAMECOLUMNS_ new_val NAMECOLUMNS noprint
-variable NAMECOLUMNS_ varchar2(100)
-
-DECLARE 
-DB_VERSION number;
-begin
-	DB_VERSION := dbms_db_version.version + (dbms_db_version.release / 10);
-	if DB_VERSION < 12.1 then
-		:TABLENAME_ := 'dba_services';
-		:NAMECOLUMNS_ := ''''' pdb,name,FAILOVER_METHOD,FAILOVER_TYPE,FAILOVER_RETRIES,FAILOVER_DELAY,ENABLED';
-	else
-		:TABLENAME_ := 'cdb_services';
-		:NAMECOLUMNS_ := 'pdb,name,FAILOVER_METHOD,FAILOVER_TYPE,FAILOVER_RETRIES,FAILOVER_DELAY,ENABLED';
-	end if;	
-end;
-/
-
-select :TABLENAME_, :NAMECOLUMNS_ from dual;
-
-select &NAMECOLUMNS from &TABLENAME where NAME not in('SYS$BACKGROUND','SYS$USERS');
+select name,FAILOVER_METHOD,FAILOVER_TYPE,FAILOVER_RETRIES,FAILOVER_DELAY,ENABLED from dba_services where NAME not in('SYS$BACKGROUND','SYS$USERS');
 
 exit