From 37f5a8cdb4d2486982117c5d5984a253c2192e0b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 8 Jan 2012 17:49:53 +0100
Subject: [PATCH] improve pgsql database detection
---
lib/setup.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/setup.php b/lib/setup.php
index ebe7a45a1f..1b74e94519 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -190,9 +190,12 @@ class OC_Setup {
}
//fill the database if needed
- $query = "SELECT relname FROM pg_class WHERE relname='{$dbtableprefix}users' limit 1";
+ $query = "select count(*) FROM pg_class WHERE relname='{$dbtableprefix}users' limit 1";
$result = pg_query($connection, $query);
- if(!$result) {
+ if($result){
+ $row = pg_fetch_row($result);
+ }
+ if(!$result or $row[0]==0) {
OC_DB::createDbFromStructure('db_structure.xml');
}
pg_close($connection);
--
GitLab