Yedidyah Bar David has uploaded a new change for review.

Change subject: packaging: dbscripts: sync with engine
......................................................................

packaging: dbscripts: sync with engine

Get dbscripts change I7de630ba6130aa349c15c1101cf2b041614fa5eb from
engine.

Change-Id: I15fb748a5709c17d01905655182ba864eb250303
Related-To: https://bugzilla.redhat.com/1056528
Signed-off-by: Yedidyah Bar David <d...@redhat.com>
---
M packaging/dbscripts/dbfunc-base.sh
M packaging/dbscripts/dbfunc-common.sh
2 files changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/05/27905/1

diff --git a/packaging/dbscripts/dbfunc-base.sh 
b/packaging/dbscripts/dbfunc-base.sh
index e5a8595..8db0a7b 100644
--- a/packaging/dbscripts/dbfunc-base.sh
+++ b/packaging/dbscripts/dbfunc-base.sh
@@ -99,4 +99,3 @@
 dbfunc_pg_dump_die() {
        dbfunc_pg_dump "$@" || die "Cannot execute pg_dump command: $*"
 }
-
diff --git a/packaging/dbscripts/dbfunc-common.sh 
b/packaging/dbscripts/dbfunc-common.sh
index 23b6bdf..6bf5d76 100644
--- a/packaging/dbscripts/dbfunc-common.sh
+++ b/packaging/dbscripts/dbfunc-common.sh
@@ -53,9 +53,11 @@
 
        echo "Creating schema 
${DBFUNC_DB_USER}@${DBFUNC_DB_HOST}:${DBFUNC_DB_PORT}/${DBFUNC_DB_DATABASE}"
        if [ "$(dbfunc_psql_statement_parsable "
-                select count(*) as count
-                from information_schema.tables
-                where table_name = 'schema_version'
+               select count(*) as count
+               from pg_catalog.pg_tables
+               where
+                       tablename = 'schema_version' and
+                       schemaname = 'public'
        ")" -eq 0 ]; then
                echo "Creating fresh schema"
                _dbfunc_common_schema_create


-- 
To view, visit http://gerrit.ovirt.org/27905
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I15fb748a5709c17d01905655182ba864eb250303
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-dwh
Gerrit-Branch: master
Gerrit-Owner: Yedidyah Bar David <d...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to