Changing engine connection strings into piecewise strings with db nam…

…e, username and password.

fabfile.py

@@ -234,6 +234,9 @@ def pull():
 def github(message):
     '''Add, commit and push to Github.'''
 
+    print message
+    print type(message)
+
     addthemall()
     commit(message)
     push()

realestate/lib/build.py

@@ -14,7 +14,7 @@
 
 from realestate import db
 from realestate.lib import parse
-from realestate import log, PROJECT_DIR
+from realestate import log, PROJECT_DIR, DATABASE_NAME
 
 
 class Build(object):
@@ -28,7 +28,13 @@ def __init__(self, initial_date=None, until_date=None):
         '''
 
         base = declarative_base()
-        engine = create_engine(os.environ.get('REAL_ESTATE_SERVER_ENGINE'))
+        engine = create_engine(
+            'postgresql://%s:%s@localhost/%s' % (
+                os.environ.get('REAL_ESTATE_DATABASE_USERNAME'),
+                os.environ.get('REAL_ESTATE_DATABASE_PASSWORD'),
+                DATABASE_NAME
+            )
+        )
         base.metadata.create_all(engine)
         self.sn = sessionmaker(bind=engine)
 

realestate/lib/clean.py

@@ -22,7 +22,7 @@
     Vendor
 )
 from realestate.lib.libraries import Library
-from realestate import log, USER
+from realestate import log, USER, DATABASE_NAME
 
 
 class Join(object):
@@ -37,7 +37,12 @@ def __init__(self, initial_date=None, until_date=None):
 
         base = declarative_base()
         self.engine = create_engine(
-            os.environ.get('REAL_ESTATE_SERVER_ENGINE'))
+            'postgresql://%s:%s@localhost/%s' % (
+                os.environ.get('REAL_ESTATE_DATABASE_USERNAME'),
+                os.environ.get('REAL_ESTATE_DATABASE_PASSWORD'),
+                DATABASE_NAME
+            )
+        )
         base.metadata.create_all(self.engine)
         self.sn = sessionmaker(bind=self.engine)
 
@@ -289,7 +294,12 @@ def __init__(self, initial_date=None, until_date=None):
 
         base = declarative_base()
         self.engine = create_engine(
-            os.environ.get('REAL_ESTATE_SERVER_ENGINE'))
+            'postgresql://%s:%s@localhost/%s' % (
+                os.environ.get('REAL_ESTATE_DATABASE_USERNAME'),
+                os.environ.get('REAL_ESTATE_DATABASE_PASSWORD'),
+                DATABASE_NAME
+            )
+        )
         base.metadata.create_all(self.engine)
         self.sn = sessionmaker(bind=self.engine)
 

realestate/lib/delete_dates.py

@@ -12,6 +12,7 @@
 
 import os
 import sys
+import psycopg2
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.ext.declarative import declarative_base
@@ -20,7 +21,7 @@
     Cleaned,
     Detail
 )
-from realestate import log
+from realestate import log, DATABASE_NAME
 
 
 class DeleteDates(object):
@@ -32,10 +33,24 @@ def __init__(self, initial_date=None, until_date=None):
 
         base = declarative_base()
         self.engine = create_engine(
-            os.environ.get('REAL_ESTATE_SERVER_ENGINE'))
+            'postgresql://%s:%s@localhost/%s' % (
+                os.environ.get('REAL_ESTATE_DATABASE_USERNAME'),
+                os.environ.get('REAL_ESTATE_DATABASE_PASSWORD'),
+                DATABASE_NAME
+            )
+        )
         base.metadata.create_all(self.engine)
         self.sn = sessionmaker(bind=self.engine)
 
+        self.conn = psycopg2.connect(
+            'host=localhost dbname=%s user=%s password=%s' % (
+                DATABASE_NAME,
+                os.environ.get('REAL_ESTATE_DATABASE_USERNAME'),
+                os.environ.get('REAL_ESTATE_DATABASE_PASSWORD')
+            )
+        )
+        self.cursor = self.conn.cursor()
+
         self.initial_date = initial_date
         self.until_date = until_date
 
@@ -52,17 +67,12 @@ def main(self):
     def vacuum(self):
         '''docstring'''
 
-        engine = create_engine(
-            os.environ.get('REAL_ESTATE_SERVER_ENGINE'))
-        conn = engine.connect()
-
-        old_isolation_level = conn.isolation_level
-        conn.set_isolation_level(0)
+        old_isolation_level = self.conn.isolation_level
+        self.conn.set_isolation_level(0)
         sql = 'VACUUM;'
-        conn.execute(sql)
-        conn.set_isolation_level(old_isolation_level)
-
-        conn.close()
+        self.cursor.execute(sql)
+        self.conn.commit()
+        self.conn.set_isolation_level(old_isolation_level)
 
     def delete_details(self):
         session = self.sn()

realestate/lib/form_tweet.py

@@ -17,7 +17,7 @@
 from subprocess import call
 
 from realestate.db import Cleaned
-from realestate import log, TODAY_DATE, PROJECT_DIR
+from realestate import log, TODAY_DATE, PROJECT_DIR, DATABASE_NAME
 from realestate.lib.twitter import Twitter
 
 
@@ -29,7 +29,13 @@ def __init__(self):
         '''Initialize self variables and establish connection to database.'''
 
         base = declarative_base()
-        engine = create_engine(os.environ.get('REAL_ESTATE_SERVER_ENGINE'))
+        engine = create_engine(
+            'postgresql://%s:%s@localhost/%s' % (
+                os.environ.get('REAL_ESTATE_DATABASE_USERNAME'),
+                os.environ.get('REAL_ESTATE_DATABASE_PASSWORD'),
+                DATABASE_NAME
+            )
+        )
         base.metadata.create_all(engine)
         self.sn = sessionmaker(bind=engine)
 

realestate/lib/geocode.py

@@ -22,7 +22,7 @@
     Location,
     Neighborhood
 )
-from realestate import log
+from realestate import log, DATABASE_NAME
 
 
 class Geocode(object):
@@ -40,7 +40,12 @@ def __init__(self, initial_date=None, until_date=None):
 
         base = declarative_base()
         self.engine = create_engine(
-            os.environ.get('REAL_ESTATE_SERVER_ENGINE'))
+            'postgresql://%s:%s@localhost/%s' % (
+                os.environ.get('REAL_ESTATE_DATABASE_USERNAME'),
+                os.environ.get('REAL_ESTATE_DATABASE_PASSWORD'),
+                DATABASE_NAME
+            )
+        )
         base.metadata.create_all(self.engine)
         self.sn = sessionmaker(bind=self.engine)
 

realestate/lib/get_dates.py

@@ -9,7 +9,7 @@
 from sqlalchemy.ext.declarative import declarative_base
 
 from realestate.db import Detail
-from realestate import log, YESTERDAY_DATE, OPENING_DATE
+from realestate import log, YESTERDAY_DATE, OPENING_DATE, DATABASE_NAME
 
 
 class GetDates(object):
@@ -21,7 +21,12 @@ def __init__(self):
 
         base = declarative_base()
         self.engine = create_engine(
-            os.environ.get('REAL_ESTATE_SERVER_ENGINE'))
+            'postgresql://%s:%s@localhost/%s' % (
+                os.environ.get('REAL_ESTATE_DATABASE_USERNAME'),
+                os.environ.get('REAL_ESTATE_DATABASE_PASSWORD'),
+                DATABASE_NAME
+            )
+        )
         base.metadata.create_all(self.engine)
         self.sn = sessionmaker(bind=self.engine)
 

realestate/lib/publish.py

@@ -23,7 +23,7 @@
     Detail,
     Location
 )
-from realestate import log
+from realestate import log, DATABASE_NAME
 
 
 class Publish(object):
@@ -34,7 +34,13 @@ def __init__(self, initial_date=None, until_date=None):
         '''Initialize self variables and establish connection to database.'''
 
         base = declarative_base()
-        engine = create_engine(os.environ.get('REAL_ESTATE_SERVER_ENGINE'))
+        engine = create_engine(
+            'postgresql://%s:%s@localhost/%s' % (
+                os.environ.get('REAL_ESTATE_DATABASE_USERNAME'),
+                os.environ.get('REAL_ESTATE_DATABASE_PASSWORD'),
+                DATABASE_NAME
+            )
+        )
         base.metadata.create_all(engine)
         self.sn = sessionmaker(bind=engine)
 

realestate/lib/stat_analysis.py

@@ -4,6 +4,7 @@
 
 import os
 from sqlalchemy import create_engine
+from realestate import DATABASE_NAME
 
 
 class StatAnalysis(object):
@@ -18,7 +19,12 @@ def __init__(self, initial_date=None, until_date=None):
         self.until_date = until_date
 
         self.engine = create_engine(
-            os.environ.get('REAL_ESTATE_SERVER_ENGINE'))
+            'postgresql://%s:%s@localhost/%s' % (
+                os.environ.get('REAL_ESTATE_DATABASE_USERNAME'),
+                os.environ.get('REAL_ESTATE_DATABASE_PASSWORD'),
+                DATABASE_NAME
+            )
+        )
 
     def count(self):
         '''Get number of records.'''

realestate/models.py

@@ -24,7 +24,7 @@
 # from realestate.lib.check_assessor_urls import Assessor
 from realestate.lib.results_language import ResultsLanguage
 from realestate.lib.utils import Utils
-from realestate import log, TODAY_DAY
+from realestate import log, TODAY_DAY, DATABASE_NAME
 
 
 class Models(object):
@@ -41,30 +41,19 @@ def __init__(self, initial_date=None, until_date=None):
         :type until_date: string
         '''
 
