diff --git a/ingestion/src/metadata/ingestion/source/database/mssql/lineage.py b/ingestion/src/metadata/ingestion/source/database/mssql/lineage.py index 5a03eb88066..2c0906ab550 100644 --- a/ingestion/src/metadata/ingestion/source/database/mssql/lineage.py +++ b/ingestion/src/metadata/ingestion/source/database/mssql/lineage.py @@ -26,10 +26,6 @@ from metadata.ingestion.source.database.mssql.utils import ( class MssqlLineageSource(MssqlQueryParserSource, LineageSource): - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.start = self.start.replace(tzinfo=None) - self.end = self.end.replace(tzinfo=None) sql_stmt = MSSQL_SQL_STATEMENT diff --git a/ingestion/src/metadata/ingestion/source/database/mssql/metadata.py b/ingestion/src/metadata/ingestion/source/database/mssql/metadata.py index af6b20b4d2f..8821b43b970 100644 --- a/ingestion/src/metadata/ingestion/source/database/mssql/metadata.py +++ b/ingestion/src/metadata/ingestion/source/database/mssql/metadata.py @@ -224,7 +224,7 @@ class MssqlSource(StoredProcedureMixin, CommonDbSourceService, MultiDBSource): current_datetime_format = MSSQL_DATEFORMAT_DATETIME_MAP.get( server_date_format, DEFAULT_DATETIME_FORMAT ) - start = start.replace(tzinfo=None).strftime(current_datetime_format) + start = start.strftime(current_datetime_format) query = MSSQL_GET_STORED_PROCEDURE_QUERIES.format( start_date=start, ) diff --git a/ingestion/src/metadata/ingestion/source/database/mssql/usage.py b/ingestion/src/metadata/ingestion/source/database/mssql/usage.py index 31ff54fba34..f92208518c8 100644 --- a/ingestion/src/metadata/ingestion/source/database/mssql/usage.py +++ b/ingestion/src/metadata/ingestion/source/database/mssql/usage.py @@ -61,8 +61,8 @@ class MssqlUsageSource(MssqlQueryParserSource, UsageSource): Override if we have specific parameters """ return self.sql_stmt.format( - start_time=start_time.replace(tzinfo=None).strftime(self.dt_format), - end_time=end_time.replace(tzinfo=None).strftime(self.dt_format), + start_time=start_time.strftime(self.dt_format), + end_time=end_time.strftime(self.dt_format), filters=self.get_filters(), result_limit=self.source_config.resultLimit, ) diff --git a/ingestion/src/metadata/ingestion/source/database/oracle/queries.py b/ingestion/src/metadata/ingestion/source/database/oracle/queries.py index edabe617db9..026dec08e1f 100644 --- a/ingestion/src/metadata/ingestion/source/database/oracle/queries.py +++ b/ingestion/src/metadata/ingestion/source/database/oracle/queries.py @@ -104,7 +104,7 @@ WITH SP_HISTORY AS (SELECT PARSING_SCHEMA_NAME as user_name FROM gv$sql WHERE UPPER(sql_text) LIKE '%%CALL%%' or UPPER(sql_text) LIKE '%%BEGIN%%' - AND TO_TIMESTAMP(FIRST_LOAD_TIME, 'YYYY-MM-DD HH24:MI:SS') >= TO_TIMESTAMP_TZ('{start_date}', 'YYYY-MM-DD HH24:MI:SS+TZH:TZM') + AND TO_TIMESTAMP(FIRST_LOAD_TIME, 'YYYY-MM-DD HH24:MI:SS') >= TO_TIMESTAMP('{start_date}', 'YYYY-MM-DD HH24:MI:SS') ), Q_HISTORY AS (SELECT sql_text AS query_text, @@ -124,7 +124,7 @@ WITH SP_HISTORY AS (SELECT AND SQL_FULLTEXT NOT LIKE '/* {{"app": "OpenMetadata", %%}} */%%' AND SQL_FULLTEXT NOT LIKE '/* {{"app": "dbt", %%}} */%%' AND TO_TIMESTAMP(FIRST_LOAD_TIME, 'YYYY-MM-DD HH24:MI:SS') - >= TO_TIMESTAMP_TZ('{start_date}', 'YYYY-MM-DD HH24:MI:SS+TZH:TZM') + >= TO_TIMESTAMP('{start_date}', 'YYYY-MM-DD HH24:MI:SS') ) SELECT Q.QUERY_TYPE AS QUERY_TYPE, diff --git a/ingestion/src/metadata/utils/helpers.py b/ingestion/src/metadata/utils/helpers.py index a773ef7c67f..65645d7a6c3 100644 --- a/ingestion/src/metadata/utils/helpers.py +++ b/ingestion/src/metadata/utils/helpers.py @@ -123,7 +123,7 @@ def get_start_and_end(duration: int = 0) -> Tuple[datetime, datetime]: Method to return start and end time based on duration """ - today = datetime.now(timezone.utc) + today = datetime.now(timezone.utc).replace(tzinfo=None) start = (today + timedelta(0 - duration)).replace( hour=0, minute=0, second=0, microsecond=0 )