get rid of MultiProviderConnector and move the logic to the datamod…

…el_connector crate

libs/datamodel/connectors/datamodel-connector/src/builtin_connectors.rs

@@ -1,9 +1,30 @@
-use super::{declarative_connector::*, ScalarType};
+use super::{declarative_connector::*, Connector, ScalarType};
 use crate::ConnectorCapability;
 
 pub struct BuiltinConnectors {}
 
 impl BuiltinConnectors {
+    // returns a connector representing the intersection of all provided connectors
+    pub fn combined(connectors: Vec<Box<dyn Connector>>) -> Box<dyn Connector> {
+        // the standard library does not seem to offer an elegant way to do this. Don't want to pull in a dependency for this.
+        let mut combined_capabilities = vec![];
+        for connector in &connectors {
+            for capability in connector.capabilities() {
+                let supported_by_all_connectors = connectors.iter().all(|c| c.has_capability(*capability));
+
+                if supported_by_all_connectors {
+                    combined_capabilities.push(*capability);
+                }
+            }
+        }
+
+        Box::new(DeclarativeConnector {
+            type_aliases: Vec::new(),
+            field_type_constructors: Vec::new(),
+            capabilities: combined_capabilities,
+        })
+    }
+
     pub fn sqlite() -> DeclarativeConnector {
         DeclarativeConnector {
             type_aliases: vec![],

libs/datamodel/connectors/datamodel-connector/src/lib.rs

@@ -5,11 +5,9 @@ pub mod scalars;
 
 mod builtin_connectors;
 mod declarative_connector;
-mod multi_provider_connector;
 
 pub use builtin_connectors::BuiltinConnectors;
 pub use declarative_connector::DeclarativeConnector;
-pub use multi_provider_connector::MultiProviderConnector;
 
 pub trait Connector: Send + Sync {
     fn capabilities(&self) -> &Vec<ConnectorCapability>;

libs/datamodel/core/src/configuration/source/loader.rs

@@ -7,7 +7,7 @@ use crate::common::value_validator::ValueListValidator;
 use crate::error::{DatamodelError, ErrorCollection};
 use crate::StringFromEnvVar;
 use crate::{ast, Datasource};
-use datamodel_connector::{Connector, MultiProviderConnector};
+use datamodel_connector::{BuiltinConnectors, Connector};
 
 /// Helper struct to load and validate source configuration blocks.
 pub struct SourceLoader {
@@ -135,7 +135,7 @@ impl SourceLoader {
 
         let combined_connector: Box<dyn Connector> = {
             let connectors = all_datasource_providers.iter().map(|sd| sd.connector()).collect();
-            Box::new(MultiProviderConnector::new(connectors))
+            BuiltinConnectors::combined(connectors)
         };
 
         // The first provider that can handle the URL is used to construct the Datasource.