equal
deleted
inserted
replaced
645 if (server.port <= 0) error("Undefined database server port") |
645 if (server.port <= 0) error("Undefined database server port") |
646 |
646 |
647 val name = proper_string(database) getOrElse user |
647 val name = proper_string(database) getOrElse user |
648 val url = "jdbc:postgresql://" + server.host + ":" + server.port + "/" + name |
648 val url = "jdbc:postgresql://" + server.host + ":" + server.port + "/" + name |
649 val ssh = server.ssh_system.ssh_session |
649 val ssh = server.ssh_system.ssh_session |
650 val print = user + "@" + server + "/" + name + if_proper(ssh, " via ssh " + ssh.get) |
650 val print = |
|
651 "server " + user + "@" + server + "/" + name + if_proper(ssh, " via ssh " + ssh.get) |
651 |
652 |
652 val connection = DriverManager.getConnection(url, user, password) |
653 val connection = DriverManager.getConnection(url, user, password) |
653 val db = new Database(connection, print, server, server_close) |
654 val db = new Database(connection, print, server, server_close) |
654 |
655 |
655 try { |
656 try { |