Skip to content

Commit 7cbd318

Browse files
committedApr 24, 2023
modified file names and functions
1 parent 197b092 commit 7cbd318

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed
 
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
from .dialact import RedshiftDialact
1+
from .dialect import RedshiftDialect, RedshiftQuery
22
from .query_builder import QueryBuilder

‎src/app/services/query_builder/dialact.py ‎src/app/services/query_builder/dialect.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,20 @@ def left_join(self, item: Table) -> "JoinQuery":
4545

4646

4747
@dataclass()
48-
class RedshiftDialact:
48+
class RedshiftDialect:
4949
target_table_conf: List[Dict]
50-
joins_and_filers_conf: Dict[str, Dict]
50+
joins_and_filters_conf: Dict[str, Dict]
5151

52-
def build(self) -> None:
52+
def get_sql(self) -> None:
5353
"""Method to trrigger Redshift query builder
5454
"""
5555
logger.info('building Redshift query from the mappings file')
5656

5757
_query = RedshiftQuery()
58-
for _index in self.joins_and_filers_conf:
5958

60-
_map = self.joins_and_filers_conf[_index]
59+
for _index in self.joins_and_filters_conf:
60+
61+
_map = self.joins_and_filters_conf[_index]
6162

6263
if int(_index) == 0:
6364
schema1, schema2 = Schema(_map['driving_table'].split(
@@ -68,7 +69,7 @@ def build(self) -> None:
6869
Table(_map['reference_table'].split('.')[1],
6970
schema=schema2, alias=_map['reference_table_alias'])
7071

71-
_query = _query.from_(table1).inner_join( # type: ignore
72+
_query = _query.from_(table1).inner_join(
7273
table2).on(_map['join_condition'])
7374
else:
7475
schema2 = Schema(_map['reference_table'].split(

‎src/app/services/query_builder/query_builder.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from app.etl_exceptions import AutoETLException
88
from app.services.config_parser import ConfigParser, MetadataParser
9-
from app.services.query_builder import RedshiftDialact
9+
from app.services.query_builder import RedshiftDialect
1010
from app.utils import excel_to_json, validate_joins_mapping
1111

1212
logger = logging.getLogger(__name__)
@@ -49,10 +49,9 @@ def run(self) -> None:
4949
meta_xls, 'joins_and_filters', 'index')
5050

5151
validate_joins_mapping(joins_and_filters)
52-
5352
match _config['target']:
5453
case 'redshift':
55-
RedshiftDialact(target_table_json, joins_and_filters).build()
54+
RedshiftDialect(target_table_json, joins_and_filters).get_sql()
5655

5756
case _:
5857
logger.error(

‎src/app/utils.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import json
22
import logging
33
import os
4-
from typing import Dict, List
4+
from typing import Dict
55

66
import pandas as pd
77
from pydantic import Json
@@ -49,7 +49,7 @@ def validate_joins_mapping(joins_and_filters_conf: Dict[str, Dict]) -> None:
4949
logger.info('validating and processing joins mapping conf')
5050
num_joins = len(joins_and_filters_conf)
5151
logger.info(
52-
'found {%d} number of mappings in the configurations', num_joins)
52+
'found %d mappings in the configurations', num_joins)
5353
for _index in joins_and_filters_conf:
5454
_map = joins_and_filters_conf[_index]
5555
if _index == 0:

0 commit comments

Comments
 (0)
Please sign in to comment.