Allow views and tables

This commit is contained in:
Patrick Valsecchi
2017-12-19 11:01:44 +01:00
parent 3a21b2ddaf
commit f95ca2753a
2 changed files with 13 additions and 7 deletions

View File

@@ -17,7 +17,7 @@ user_sql.adminSettingsUI = function()
$('#sqlDiv').tabs(); $('#sqlDiv').tabs();
// Attach auto-completion to all column fields // Attach auto-completion to all column fields
$('#col_username, #col_password, #col_displayname, #col_active, #col_email, #col_gethome').autocomplete({ $('#col_username, #col_password, #col_displayname, #col_active, #col_email, #col_gethome, #col_group_name, #col_group_username').autocomplete({
source: function(request, response) source: function(request, response)
{ {
var post = $('#sqlForm').serializeArray(); var post = $('#sqlForm').serializeArray();
@@ -56,7 +56,7 @@ user_sql.adminSettingsUI = function()
}); });
// Attach auto-completion to all table fields // Attach auto-completion to all table fields
$('#sql_table').autocomplete({ $('#sql_table, #sql_group_table').autocomplete({
source: function(request, response) source: function(request, response)
{ {
var post = $('#sqlForm').serializeArray(); var post = $('#sqlForm').serializeArray();

View File

@@ -314,13 +314,19 @@ class Helper {
try { try {
$conn = $cm -> getConnection($sql_driver, $parameters); $conn = $cm -> getConnection($sql_driver, $parameters);
$platform = $conn -> getDatabasePlatform(); $platform = $conn -> getDatabasePlatform();
$query = $platform -> getListTablesSQL();
$result = $conn -> executeQuery($query); $queries = array(
'Tables_in_'.$parameters['dbname'] => $platform -> getListTablesSQL(),
'TABLE_NAME' => $platform -> getListViewsSQL($parameters['dbname']));
$ret = array(); $ret = array();
while($row = $result -> fetch()) foreach($queries as $field => $query)
{ {
$name = $row['Tables_in_'.$parameters['dbname']]; $result = $conn -> executeQuery($query);
$ret[] = $name; while($row = $result -> fetch())
{
$name = $row[$field];
$ret[] = $name;
}
} }
return $ret; return $ret;
} }