Skip to content

Commit

Permalink
Adds optional support for database host and port
Browse files Browse the repository at this point in the history
  • Loading branch information
mholthausen committed Jan 24, 2020
1 parent 5d66708 commit 9a7ab71
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions py3dtiles/export.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,14 @@ def wkbs2tileset(wkbs, ids, transform):
arrays2tileset(positions, normals, bboxes, transform, ids)


def from_db(db_name, table_name, column_name, id_column_name, user_name):
def from_db(db_name, table_name, column_name, id_column_name, user_name, host=None, port=None):
user = getpass.getuser() if user_name is None else user_name

try:
connection = psycopg2.connect(dbname=db_name, user=user)
connection = psycopg2.connect(dbname=db_name, user=user, host=host, port=port)
except psycopg2.OperationalError:
pw = getpass.getpass("Postgres password for user {}\n".format(user))
connection = psycopg2.connect(dbname=db_name, user=user, password=pw)
connection = psycopg2.connect(dbname=db_name, user=user, password=pw, host=host, port=port)

cur = connection.cursor()

Expand Down Expand Up @@ -318,14 +318,20 @@ def init_parser(subparser, str2bool):
u_help = 'database user name'
parser.add_argument('-u', metavar='USER', type=str, help=u_help)

H_help = 'database host'
parser.add_argument('-H', metavar='HOST', type=str, help=H_help)

P_help = 'database port'
parser.add_argument('-P', metavar='PORT', type=int, help=P_help)


def main(args):
if args.D is not None:
if args.t is None or args.c is None:
print('Error: please define a table (-t) and column (-c)')
exit()

from_db(args.D, args.t, args.c, args.i, args.u)
from_db(args.D, args.t, args.c, args.i, args.u, args.H, args.P)
elif args.d is not None:
from_directory(args.d, args.o)
else:
Expand Down

0 comments on commit 9a7ab71

Please sign in to comment.