Merge 030705c into 0c0941f

great-expectations · Apr 15, 2019 · 10d81d3 · 10d81d3
2 parents 0c0941f + 030705c
commit 10d81d3
Show file tree

Hide file tree

Showing 52 changed files with 193 additions and 371 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,10 +9,14 @@ env:
   - PANDAS=0.21.0
   - PANDAS=0.23.4
   - PANDAS=latest
+services:
+  - postgresql
 install:
   - pip install --only-binary=numpy,scipy numpy scipy
   - if [ "$PANDAS" = "latest" ]; then pip install pandas; else pip install pandas==$PANDAS; fi
   - pip install -r requirements-dev.txt
+before_script:
+  - psql -c 'create database test_ci;' -U postgres
 script:
   - pytest --cov=great_expectations tests/
 after_success:

diff --git a/great_expectations/dataset/sqlalchemy_dataset.py b/great_expectations/dataset/sqlalchemy_dataset.py
@@ -825,7 +825,7 @@ def expect_column_median_to_be_between(self,
         element_values = self.engine.execute(
             sa.select([sa.column(column)]).order_by(sa.column(column)).where(
                 sa.column(column) != None
-            ).offset(nonnull_count // 2 - 1).limit(2).select_from(self._table)
+            ).offset(max(nonnull_count // 2 - 1, 0)).limit(2).select_from(self._table)
         )
 
         column_values = list(element_values.fetchall())

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -14,3 +14,4 @@ pypandoc>=1.4
 pytest>=4.1.1
 pytest-cov>=2.6.1
 coveralls>=1.3
+psycopg2>=2.8.1
diff --git a/tests/column_aggregate_expectations/test_column_aggregate_expectations.py b/tests/column_aggregate_expectations/test_column_aggregate_expectations.py
diff --git a/tests/column_map_expectations/__init__.py b/tests/column_map_expectations/__init__.py
diff --git a/tests/column_map_expectations/test_column_map_expectations.py b/tests/column_map_expectations/test_column_map_expectations.py
diff --git a/tests/column_pair_map_expectations/__init__.py b/tests/column_pair_map_expectations/__init__.py
diff --git a/tests/column_pair_map_expectations/test_column_pair_map_expectations.py b/tests/column_pair_map_expectations/test_column_pair_map_expectations.py
diff --git a/tests/multicolumn_map_expectations/__init__.py b/tests/multicolumn_map_expectations/__init__.py
diff --git a/tests/multicolumn_map_expectations/test_multicolumn_map_expectations.py b/tests/multicolumn_map_expectations/test_multicolumn_map_expectations.py
diff --git a/tests/other_expectations/__init__.py b/tests/other_expectations/__init__.py
diff --git a/tests/other_expectations/test_other_expectations.py b/tests/other_expectations/test_other_expectations.py
diff --git a/...column_aggregate_expectations/__init__.py → tests/test_definitions/__init__.py b/...column_aggregate_expectations/__init__.py → tests/test_definitions/__init__.py
diff --git a/...ions/expect_column_max_to_be_between.json → ...ions/expect_column_max_to_be_between.json b/...ions/expect_column_max_to_be_between.json → ...ions/expect_column_max_to_be_between.json
@@ -21,6 +21,16 @@
         "zzz" : "varchar",
         "a" : "int",
         "b" : "int"
+      },
+      "postgresql": {
+        "w" : "int",
+        "x" : "int",
+        "y" : "int",
+        "z" : "text",
+        "zz" : "timestamp",
+        "zzz" : "text",
+        "a" : "int",
+        "b" : "int"
       }
     },
     "tests" : [{