diff options
| -rw-r--r-- | html/new-connection.html | 10 | ||||
| -rw-r--r-- | main.js | 2 | ||||
| -rw-r--r-- | query-executor.js | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/html/new-connection.html b/html/new-connection.html index 192c9b9..b2bf325 100644 --- a/html/new-connection.html +++ b/html/new-connection.html @@ -23,8 +23,8 @@ <div class="select is-small"> <select name="vendor"> <option value="postgres">Postgres</option> - <option value="mysql">MySQL/MariaDB</option> - <option value="oracle">Oracle</option> + <option value="mysql" disabled>MySQL/MariaDB</option> + <option value="oracle" disabled>Oracle</option> </select> </div> </div> @@ -53,6 +53,12 @@ <input name="password" class="input is-small" type="text"/> </div> </div> + <div class="field"> + <label class="label is-small" for="database">Database</label> + <div class="control"> + <input name="database" class="input is-small" type="text"/> + </div> + </div> <div id="status-message" class="field"></div> <div class="field is-grouped"> <div class="control"> @@ -51,7 +51,7 @@ app.on("activate", () => { function createNewConnectionDialog() { newConnectionDialog = new BrowserWindow({ width: 400, - height: 600 + height: 640 }); newConnectionDialog.loadURL(url.format({ pathname: path.join(__dirname, "html", "new-connection.html"), diff --git a/query-executor.js b/query-executor.js index b9fb561..6ae9f4f 100644 --- a/query-executor.js +++ b/query-executor.js @@ -12,7 +12,7 @@ const connectionConfig = remote.getCurrentWindow().connectionConfig; const connectionPool = new Pool({ user: connectionConfig.username, host: connectionConfig.host, - database: "postgres", + database: connectionConfig.database, password: connectionConfig.password, port: connectionConfig.port }); @@ -56,9 +56,9 @@ ipcRenderer.on("queryExecutor.queryTableMetadata", (event, payload) => { let tableMetadata = {}; let tableDataQuery = - "SELECT c.table_schema || '.' || c.table_name identifier, c.column_name " + + "SELECT c.table_name identifier, c.column_name " + "FROM information_schema.columns c " + - "WHERE c.table_schema != 'pg_catalog'"; + "WHERE c.table_schema = current_schema()"; connectionPool.query(tableDataQuery, (err, res) => { |