-        log.debug('1')
-
         self.initial_date = initial_date
 
-        log.debug('2')
-
         self.until_date = until_date
 
-        log.debug('3')
-
         base = declarative_base()
 
-        log.debug('4')
-
-        try:
-            log.debug('try')
-            print os.environ.get('REAL_ESTATE_SERVER_ENGINE')
-            log.debug('why')
-        except Exception, error:
-            log.debug(error, exc_info=True)
-
-        log.debug('5')
-
-        engine = create_engine(os.environ.get('REAL_ESTATE_SERVER_ENGINE'))
+        engine = create_engine(
+            'postgresql://%s:%s@localhost/%s' % (
+                os.environ.get('REAL_ESTATE_DATABASE_USERNAME'),
+                os.environ.get('REAL_ESTATE_DATABASE_PASSWORD'),
+                DATABASE_NAME
+            )
+        )
 
         base.metadata.create_all(engine)
 

scripts/delete_db.py

@@ -29,7 +29,12 @@ def __init__(self):
         '''Establish connection to the database.'''
 
         engine = create_engine(
-            '%s' % (os.environ.get('REAL_ESTATE_SERVER_ENGINE')))
+            'postgresql://%s:%s@localhost/%s' % (
+                os.environ.get('REAL_ESTATE_DATABASE_USERNAME'),
+                os.environ.get('REAL_ESTATE_DATABASE_PASSWORD'),
+                DATABASE_NAME
+            )
+        )
         self.conn = engine.connect()
         self.trans = self.conn.begin()
         self.inspector = reflection.Inspector.from_engine(engine)
@@ -77,7 +82,6 @@ def drop_db():
 
         log.debug('drop DB')
 
-        # Backup dashboard table, if it exists
         try:
             call([
                 'dropdb',