Merge branch 'worktree-agent-adbc35a5' into Develop
# Conflicts: # .planning/STATE.md # drizzle-pg/meta/0002_snapshot.json # drizzle-pg/meta/_journal.json # src/db/schema.ts
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
"id": "1c8fbda2-e486-4f57-a6d5-1a2e7042e413",
|
||||
=======
|
||||
"id": "4b01f839-a5ff-416c-826c-1e37e76d0a78",
|
||||
>>>>>>> worktree-agent-adbc35a5
|
||||
"prevId": "8fb47390-ff75-41f7-aa35-fad97b1a097e",
|
||||
"version": "7",
|
||||
"dialect": "postgresql",
|
||||
@@ -136,6 +140,7 @@
|
||||
"checkConstraints": {},
|
||||
"isRLSEnabled": false
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"public.global_item_tags": {
|
||||
"name": "global_item_tags",
|
||||
"schema": "",
|
||||
@@ -196,6 +201,8 @@
|
||||
"checkConstraints": {},
|
||||
"isRLSEnabled": false
|
||||
},
|
||||
=======
|
||||
>>>>>>> worktree-agent-adbc35a5
|
||||
"public.global_items": {
|
||||
"name": "global_items",
|
||||
"schema": "",
|
||||
@@ -264,6 +271,75 @@
|
||||
"checkConstraints": {},
|
||||
"isRLSEnabled": false
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"public.item_global_links": {
|
||||
"name": "item_global_links",
|
||||
"schema": "",
|
||||
"columns": {
|
||||
"id": {
|
||||
"name": "id",
|
||||
"type": "serial",
|
||||
"primaryKey": true,
|
||||
"notNull": true
|
||||
},
|
||||
"item_id": {
|
||||
"name": "item_id",
|
||||
"type": "integer",
|
||||
"primaryKey": false,
|
||||
"notNull": true
|
||||
},
|
||||
"global_item_id": {
|
||||
"name": "global_item_id",
|
||||
"type": "integer",
|
||||
"primaryKey": false,
|
||||
"notNull": true
|
||||
}
|
||||
},
|
||||
"indexes": {},
|
||||
"foreignKeys": {
|
||||
"item_global_links_item_id_items_id_fk": {
|
||||
"name": "item_global_links_item_id_items_id_fk",
|
||||
"tableFrom": "item_global_links",
|
||||
"tableTo": "items",
|
||||
"columnsFrom": [
|
||||
"item_id"
|
||||
],
|
||||
"columnsTo": [
|
||||
"id"
|
||||
],
|
||||
"onDelete": "cascade",
|
||||
"onUpdate": "no action"
|
||||
},
|
||||
"item_global_links_global_item_id_global_items_id_fk": {
|
||||
"name": "item_global_links_global_item_id_global_items_id_fk",
|
||||
"tableFrom": "item_global_links",
|
||||
"tableTo": "global_items",
|
||||
"columnsFrom": [
|
||||
"global_item_id"
|
||||
],
|
||||
"columnsTo": [
|
||||
"id"
|
||||
],
|
||||
"onDelete": "cascade",
|
||||
"onUpdate": "no action"
|
||||
}
|
||||
},
|
||||
"compositePrimaryKeys": {},
|
||||
"uniqueConstraints": {
|
||||
"item_global_links_item_id_unique": {
|
||||
"name": "item_global_links_item_id_unique",
|
||||
"nullsNotDistinct": false,
|
||||
"columns": [
|
||||
"item_id"
|
||||
]
|
||||
}
|
||||
},
|
||||
"policies": {},
|
||||
"checkConstraints": {},
|
||||
"isRLSEnabled": false
|
||||
},
|
||||
>>>>>>> worktree-agent-adbc35a5
|
||||
"public.items": {
|
||||
"name": "items",
|
||||
"schema": "",
|
||||
@@ -335,6 +411,7 @@
|
||||
"notNull": true,
|
||||
"default": 1
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"global_item_id": {
|
||||
"name": "global_item_id",
|
||||
"type": "integer",
|
||||
@@ -347,6 +424,8 @@
|
||||
"primaryKey": false,
|
||||
"notNull": false
|
||||
},
|
||||
=======
|
||||
>>>>>>> worktree-agent-adbc35a5
|
||||
"created_at": {
|
||||
"name": "created_at",
|
||||
"type": "timestamp",
|
||||
@@ -389,6 +468,7 @@
|
||||
],
|
||||
"onDelete": "no action",
|
||||
"onUpdate": "no action"
|
||||
<<<<<<< HEAD
|
||||
},
|
||||
"items_global_item_id_global_items_id_fk": {
|
||||
"name": "items_global_item_id_global_items_id_fk",
|
||||
@@ -402,6 +482,8 @@
|
||||
],
|
||||
"onDelete": "no action",
|
||||
"onUpdate": "no action"
|
||||
=======
|
||||
>>>>>>> worktree-agent-adbc35a5
|
||||
}
|
||||
},
|
||||
"compositePrimaryKeys": {},
|
||||
@@ -938,12 +1020,15 @@
|
||||
"notNull": true,
|
||||
"default": 0
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"global_item_id": {
|
||||
"name": "global_item_id",
|
||||
"type": "integer",
|
||||
"primaryKey": false,
|
||||
"notNull": false
|
||||
},
|
||||
=======
|
||||
>>>>>>> worktree-agent-adbc35a5
|
||||
"created_at": {
|
||||
"name": "created_at",
|
||||
"type": "timestamp",
|
||||
@@ -986,6 +1071,7 @@
|
||||
],
|
||||
"onDelete": "no action",
|
||||
"onUpdate": "no action"
|
||||
<<<<<<< HEAD
|
||||
},
|
||||
"thread_candidates_global_item_id_global_items_id_fk": {
|
||||
"name": "thread_candidates_global_item_id_global_items_id_fk",
|
||||
@@ -999,6 +1085,8 @@
|
||||
],
|
||||
"onDelete": "no action",
|
||||
"onUpdate": "no action"
|
||||
=======
|
||||
>>>>>>> worktree-agent-adbc35a5
|
||||
}
|
||||
},
|
||||
"compositePrimaryKeys": {},
|
||||
|
||||
Reference in New Issue
Block a user