mirror of
https://github.com/langgenius/dify.git
synced 2025-12-23 11:13:07 -05:00
Merge remote-tracking branch 'origin/main' into feat/trigger
# Conflicts: # api/docker/entrypoint.sh # api/uv.lock # dev/start-worker # docker/.env.example # docker/docker-compose.yaml # web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/chart-view.tsx # web/app/components/base/date-and-time-picker/date-picker/index.tsx # web/app/components/base/date-and-time-picker/types.ts
This commit is contained in:
@@ -140,8 +140,9 @@ class Workflow(Base):
|
||||
updated_at: Mapped[datetime] = mapped_column(
|
||||
DateTime,
|
||||
nullable=False,
|
||||
default=naive_utc_now(),
|
||||
server_onupdate=func.current_timestamp(),
|
||||
default=func.current_timestamp(),
|
||||
server_default=func.current_timestamp(),
|
||||
onupdate=func.current_timestamp(),
|
||||
)
|
||||
_environment_variables: Mapped[str] = mapped_column(
|
||||
"environment_variables", sa.Text, nullable=False, server_default="{}"
|
||||
@@ -150,7 +151,7 @@ class Workflow(Base):
|
||||
"conversation_variables", sa.Text, nullable=False, server_default="{}"
|
||||
)
|
||||
_rag_pipeline_variables: Mapped[str] = mapped_column(
|
||||
"rag_pipeline_variables", db.Text, nullable=False, server_default="{}"
|
||||
"rag_pipeline_variables", sa.Text, nullable=False, server_default="{}"
|
||||
)
|
||||
|
||||
VERSION_DRAFT = "draft"
|
||||
|
||||
Reference in New Issue
Block a user