Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

oracle_db: fixed ORA-00904: invalid identifier sql: select SUPPLEMENTAL_LOG_DATA_MIN #147

Merged
merged 2 commits into from
Jul 11, 2022
Merged
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
26 changes: 14 additions & 12 deletions oracle_db
Original file line number Diff line number Diff line change
Expand Up @@ -594,11 +594,23 @@ def ensure_db_state (module,msg,oracle_home,db_name,db_unique_name,sid, archivel

change_restart_sql = []
change_db_sql = []
supp_log_check_sql = 'select SUPPLEMENTAL_LOG_DATA_MIN,SUPPLEMENTAL_LOG_DATA_PL,SUPPLEMENTAL_LOG_DATA_SR,SUPPLEMENTAL_LOG_DATA_PK,SUPPLEMENTAL_LOG_DATA_UI from v$database'
log_check_sql = 'select log_mode,force_logging, flashback_on from v$database'
supp_log_check_ = execute_sql_get(module,msg,cursor,supp_log_check_sql)
log_check_ = execute_sql_get(module,msg,cursor,log_check_sql)

if major_version >= '19.0':
supp_log_check_sql = 'select SUPPLEMENTAL_LOG_DATA_MIN,SUPPLEMENTAL_LOG_DATA_PL,SUPPLEMENTAL_LOG_DATA_SR,SUPPLEMENTAL_LOG_DATA_PK,SUPPLEMENTAL_LOG_DATA_UI from v$database'
supp_log_check_ = execute_sql_get(module,msg,cursor,supp_log_check_sql)
if supp_log_check_[0][0] != slcomp:

if supplemental_logging == True:
slcomp = 'YES'
slsql = alterdb_sql + ' add supplemental log data'
else:
slcomp = 'NO'
slsql = alterdb_sql + ' drop supplemental log data'

change_db_sql.append(slsql)

if israc_[0][0] == 'NO':
israc = False
else:
Expand All @@ -625,13 +637,6 @@ def ensure_db_state (module,msg,oracle_home,db_name,db_unique_name,sid, archivel
fbcomp = 'NO'
fbsql = alterdb_sql + ' flashback off'

if supplemental_logging == True:
slcomp = 'YES'
slsql = alterdb_sql + ' add supplemental log data'
else:
slcomp = 'NO'
slsql = alterdb_sql + ' drop supplemental log data'

if def_tbs_type[0] != default_tablespace_type:
deftbstypesql = 'alter database set default %s tablespace ' % (default_tablespace_type)
change_db_sql.append(deftbstypesql)
Expand All @@ -657,9 +662,6 @@ def ensure_db_state (module,msg,oracle_home,db_name,db_unique_name,sid, archivel
if log_check_[0][2] != fbcomp:
change_db_sql.append(fbsql)

if supp_log_check_[0][0] != slcomp:
change_db_sql.append(slsql)

if len(change_db_sql) > 0 or len(change_restart_sql) > 0:

if log_check_[0][0] == 'ARCHIVELOG' and log_check_[0][2] == 'YES' and not archivelog and not flashback: # Flashback database needs to be turned off before archivelog is turned off
Expand Down