From db6f165cb5cb96148fe5f0f11ba12f6d5e73520d Mon Sep 17 00:00:00 2001
From: Rockie Yang <rockie-yang@users.noreply.github.com>
Date: Fri, 8 Dec 2017 19:43:18 +0100
Subject: [PATCH] =?UTF-8?q?Add=20host=20command=20line=20parameter=20in=20?=
 =?UTF-8?q?load=5Fdemo.py,=20use=20the=20same=20command=E2=80=A6=20(#229)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add host command line parameter in load_demo.py, use the same command line for load_demo2.py

* Change default password to postgres
---
 tools/load_demo.py  |  9 ++++++---
 tools/load_demo2.py | 18 +++++++++++++++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/tools/load_demo.py b/tools/load_demo.py
index e300a226d..346ed3c8b 100644
--- a/tools/load_demo.py
+++ b/tools/load_demo.py
@@ -7,15 +7,18 @@
 if(len(sys.argv) > 1):
     port = sys.argv[1]
 
-port = None
 user = None
 password = None
 if(len(sys.argv) > 2):
-    port = sys.argv[1]
     user = sys.argv[2]
     password = sys.argv[3]
 
-conn = psycopg2.connect("dbname='postgres' host='localhost'" +
+host = "localhost"
+if (len(sys.argv) > 3):
+    host = sys.argv[4]
+
+conn = psycopg2.connect("dbname='postgres'" +
+                         (" host='" + host + "'") +
                          (" port="+port if port else "") +
                          (" user="+user if user else "") +
                          (" password="+password if password else ""))
diff --git a/tools/load_demo2.py b/tools/load_demo2.py
index 8f342c376..7a4d8b7b1 100644
--- a/tools/load_demo2.py
+++ b/tools/load_demo2.py
@@ -12,6 +12,17 @@
 if(len(sys.argv) > 2):
     port = sys.argv[2]
 
+user = "postgres"
+password = "postgres"
+if(len(sys.argv) > 3):
+    user = sys.argv[3]
+    password = sys.argv[4]
+
+host = "localhost"
+if (len(sys.argv) > 4):
+    host = sys.argv[5]
+
+
 # TODO: These can be made configurable later
 NUM_ATTRIBUTES = 4
 NUM_METRICS = 5
@@ -24,7 +35,12 @@
   ["CA", "MA", "NY", "WY", "AR", "NV", "PA", "WA", "WI"]
 ]
 
-conn = psycopg2.connect("dbname='postgres' host='localhost'" + " port="+port if port else "" + " user=postgres password=mamikonyan")
+conn = psycopg2.connect("dbname='postgres'" +
+                         (" host='" + host + "'") +
+                         (" port="+port if port else "") +
+                         (" user="+user if user else "") +
+                         (" password="+password if password else ""))
+
 cur = conn.cursor()
 
 print "Creating table..."