fix: ensure 'concurrency' is not null when using it

great-expectations · Jan 4, 2022 · 7e6be55 · 7e6be55
1 parent a4352f3
commit 7e6be55
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/great_expectations/datasource/sqlalchemy_datasource.py b/great_expectations/datasource/sqlalchemy_datasource.py
@@ -244,11 +244,13 @@ def __init__(
                 self.engine = kwargs.pop("engine")
 
             else:
-                concurrency = (
-                    data_context.concurrency
-                    if data_context is not None
-                    else ConcurrencyConfig()
-                )
+
+                concurrency: ConcurrencyConfig
+                if data_context is None or data_context.concurrency is not None:
+                    concurrency = ConcurrencyConfig()
+                else:
+                    concurrency = data_context.concurrency
+
                 concurrency.add_sqlalchemy_create_engine_parameters(kwargs)
 
                 # If a connection string or url was provided, use that.

diff --git a/great_expectations/execution_engine/sqlalchemy_execution_engine.py b/great_expectations/execution_engine/sqlalchemy_execution_engine.py
@@ -236,9 +236,11 @@ def __init__(
                 )
             self.engine = engine
         else:
-            concurrency = (
-                concurrency if concurrency is not None else ConcurrencyConfig()
-            )
+            concurrency: ConcurrencyConfig
+            if data_context is None or data_context.concurrency is not None:
+                concurrency = ConcurrencyConfig()
+            else:
+                concurrency = data_context.concurrency
             concurrency.add_sqlalchemy_create_engine_parameters(kwargs)
 
             if credentials is not None: