This is an automated email from the ASF dual-hosted git repository. ephraimanierobi pushed a commit to branch v2-3-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 691ceab95354d5ba6b3679ca6be026a45e172129 Author: Daniel Standish <[email protected]> AuthorDate: Fri Jun 24 09:31:58 2022 -0700 Fix timestamp defaults for sensorinstance (#24638) Constant values were used where callables were intended. (cherry picked from commit 40765307d8c2febbeaddff61551cbfa9d717522e) --- airflow/migrations/versions/0001_1_5_0_current_schema.py | 2 +- .../migrations/versions/0065_2_0_0_update_schema_for_smart_sensor.py | 4 ++-- airflow/migrations/versions/0103_2_3_0_add_callback_request_table.py | 2 +- airflow/models/sensorinstance.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/airflow/migrations/versions/0001_1_5_0_current_schema.py b/airflow/migrations/versions/0001_1_5_0_current_schema.py index 9824db7dad..c700df8c47 100644 --- a/airflow/migrations/versions/0001_1_5_0_current_schema.py +++ b/airflow/migrations/versions/0001_1_5_0_current_schema.py @@ -214,7 +214,7 @@ def upgrade(): sa.Column('id', sa.Integer(), nullable=False), sa.Column('key', StringID(length=512), nullable=True), sa.Column('value', sa.PickleType(), nullable=True), - sa.Column('timestamp', sa.DateTime(), default=func.now(), nullable=False), + sa.Column('timestamp', sa.DateTime(), default=func.now, nullable=False), sa.Column('execution_date', sa.DateTime(), nullable=False), sa.Column('task_id', StringID(), nullable=False), sa.Column('dag_id', StringID(), nullable=False), diff --git a/airflow/migrations/versions/0065_2_0_0_update_schema_for_smart_sensor.py b/airflow/migrations/versions/0065_2_0_0_update_schema_for_smart_sensor.py index d98be012b7..228361dc58 100644 --- a/airflow/migrations/versions/0065_2_0_0_update_schema_for_smart_sensor.py +++ b/airflow/migrations/versions/0065_2_0_0_update_schema_for_smart_sensor.py @@ -61,8 +61,8 @@ def upgrade(): sa.Column('shardcode', sa.Integer(), nullable=False), sa.Column('poke_context', sa.Text(), nullable=False), sa.Column('execution_context', sa.Text(), nullable=True), - sa.Column('created_at', TIMESTAMP, default=func.now(), nullable=False), - sa.Column('updated_at', TIMESTAMP, default=func.now(), nullable=False), + sa.Column('created_at', TIMESTAMP, default=func.now, nullable=False), + sa.Column('updated_at', TIMESTAMP, default=func.now, nullable=False), sa.PrimaryKeyConstraint('id'), ) op.create_index('ti_primary_key', 'sensor_instance', ['dag_id', 'task_id', 'execution_date'], unique=True) diff --git a/airflow/migrations/versions/0103_2_3_0_add_callback_request_table.py b/airflow/migrations/versions/0103_2_3_0_add_callback_request_table.py index 637abe8aee..747a6217c2 100644 --- a/airflow/migrations/versions/0103_2_3_0_add_callback_request_table.py +++ b/airflow/migrations/versions/0103_2_3_0_add_callback_request_table.py @@ -45,7 +45,7 @@ def upgrade(): op.create_table( TABLE_NAME, sa.Column('id', sa.Integer(), nullable=False, primary_key=True), - sa.Column('created_at', TIMESTAMP, default=func.now(), nullable=False), + sa.Column('created_at', TIMESTAMP, default=func.now, nullable=False), sa.Column('priority_weight', sa.Integer(), default=1, nullable=False), sa.Column('callback_data', ExtendedJSON, nullable=False), sa.Column('callback_type', sa.String(20), nullable=False), diff --git a/airflow/models/sensorinstance.py b/airflow/models/sensorinstance.py index b1681e5227..8c66536064 100644 --- a/airflow/models/sensorinstance.py +++ b/airflow/models/sensorinstance.py @@ -59,8 +59,8 @@ class SensorInstance(Base): shardcode = Column(Integer, nullable=False) poke_context = Column(Text, nullable=False) execution_context = Column(Text) - created_at = Column(UtcDateTime, default=timezone.utcnow(), nullable=False) - updated_at = Column(UtcDateTime, default=timezone.utcnow(), onupdate=timezone.utcnow(), nullable=False) + created_at = Column(UtcDateTime, default=timezone.utcnow, nullable=False) + updated_at = Column(UtcDateTime, default=timezone.utcnow, onupdate=timezone.utcnow, nullable=False) # SmartSensor doesn't support mapped operators, but this is needed for compatibly with the # log_filename_template of TaskInstances
