mirror/postfixadmin
0
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2024-09-19 19:22:14 +02:00
Code

fix postgresql test

Browse Source
This commit is contained in:
David Goodwin 2021-01-19 16:50:56 +00:00
parent 95b431599d
commit e7e1ce9c28
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
model/Login.php
View File

@ -26,6 +26,7 @@ class Login {
$values = array('username' => $username, 'active' => $active);
$result = db_query_all($query, $values);
if (sizeof($result) == 1 && strlen($password) > 0) {
$row = $result[0];

6
public/upgrade.php
View File

@ -1386,7 +1386,11 @@ function upgrade_730_pgsql() {
$table_quota = table_by_key('quota');
$table_quota2 = table_by_key('quota2');
db_query_parsed('CREATE LANGUAGE plpgsql', 1); /* will error if plpgsql is already installed */
try {
db_query_parsed('CREATE LANGUAGE plpgsql', 1); /* will error if plpgsql is already installed */
} catch (\Exception $e) {
error_log("ignoring exception that's probably : plpgsql is probably already installed; " . $e);
}
# trigger for dovecot v1.0 & 1.1 quota table
# taken from http://wiki.dovecot.org/Quota/Dict

11
tests/LoginTest.php
View File

@ -8,11 +8,10 @@ class LoginTest extends \PHPUnit\Framework\TestCase {
$CONF['pacrypt'] = 'md5'; // crap
db_execute("INSERT INTO domain(`domain`, description, transport) values ('example.com', 'test', 'foo')", [], true);
db_execute("INSERT INTO domain(domain, description, transport) values ('example.com', 'test', 'foo')", [], true);
db_execute(
"INSERT INTO mailbox(username, password, `name`, maildir, local_part, `domain`)
VALUES(:username, :password, :name, :maildir, :local_part, :domain)",
"INSERT INTO mailbox(username, password, name, maildir, local_part, domain) VALUES(:username, :password, :name, :maildir, :local_part, :domain)",
[
'username' => 'test@example.com',
'password' => pacrypt('foobar'),
@ -21,6 +20,8 @@ VALUES(:username, :password, :name, :maildir, :local_part, :domain)",
'local_part' => 'test',
'domain' => 'example.com',
]);
parent::setUp();
}
@ -31,8 +32,10 @@ VALUES(:username, :password, :name, :maildir, :local_part, :domain)",
}
private function cleanUp() {
db_querY('DELETE FROM alias');
db_query('DELETE FROM alias');
db_query('DELETE FROM alias_domain');
db_query('DELETE FROM mailbox');
db_query('DELETE FROM domain_admins');
db_query('DELETE FROM domain');
}