Commit3169751

authored

Merge pull request#159 from UncoderIO/gis-8074

time part enum

2 parents009683e +6fb0865 commit3169751Copy full SHA for 3169751

File tree

+22

-8

lines changed

+22

-8

lines changed

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,3 +7,17 @@ class TimeFrameType(CustomEnum):`
`7`	`7`	`days="days"`
`8`	`8`	`hours="hours"`
`9`	`9`	`minutes="minutes"`
	`10`	`+`
	`11`	`+`
	`12`	`+classTimePartType(CustomEnum):`
	`13`	`+day="day"`
	`14`	`+day_of_week="day_of_week"`
	`15`	`+day_of_year="day_of_year"`
	`16`	`+hour="hour"`
	`17`	`+microsecond="microsecond"`
	`18`	`+millisecond="millisecond"`
	`19`	`+minute="minute"`
	`20`	`+month="month"`
	`21`	`+quarter="quarter"`
	`22`	`+second="second"`
	`23`	`+year="year"`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,14 @@ class StrictPlatformException(BasePlatformException):`
`13`	`13`	`field_name:str=None`
`14`	`14`
`15`	`15`	`def__init__(`
`16`		`-self,platform_name:str,field_name:str,mapping:str=None,detected_fields:Optional[list]=None`
	`16`	`+self,platform_name:str,field_name:str,mapping:Optional[str]=None,detected_fields:Optional[list]=None`
`17`	`17`	`):`
`18`	`18`	`message= (`
`19`	`19`	`f"Platform{platform_name} has strict mapping. "`
`20`	`20`	`f"Source fields:{', '.join(detected_fields)ifdetected_fieldselsefield_name} has no mapping."`
`21`		`-f" Mapping file:{mapping}."ifmappingelse""`
	`21`	`+f" Mapping file:{mapping}."`
	`22`	`+ifmapping`
	`23`	`+else""`
`22`	`24`	`)`
`23`	`25`	`self.field_name=field_name`
`24`	`26`	`super().__init__(message)`

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -263,16 +263,14 @@ def apply_token(self, token: Union[FieldValue, Keyword, Identifier], source_mapp`
`263`	`263`
`264`	`264`	`defgenerate_query(self,tokens:list[TOKEN_TYPE],source_mapping:SourceMapping)->str:`
`265`	`265`	`result_values= []`
`266`		`-not_found_mapping_fields=set()`
	`266`	`+unmapped_fields=set()`
`267`	`267`	`fortokenintokens:`
`268`	`268`	`try:`
`269`	`269`	`result_values.append(self.apply_token(token=token,source_mapping=source_mapping))`
`270`	`270`	`exceptStrictPlatformExceptionaserr:`
`271`		`-not_found_mapping_fields.add(err.field_name)`
`272`		`-ifnot_found_mapping_fields:`
`273`		`-raiseStrictPlatformException(`
`274`		`-self.details.name,"",source_mapping.source_id,sorted(list(not_found_mapping_fields))`
`275`		`- )`
	`271`	`+unmapped_fields.add(err.field_name)`
	`272`	`+ifunmapped_fields:`
	`273`	`+raiseStrictPlatformException(self.details.name,"",source_mapping.source_id,sorted(unmapped_fields))`
`276`	`274`	`return"".join(result_values)`
`277`	`275`
`278`	`276`	`defwrap_query_with_meta_info(self,meta_info:MetaInfoContainer,query:str)->str:`

Comments

(0)