Skip to content

Commit 45fc673

Browse files
authored
Merge pull request #65 from keboola/fix/added-missing-input-manifest-attributes
Fix/added missing input manifest attributes
2 parents a3417bf + 6ff0c86 commit 45fc673

8 files changed

Lines changed: 490 additions & 3 deletions

File tree

docs/dao.html

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2046,6 +2046,11 @@ <h2 id="args">Args</h2>
20462046
&#34;columns&#34;,
20472047
&#34;metadata&#34;,
20482048
&#34;column_metadata&#34;,
2049+
&#34;rows_count&#34;,
2050+
&#34;data_size_bytes&#34;,
2051+
&#34;is_alias&#34;,
2052+
&#34;attributes&#34;,
2053+
&#34;indexed_columns&#34;
20492054
]
20502055

20512056
OUTPUT_MANIFEST_ATTRIBUTES = [
@@ -2158,6 +2163,8 @@ <h2 id="args">Args</h2>
21582163
self._rows_count = kwargs.get(&#39;rows_count&#39;)
21592164
self._data_size_bytes = kwargs.get(&#39;data_size_bytes&#39;)
21602165
self._is_alias = kwargs.get(&#39;is_alias&#39;)
2166+
self._indexed_columns = kwargs.get(&#39;indexed_columns&#39;)
2167+
self._attributes = kwargs.get(&#39;attributes&#39;)
21612168

21622169
self.stage = stage
21632170
self.has_header = has_header or self._has_header_in_file()
@@ -2410,7 +2417,9 @@ <h2 id="args">Args</h2>
24102417
rows_count=manifest.get(&#39;rows_count&#39;),
24112418
data_size_bytes=manifest.get(&#39;data_size_bytes&#39;),
24122419
is_alias=manifest.get(&#39;is_alias&#39;),
2413-
force_legacy_mode=force_legacy_mode
2420+
force_legacy_mode=force_legacy_mode,
2421+
indexed_columns=manifest.get(&#39;indexed_columns&#39;),
2422+
attributes=manifest.get(&#39;attributes&#39;)
24142423
)
24152424

24162425
return table_def
@@ -2487,6 +2496,8 @@ <h2 id="args">Args</h2>
24872496
&#39;rows_count&#39;: self._rows_count,
24882497
&#39;data_size_bytes&#39;: self._data_size_bytes,
24892498
&#39;is_alias&#39;: self._is_alias,
2499+
&#39;indexed_columns&#39;: self._indexed_columns,
2500+
&#39;attributes&#39;: self._attributes,
24902501

24912502
&#39;destination&#39;: self.destination,
24922503
&#39;incremental&#39;: self.incremental,

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
setuptools.setup(
1515
name="keboola.component",
16-
version="1.6.3",
16+
version="1.6.4",
1717
author="Keboola KDS Team",
1818
project_urls=project_urls,
1919
setup_requires=['pytest-runner', 'flake8'],

src/keboola/component/dao.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,11 @@ class TableDefinition(IODefinition):
744744
"columns",
745745
"metadata",
746746
"column_metadata",
747+
"rows_count",
748+
"data_size_bytes",
749+
"is_alias",
750+
"attributes",
751+
"indexed_columns"
747752
]
748753

749754
OUTPUT_MANIFEST_ATTRIBUTES = [
@@ -856,6 +861,8 @@ def __init__(self, name: str,
856861
self._rows_count = kwargs.get('rows_count')
857862
self._data_size_bytes = kwargs.get('data_size_bytes')
858863
self._is_alias = kwargs.get('is_alias')
864+
self._indexed_columns = kwargs.get('indexed_columns')
865+
self._attributes = kwargs.get('attributes')
859866

860867
self.stage = stage
861868
self.has_header = has_header or self._has_header_in_file()
@@ -1108,7 +1115,9 @@ def build_from_manifest(cls,
11081115
rows_count=manifest.get('rows_count'),
11091116
data_size_bytes=manifest.get('data_size_bytes'),
11101117
is_alias=manifest.get('is_alias'),
1111-
force_legacy_mode=force_legacy_mode
1118+
force_legacy_mode=force_legacy_mode,
1119+
indexed_columns=manifest.get('indexed_columns'),
1120+
attributes=manifest.get('attributes')
11121121
)
11131122

11141123
return table_def
@@ -1185,6 +1194,8 @@ def _filter_attributes_by_manifest_type(self, manifest_type: Literal["in", "out"
11851194
'rows_count': self._rows_count,
11861195
'data_size_bytes': self._data_size_bytes,
11871196
'is_alias': self._is_alias,
1197+
'indexed_columns': self._indexed_columns,
1198+
'attributes': self._attributes,
11881199

11891200
'destination': self.destination,
11901201
'incremental': self.incremental,
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"storage": {
3+
"input": {
4+
"files": [],
5+
"tables": [
6+
{
7+
"source": "in.c-main.test",
8+
"destination": "sample.csv",
9+
"columns": [],
10+
"where_values": [],
11+
"where_operator": "eq",
12+
"column_types": [
13+
{
14+
"source": "Sales",
15+
"type": "VARCHAR",
16+
"destination": "id",
17+
"length": "255",
18+
"nullable": false,
19+
"convert_empty_values_to_null": false
20+
}
21+
]
22+
}
23+
]
24+
}
25+
26+
},
27+
"parameters": {
28+
29+
}
30+
31+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"test_state": 1234
3+
}

0 commit comments

Comments
 (0)