Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: database: support different tables to check if database is empty ......................................................................
packaging: setup: database: support different tables to check if database is empty Change-Id: I1703886f06afedcc339dfdf8f6c2138fa1c9d8e1 Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/ovirt_engine_setup/database.py M packaging/setup/plugins/ovirt-engine-common/base/db/connection.py 3 files changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/32/23732/1 diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index 6783e48..4c10399 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -646,6 +646,7 @@ 'database': DBEnv.DATABASE, 'connection': DBEnv.CONNECTION, 'pgpassfile': DBEnv.PGPASS_FILE, + 'markerTable': DBEnv.MARKER_TABLE, } @@ -768,6 +769,7 @@ STATEMENT = 'OVESETUP_DB/statement' PGPASS_FILE = 'OVESETUP_DB/pgPassFile' NEW_DATABASE = 'OVESETUP_DB/newDatabase' + MARKER_TABLE = 'OVESETUP_DB/markerTable' @osetupattrs( answerfile=True, diff --git a/packaging/setup/ovirt_engine_setup/database.py b/packaging/setup/ovirt_engine_setup/database.py index 40f3533..cbd77aa 100644 --- a/packaging/setup/ovirt_engine_setup/database.py +++ b/packaging/setup/ovirt_engine_setup/database.py @@ -361,7 +361,9 @@ where table_name=%(table)s """, args=dict( - table='schema_version', + table=self.environment[ + self._dbenvkeys['markerTable'] + ], ), host=host, port=port, diff --git a/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py b/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py index 2b3bcd3..f2271c4 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py @@ -85,6 +85,7 @@ None ) + self.environment[osetupcons.DBEnv.MARKER_TABLE] = 'schema_version' self.environment[osetupcons.DBEnv.CONNECTION] = None self.environment[osetupcons.DBEnv.STATEMENT] = None self.environment[osetupcons.DBEnv.NEW_DATABASE] = True -- To view, visit http://gerrit.ovirt.org/23732 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1703886f06afedcc339dfdf8f6c2138fa1c9d8e1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
