#1162

Makefile

@@ -0,0 +1,14 @@
+lint:
+	python -m pycln .
+	python -m isort .
+	python -m black .
+
+refresh:
+	python -m pip install --quiet --upgrade -r requirements.txt
+	python -m pip install --quiet --upgrade -r tests/requirements.txt
+
+t:
+	python tests/sql_battery/test_shapes_and_errors_battery.py
+
+test:
+	python -m pytest

opteryx/__init__.py

@@ -55,9 +55,6 @@
 
 cache_manager = CacheManager(cache_backend=None)
 
-from opteryx.__author__ import __author__
-from opteryx.__build__ import __build__
-from opteryx.__version__ import __version__
 from opteryx.connection import Connection
 from opteryx.connectors import register_arrow
 from opteryx.connectors import register_df

opteryx/components/binder/binder_visitor.py

@@ -426,19 +426,28 @@ def visit_project(self, node: Node, context: BindingContext) -> Tuple[Node, Bind
 
         all_identities = [c.schema_column.identity for c in node.columns]
 
+        columns = []
         for relation, schema in list(context.schemas.items()):
-            columns = []
-            for column in schema.columns:
-                if column.identity in all_identities:
-                    columns.append(column)
-            if len(columns) == 0:
+            schema_columns = [
+                column for column in schema.columns if column.identity in all_identities
+            ]
+            if len(schema_columns) == 0:
                 context.schemas.pop(relation)
             else:
-                schema.columns = columns
-
+                schema.columns = schema_columns
+                columns += [
+                    column
+                    for column in node.columns
+                    if column.schema_column.identity in [i.identity for i in schema_columns]
+                ]
+
+        if "$derived" in context.schemas:
+            context.schemas["$project"] = context.schemas.pop("$derived")
         if not "$derived" in context.schemas:
             context.schemas["$derived"] = derived.schema()
 
+        node.columns = columns
+
         return node, context
 
     def visit_filter(self, node: Node, context: BindingContext) -> Tuple[Node, BindingContext]:

opteryx/connectors/capabilities/__init__.py

@@ -10,7 +10,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .cacheable import Cacheable
-from .partitionable import Partitionable
-from .predicate_pushable import PredicatePushable
-from .projection_pushable import ProjectionPushable
+from opteryx.connectors.capabilities.cacheable import Cacheable
+from opteryx.connectors.capabilities.partitionable import Partitionable
+from opteryx.connectors.capabilities.predicate_pushable import PredicatePushable
+from opteryx.connectors.capabilities.projection_pushable import ProjectionPushable
+
+__all__ = ("Cacheable", "Partitionable", "PredicatePushable", "ProjectionPushable")

opteryx/constants/__init__.py

@@ -1 +1,15 @@
-from .permissions import PERMISSIONS
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from opteryx.constants.permissions import PERMISSIONS
+
+__all__ = ("PERMISSIONS",)

opteryx/exceptions.py

@@ -53,7 +53,6 @@
 """
 
 from typing import Optional
-from typing import Union
 
 
 # ======================== Begin Codebase Errors ========================

opteryx/functions/v2.py

@@ -16,7 +16,6 @@
 """
 import datetime
 import inspect
-import os
 import re
 import sys
 import typing

opteryx/managers/cache/memcached.py

@@ -13,7 +13,6 @@
 This implements an interface to Memcached
 """
 
-import io
 import os
 from typing import Union
 

opteryx/managers/kvstores/kv_firestore.py

@@ -1,4 +1,3 @@
-import os
 from typing import Iterable
 from typing import Optional
 

opteryx/shared/__init__.py

@@ -10,7 +10,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .buffer_pool import BufferPool
-from .materialized_datasets import MaterializedDatasets
-from .query_statistics import QueryStatistics
-from .rolling_log import RollingLog
+from opteryx.shared.buffer_pool import BufferPool
+from opteryx.shared.materialized_datasets import MaterializedDatasets
+from opteryx.shared.query_statistics import QueryStatistics
+from opteryx.shared.rolling_log import RollingLog
+
+__all__ = ("BufferPool", "MaterializedDatasets", "QueryStatistics", "RollingLog")

tests/requirements.txt

@@ -8,6 +8,7 @@ mypy
 pytest
 black
 isort
+pycln
 
 pandas
 pymemcache