Cleaning up merge

Signed-off-by: Jason Myers <[email protected]>

Author: jasonamyers

redshift_sqlalchemy/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.3'
+__version__ = '0.3.1'
 
 from sqlalchemy.dialects import registry
 

redshift_sqlalchemy/dialect.py

@@ -4,6 +4,7 @@
 from sqlalchemy.types import VARCHAR, NullType
 from sqlalchemy.ext.compiler import compiles
 from sqlalchemy.sql.expression import Executable, ClauseElement
+from sqlalchemy.sql.expression import BindParameter
 
 
 class RedshiftDialect(PGDialect_psycopg2):
@@ -84,8 +85,19 @@ def visit_unload_from_select(element, compiler, **kw):
     import pdb; pdb.set_trace()
     query_str = str(query).replace("'", "\'")
     return "unload ('%(query)s') to '%(bucket)s' credentials 'aws_access_key_id=%(access_key)s;aws_secret_access_key=%(secret_key)s' delimiter ',' addquotes" % {
-        'query': query_str,
+        'query': compiler.process(element.select, unload_select=True, literal_binds=True),
         'bucket': element.bucket,
         'access_key': element.access_key,
         'secret_key': element.secret_key,
     }
+
+@compiles(BindParameter)
+def visit_bindparam(bindparam, compiler, **kw):
+    #print bindparam
+    res = compiler.visit_bindparam(bindparam, **kw)
+    if 'unload_select' in kw:
+        #process param and return
+        res = res.replace("'", "\\'")
+        return res
+    else:
+        return res

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='redshift-sqlalchemy',
-    version='0.3',
+    version='0.3.1',
     description='Amazon Redshift Dialect for sqlalchemy',
     long_description=open("README.rst").read(),
     author='Matt George',