Default if no columns

gabfl · Oct 4, 2017 · 16e7b61 · 16e7b61
1 parent fbfc6ee
commit 16e7b61
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ export PYTHON_OVERRIDE=python3
 make && make install
 
 # Install bigquery_fdw
-pip3 install bigquery_fdw
+pip3 install bigquery-fdw
 ```
 
 ## Usage
@@ -56,8 +56,8 @@ With `psql`:
 CREATE EXTENSION multicorn;
 
 CREATE SERVER bigquery_srv FOREIGN DATA WRAPPER multicorn
-OPTIONS (		
-    wrapper 'bigquery_fdw.fdw.ConstantForeignDataWrapper'		
+OPTIONS (
+    wrapper 'bigquery_fdw.fdw.ConstantForeignDataWrapper'
 );
 
 CREATE FOREIGN TABLE my_bigquery_table (

diff --git a/setup.py b/setup.py
@@ -7,8 +7,8 @@
     long_description = open('README.md').read()
 
 setup(
-    name='bigquery_fdw',
-    version='1.0',
+    name='bigquery-fdw',
+    version='1.0.2',
     description='BigQuery Foreign Data Wrapper for PostgreSQL',
     long_description=long_description,
     author='Gabriel Bordeaux',

diff --git a/src/bqclient.py b/src/bqclient.py
@@ -58,7 +58,7 @@ def getQueryJob(self):
             Returns `queryJob`
         """
 
-        return self.QueryJob
+        return self.queryJob
 
     def readResult(self):
         """

diff --git a/src/fdw.py b/src/fdw.py
@@ -196,14 +196,17 @@ def buildSelectClause(self, columns):
 
         # Add SELECT clause
         clause += "SELECT "
-        for column in columns:
-            if column != self.partitionPseudoColumn:  # Except for the partition pseudo column
-                clause += column + ", "
-            else:
-                clause += "null as " + column + ", "  # Partition pseudo column is forced to return `null`
-
-        # Remove final `, `
-        clause = clause.strip(', ')
+        if columns:  # If we have columns
+            for column in columns:
+                if column != self.partitionPseudoColumn:  # Except for the partition pseudo column
+                    clause += column + ", "
+                else:
+                    clause += "null as " + column + ", "  # Partition pseudo column is forced to return `null`
+
+            # Remove final `, `
+            clause = clause.strip(', ')
+        else:  # Otherwide fetch all
+            clause += "*"
 
         return clause