Skip to content

Commit

Permalink
Merge pull request #26 from keboola/adamvyborny-PST-1808
Browse files Browse the repository at this point in the history
Add string base types to manifests
  • Loading branch information
AdamVyborny authored Aug 14, 2024
2 parents 0ca2e8b + a546f9d commit 9f408b7
Show file tree
Hide file tree
Showing 66 changed files with 69 additions and 69 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ jobs:
name: 'Run tests'
run: |
export MONGODB_VERSION="${{ matrix.mongodb }}"
docker-compose run wait
docker-compose run app composer ci
docker compose run wait
docker compose run app composer ci
tests-in-kbc:
needs: build
runs-on: ubuntu-latest
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,14 +200,14 @@ Clone this repository and init the workspace with following command:
```
git clone https://github.com/keboola/ex-mongodb.git
cd ex-mongodb
docker-compose build #On M1 Mac build image with "--platform linux/amd64" flag
docker-compose run --rm dev composer install --no-scripts
docker compose build #On M1 Mac build image with "--platform linux/amd64" flag
docker compose run --rm dev composer install --no-scripts
```

Run the test suite using this command:

```
docker-compose run --rm dev composer tests
docker compose run --rm dev composer tests
```

# Integration
Expand Down
2 changes: 1 addition & 1 deletion src/Manifest.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function generate(): void
foreach ($this->columns as $column) {
$manifest->addSchema(new ManifestOptionsSchema(
$column,
null,
['base' => ['type' => 'string']],
true,
in_array($column, $this->primaryKey, true),
));
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"name":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"name":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"name":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"name":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"name":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"name":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"name":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"name":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","data"],"primary_key":["id"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"data":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","data"],"primary_key":["id"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"data":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"name":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"name":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"name":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"name":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"name":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"name":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"name":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"name":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","bool"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"bool":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","bool"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"bool":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"name":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"name":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"name":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"name":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"name":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"name":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"name":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"name":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"name":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"name":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"name":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","name"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"name":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["w","n","export-related-table-first-item-empty_pk"],"column_metadata":{"w":[{"key":"KBC.datatype.nullable","value":true}],"n":[{"key":"KBC.datatype.nullable","value":true}],"export-related-table-first-item-empty_pk":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["w","n","export-related-table-first-item-empty_pk"],"column_metadata":{"w":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"n":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"export-related-table-first-item-empty_pk":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id"],"primary_key":["id"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id"],"primary_key":["id"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","numberLong","numberLongInObject"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"numberLong":[{"key":"KBC.datatype.nullable","value":true}],"numberLongInObject":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","numberLong","numberLongInObject"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"numberLong":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"numberLongInObject":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["a","b","level2-a","level2-b","root_pk"],"column_metadata":{"a":[{"key":"KBC.datatype.nullable","value":true}],"b":[{"key":"KBC.datatype.nullable","value":true}],"level2-a":[{"key":"KBC.datatype.nullable","value":true}],"level2-b":[{"key":"KBC.datatype.nullable","value":true}],"root_pk":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["a","b","level2-a","level2-b","root_pk"],"column_metadata":{"a":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"b":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"level2-a":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"level2-b":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"root_pk":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["count","itemId","level1_pk"],"column_metadata":{"count":[{"key":"KBC.datatype.nullable","value":true}],"itemId":[{"key":"KBC.datatype.nullable","value":true}],"level1_pk":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["count","itemId","level1_pk"],"column_metadata":{"count":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"itemId":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"level1_pk":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["count","itemId","level1_pk"],"column_metadata":{"count":[{"key":"KBC.datatype.nullable","value":true}],"itemId":[{"key":"KBC.datatype.nullable","value":true}],"level1_pk":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["count","itemId","level1_pk"],"column_metadata":{"count":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"itemId":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"level1_pk":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":false,"columns":["id","level1"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"level1":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":false,"columns":["id","level1"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"level1":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":true,"columns":["id","decimal","date","timestamp"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"decimal":[{"key":"KBC.datatype.nullable","value":true}],"date":[{"key":"KBC.datatype.nullable","value":true}],"timestamp":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":true,"columns":["id","decimal","date","timestamp"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"decimal":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"date":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"timestamp":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":true,"columns":["id","decimal","date","timestamp"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"decimal":[{"key":"KBC.datatype.nullable","value":true}],"date":[{"key":"KBC.datatype.nullable","value":true}],"timestamp":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":true,"columns":["id","decimal","date","timestamp"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"decimal":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"date":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"timestamp":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":true,"columns":["id","decimal","date","timestamp"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"decimal":[{"key":"KBC.datatype.nullable","value":true}],"date":[{"key":"KBC.datatype.nullable","value":true}],"timestamp":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":true,"columns":["id","decimal","date","timestamp"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"decimal":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"date":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"timestamp":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":true,"columns":["id","decimal","date","timestamp"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"decimal":[{"key":"KBC.datatype.nullable","value":true}],"date":[{"key":"KBC.datatype.nullable","value":true}],"timestamp":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":true,"columns":["id","decimal","date","timestamp"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"decimal":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"date":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"timestamp":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":true,"columns":["id","decimal","date","timestamp"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"decimal":[{"key":"KBC.datatype.nullable","value":true}],"date":[{"key":"KBC.datatype.nullable","value":true}],"timestamp":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":true,"columns":["id","decimal","date","timestamp"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"decimal":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"date":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"timestamp":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"incremental":true,"columns":["id","decimal","date","timestamp"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true}],"decimal":[{"key":"KBC.datatype.nullable","value":true}],"date":[{"key":"KBC.datatype.nullable","value":true}],"timestamp":[{"key":"KBC.datatype.nullable","value":true}]}}
{"incremental":true,"columns":["id","decimal","date","timestamp"],"column_metadata":{"id":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"decimal":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"date":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}],"timestamp":[{"key":"KBC.datatype.nullable","value":true},{"key":"KBC.datatype.basetype","value":"string"}]}}
Loading

0 comments on commit 9f408b7

Please sign in to comment.