splitgraph · gruuya · Jan 27, 2022 · Jan 24, 2022 · Jan 24, 2022 · Jan 25, 2022
diff --git a/engine/src/Multicorn b/engine/src/Multicorn
diff --git a/engine/src/postgres-elasticsearch-fdw b/engine/src/postgres-elasticsearch-fdw
diff --git a/splitgraph/ingestion/snowflake/__init__.py b/splitgraph/ingestion/snowflake/__init__.py
@@ -75,6 +75,7 @@ class SnowflakeDataSource(ForeignDataWrapperDataSource):
                         },
                     },
                 ],
+                "description": "A password or a private key to be used for authentication",
             },
             "account": {
                 "type": "string",
@@ -132,18 +133,24 @@ class SnowflakeDataSource(ForeignDataWrapperDataSource):
 $ sgr mount snowflake test_snowflake -o@- <<EOF
 {
     "username": "username",
-    "password": "password",
+    "secret": {
+		"secret_type": "password",
+		"password": "password"
+	},
     "account": "acc-id.west-europe.azure",
     "database": "SNOWFLAKE_SAMPLE_DATA",
-    "schema": "TPCH_SF100"
+    "schema": "TPCH_SF100",
     "envvars": {"HTTPS_PROXY": "http://proxy.company.com"}
 }
 EOF
 \b
 $ sgr mount snowflake test_snowflake_subquery -o@- <<EOF
 {
     "username": "username",
-    "private_key": "MIIEvQIBAD...",
+    "secret": {
+		"secret_type": "private_key",
+		"private_key": "MIIEvQIBAD..."
+	},
     "account": "acc-id.west-europe.azure",
     "database": "SNOWFLAKE_SAMPLE_DATA",
     "tables": {

diff --git a/test/architecture/data/pgorigin/accounts.csv b/test/architecture/data/pgorigin/accounts.csv
diff --git a/test/architecture/data/pgorigin/load_account_data.sql b/test/architecture/data/pgorigin/load_account_data.sql
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS account;
+CREATE TABLE account (
+    account_number integer,
+    balance integer,
+    firstname character varying(20),
+    lastname character varying(20),
+    age integer,
+    gender character varying(1),
+    address text,
+    employer character varying(20),
+    email text,
+    city character varying(20),
+    state character varying(5)
+);
+
+COPY account from '/src/accounts.csv' DELIMITER ',' CSV HEADER;
diff --git a/test/architecture/data/pgorigin/setup.sql b/test/architecture/data/pgorigin/setup.sql
@@ -15,4 +15,3 @@ INSERT INTO fruits (name) VALUES ('orange');
 
 INSERT INTO vegetables (name) VALUES ('potato');
 INSERT INTO vegetables (name) VALUES ('carrot');
-
diff --git a/test/architecture/src/pgorigin/start.sh b/test/architecture/src/pgorigin/start.sh
@@ -16,6 +16,7 @@ if [ ! -e '/done_setup' ]; then
 
     if [ -e '/src/setup.sql' ]; then
         ${SU} "psql ${ORIGIN_PG_DB} < /src/setup.sql"
+        ${SU} "psql ${ORIGIN_PG_DB} < /src/load_account_data.sql"
     fi
 
     echo 1 > /done_setup

diff --git a/...in_combinations/account_join_sub_aggs.yml → ...combinations/es/account_join_sub_aggs.yml b/...in_combinations/account_join_sub_aggs.yml → ...combinations/es/account_join_sub_aggs.yml
diff --git a/...hots/test_multicorn_fdws/test_aggregations_join_combinations/pg/account_join_sub_aggs.yml b/...hots/test_multicorn_fdws/test_aggregations_join_combinations/pg/account_join_sub_aggs.yml
@@ -0,0 +1,84 @@
+- !!python/tuple
+  - 20
+  - 49568
+  - 1650
+- !!python/tuple
+  - 21
+  - 49433
+  - 2213
+- !!python/tuple
+  - 22
+  - 49404
+  - 1133
+- !!python/tuple
+  - 23
+  - 49587
+  - 1464
+- !!python/tuple
+  - 24
+  - 48745
+  - 1011
+- !!python/tuple
+  - 25
+  - 49795
+  - 1956
+- !!python/tuple
+  - 26
+  - 48466
+  - 1447
+- !!python/tuple
+  - 27
+  - 46868
+  - 1110
+- !!python/tuple
+  - 28
+  - 49222
+  - 2889
+- !!python/tuple
+  - 29
+  - 49119
+  - 3596
+- !!python/tuple
+  - 30
+  - 49334
+  - 2726
+- !!python/tuple
+  - 31
+  - 48758
+  - 2384
+- !!python/tuple
+  - 32
+  - 48294
+  - 1031
+- !!python/tuple
+  - 33
+  - 48734
+  - 1314
+- !!python/tuple
+  - 34
+  - 48997
+  - 3001
+- !!python/tuple
+  - 35
+  - 49741
+  - 1481
+- !!python/tuple
+  - 36
+  - 49989
+  - 1249
+- !!python/tuple
+  - 37
+  - 47546
+  - 1360
+- !!python/tuple
+  - 38
+  - 49339
+  - 3022
+- !!python/tuple
+  - 39
+  - 47257
+  - 3589
+- !!python/tuple
+  - 40
+  - 49671
+  - 1932
diff --git a/...ggregations_bare/account_count_by_age.yml → ...egations_bare/es/account_count_by_age.yml b/...ggregations_bare/account_count_by_age.yml → ...egations_bare/es/account_count_by_age.yml
diff --git a/...shots/test_multicorn_fdws/test_grouping_and_aggregations_bare/pg/account_count_by_age.yml b/...shots/test_multicorn_fdws/test_grouping_and_aggregations_bare/pg/account_count_by_age.yml
@@ -0,0 +1,84 @@
+- !!python/tuple
+  - 40
+  - 45
+  - 1932
+- !!python/tuple
+  - 39
+  - 60
+  - 3589
+- !!python/tuple
+  - 38
+  - 39
+  - 3022
+- !!python/tuple
+  - 37
+  - 42
+  - 1360
+- !!python/tuple
+  - 36
+  - 52
+  - 1249
+- !!python/tuple
+  - 35
+  - 52
+  - 1481
+- !!python/tuple
+  - 34
+  - 49
+  - 3001
+- !!python/tuple
+  - 33
+  - 50
+  - 1314
+- !!python/tuple
+  - 32
+  - 52
+  - 1031
+- !!python/tuple
+  - 31
+  - 61
+  - 2384
+- !!python/tuple
+  - 30
+  - 47
+  - 2726
+- !!python/tuple
+  - 29
+  - 35
+  - 3596
+- !!python/tuple
+  - 28
+  - 51
+  - 2889
+- !!python/tuple
+  - 27
+  - 39
+  - 1110
+- !!python/tuple
+  - 26
+  - 59
+  - 1447
+- !!python/tuple
+  - 25
+  - 42
+  - 1956
+- !!python/tuple
+  - 24
+  - 42
+  - 1011
+- !!python/tuple
+  - 23
+  - 42
+  - 1464
+- !!python/tuple
+  - 22
+  - 51
+  - 1133
+- !!python/tuple
+  - 21
+  - 46
+  - 2213
+- !!python/tuple
+  - 20
+  - 44
+  - 1650
+4 −8		python/multicorn/__init__.py
+63 −19		python/multicorn/sqlalchemyfdw.py
+3 −8		src/python.c
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,3 @@ INSERT INTO fruits (name) VALUES ('orange');

		INSERT INTO vegetables (name) VALUES ('potato');
		INSERT INTO vegetables (name) VALUES ('carrot');