squash w/ setup. Rename delay server claim columns for catalog upgrade.

scripts/irods/database_upgrade.py

@@ -195,13 +195,13 @@ def run_update(irods_config, cursor):
         # - delay_server_pid: Holds the PID of the delay server which is executing the delay rule.
         # - claimed_ts: Holds the timestamp, in epoch seconds, which represents when the delay server claimed the delay rule for execution.
         if irods_config.catalog_database_type == 'oracle':
-            database_connect.execute_sql_statement(cursor, "alter table R_RULE_EXEC add (delay_server_host varchar2(300) default '');")
-            database_connect.execute_sql_statement(cursor, "alter table R_RULE_EXEC add (delay_server_pid varchar2(16) default '');")
-            database_connect.execute_sql_statement(cursor, "alter table R_RULE_EXEC add (delay_server_claimed_ts varchar2(32) default '');")
+            database_connect.execute_sql_statement(cursor, "alter table R_RULE_EXEC add (claim_host varchar2(300) default '');")
+            database_connect.execute_sql_statement(cursor, "alter table R_RULE_EXEC add (claim_host_pid varchar2(16) default '');")
+            database_connect.execute_sql_statement(cursor, "alter table R_RULE_EXEC add (claim_ts varchar2(32) default '');")
         else:
-            database_connect.execute_sql_statement(cursor, "alter table R_RULE_EXEC add column delay_server_host varchar(300) default '';")
-            database_connect.execute_sql_statement(cursor, "alter table R_RULE_EXEC add column delay_server_pid varchar(16) default '';")
-            database_connect.execute_sql_statement(cursor, "alter table R_RULE_EXEC add column delay_server_claimed_ts varchar(32) default '';")
+            database_connect.execute_sql_statement(cursor, "alter table R_RULE_EXEC add column claim_host varchar(300) default '';")
+            database_connect.execute_sql_statement(cursor, "alter table R_RULE_EXEC add column claim_host_pid varchar(16) default '';")
+            database_connect.execute_sql_statement(cursor, "alter table R_RULE_EXEC add column claim_ts varchar(32) default '';")
 
     else:
         raise IrodsError('Upgrade to schema version %d is unsupported.' % (new_schema_version))