Skip to content

Commit 9cc0cef

Browse files
author
Gaetano Giunta
committed
improve cmd to list db users
1 parent 9ce165b commit 9cc0cef

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

app/src/Core/DatabaseSchemaManager.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public function getCreateDatabaseSQL($userName, $password, $dbName = null, $char
4141
($charset !== null ? " ENCODING $charset" : '') . /// @todo transform charset name into a supported one
4242
"; COMMIT; CREATE USER \"$userName\" WITH PASSWORD '$password'" .
4343
"; GRANT ALL ON DATABASE \"$dbName\" TO \"$userName\""; // q: should we avoid granting CREATE?
44+
//case 'sqlite':
4445
case 'sqlsrv':
4546
return
4647
/// @see https://docs.microsoft.com/en-us/sql/tools/sqlcmd-utility
@@ -81,6 +82,7 @@ public function getDropDatabaseQL($userName, $dbName = null)
8182
case 'pgsql':
8283
return
8384
"DROP DATABASE IF EXISTS \"$dbName\"; DROP USER IF EXISTS \"$userName\";";
85+
//case 'sqlite':
8486
case 'sqlsrv':
8587
return
8688
"SET QUOTED_IDENTIFIER ON; DROP DATABASE IF EXISTS \"$dbName\"; DROP USER IF EXISTS \"$userName\"; DROP LOGIN \"$userName\";";
@@ -104,6 +106,7 @@ public function getListInstancesSQL()
104106
case 'pgsql':
105107
return
106108
'SELECT datname AS "Database" FROM pg_database;';
109+
//case 'sqlite':
107110
case 'sqlsrv':
108111
return
109112
// the way we create it, the user account is contained in the db
@@ -120,13 +123,14 @@ public function getListUsersSQL()
120123
switch ($dbType) {
121124
case 'mysql':
122125
return
123-
'SELECT User FROM mysql.user;';
126+
'SELECT DISTINCT User FROM mysql.user ORDER BY User;';
124127
//case 'oracle':
125128
case 'pgsql':
126129
return
127-
'SELECT usename AS "User" FROM pg_catalog.pg_user;';
130+
'SELECT usename AS "User" FROM pg_catalog.pg_user ORDER BY usename;';
131+
//case 'sqlite':
128132
case 'sqlsrv':
129-
return '';
133+
return "SELECT name AS 'User' FROM sys.sql_logins ORDER BY name";
130134
default:
131135
throw new \OutOfBoundsException("Unsupported database type '$dbType'");
132136
}

0 commit comments

Comments
 (0)