fix(db): resolve conflict markers in 0016 snapshot (#52)
PR #51 was merged with unresolved conflict markers in drizzle/meta/0016_snapshot.json, producing invalid JSON. Reconstructed the correct snapshot from the clean 0015 snapshot + the 0016 migration SQL (custom_themes + user_theme_preference tables). Co-authored-by: Nicholai <nicholaivogelfilms@gmail.com>
This commit is contained in:
parent
b5211d181d
commit
59688b972f
@ -1,12 +1,8 @@
|
|||||||
{
|
{
|
||||||
"version": "6",
|
"version": "6",
|
||||||
"dialect": "sqlite",
|
"dialect": "sqlite",
|
||||||
<<<<<<< HEAD
|
"id": "f83247c2-ad76-4fae-bdea-3342a9f3842f",
|
||||||
"id": "24da6db4-2ea9-47dd-807b-224e89738ab0",
|
"prevId": "f4c54926-b492-453b-bc4a-88eb2a6d63ee",
|
||||||
=======
|
|
||||||
"id": "f4c54926-b492-453b-bc4a-88eb2a6d63ee",
|
|
||||||
>>>>>>> origin/main
|
|
||||||
"prevId": "08b14bdc-7015-48bd-9ec9-10a0b977c08f",
|
|
||||||
"tables": {
|
"tables": {
|
||||||
"agent_conversations": {
|
"agent_conversations": {
|
||||||
"name": "agent_conversations",
|
"name": "agent_conversations",
|
||||||
@ -1421,8 +1417,6 @@
|
|||||||
"autoincrement": false,
|
"autoincrement": false,
|
||||||
"default": "'office'"
|
"default": "'office'"
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
"google_email": {
|
"google_email": {
|
||||||
"name": "google_email",
|
"name": "google_email",
|
||||||
"type": "text",
|
"type": "text",
|
||||||
@ -1430,7 +1424,6 @@
|
|||||||
"notNull": false,
|
"notNull": false,
|
||||||
"autoincrement": false
|
"autoincrement": false
|
||||||
},
|
},
|
||||||
>>>>>>> origin/main
|
|
||||||
"is_active": {
|
"is_active": {
|
||||||
"name": "is_active",
|
"name": "is_active",
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
@ -3172,13 +3165,8 @@
|
|||||||
"uniqueConstraints": {},
|
"uniqueConstraints": {},
|
||||||
"checkConstraints": {}
|
"checkConstraints": {}
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD
|
|
||||||
"custom_themes": {
|
|
||||||
"name": "custom_themes",
|
|
||||||
=======
|
|
||||||
"google_auth": {
|
"google_auth": {
|
||||||
"name": "google_auth",
|
"name": "google_auth",
|
||||||
>>>>>>> origin/main
|
|
||||||
"columns": {
|
"columns": {
|
||||||
"id": {
|
"id": {
|
||||||
"name": "id",
|
"name": "id",
|
||||||
@ -3187,42 +3175,20 @@
|
|||||||
"notNull": true,
|
"notNull": true,
|
||||||
"autoincrement": false
|
"autoincrement": false
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD
|
|
||||||
"user_id": {
|
|
||||||
"name": "user_id",
|
|
||||||
=======
|
|
||||||
"organization_id": {
|
"organization_id": {
|
||||||
"name": "organization_id",
|
"name": "organization_id",
|
||||||
>>>>>>> origin/main
|
|
||||||
"type": "text",
|
"type": "text",
|
||||||
"primaryKey": false,
|
"primaryKey": false,
|
||||||
"notNull": true,
|
"notNull": true,
|
||||||
"autoincrement": false
|
"autoincrement": false
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD
|
|
||||||
"name": {
|
|
||||||
"name": "name",
|
|
||||||
=======
|
|
||||||
"service_account_key_encrypted": {
|
"service_account_key_encrypted": {
|
||||||
"name": "service_account_key_encrypted",
|
"name": "service_account_key_encrypted",
|
||||||
>>>>>>> origin/main
|
|
||||||
"type": "text",
|
"type": "text",
|
||||||
"primaryKey": false,
|
"primaryKey": false,
|
||||||
"notNull": true,
|
"notNull": true,
|
||||||
"autoincrement": false
|
"autoincrement": false
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD
|
|
||||||
"description": {
|
|
||||||
"name": "description",
|
|
||||||
"type": "text",
|
|
||||||
"primaryKey": false,
|
|
||||||
"notNull": true,
|
|
||||||
"autoincrement": false,
|
|
||||||
"default": "''"
|
|
||||||
},
|
|
||||||
"theme_data": {
|
|
||||||
"name": "theme_data",
|
|
||||||
=======
|
|
||||||
"workspace_domain": {
|
"workspace_domain": {
|
||||||
"name": "workspace_domain",
|
"name": "workspace_domain",
|
||||||
"type": "text",
|
"type": "text",
|
||||||
@ -3246,7 +3212,6 @@
|
|||||||
},
|
},
|
||||||
"connected_by": {
|
"connected_by": {
|
||||||
"name": "connected_by",
|
"name": "connected_by",
|
||||||
>>>>>>> origin/main
|
|
||||||
"type": "text",
|
"type": "text",
|
||||||
"primaryKey": false,
|
"primaryKey": false,
|
||||||
"notNull": true,
|
"notNull": true,
|
||||||
@ -3269,29 +3234,18 @@
|
|||||||
},
|
},
|
||||||
"indexes": {},
|
"indexes": {},
|
||||||
"foreignKeys": {
|
"foreignKeys": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"custom_themes_user_id_users_id_fk": {
|
|
||||||
"name": "custom_themes_user_id_users_id_fk",
|
|
||||||
"tableFrom": "custom_themes",
|
|
||||||
"tableTo": "users",
|
|
||||||
"columnsFrom": [
|
|
||||||
"user_id"
|
|
||||||
=======
|
|
||||||
"google_auth_organization_id_organizations_id_fk": {
|
"google_auth_organization_id_organizations_id_fk": {
|
||||||
"name": "google_auth_organization_id_organizations_id_fk",
|
"name": "google_auth_organization_id_organizations_id_fk",
|
||||||
"tableFrom": "google_auth",
|
"tableFrom": "google_auth",
|
||||||
"tableTo": "organizations",
|
"tableTo": "organizations",
|
||||||
"columnsFrom": [
|
"columnsFrom": [
|
||||||
"organization_id"
|
"organization_id"
|
||||||
>>>>>>> origin/main
|
|
||||||
],
|
],
|
||||||
"columnsTo": [
|
"columnsTo": [
|
||||||
"id"
|
"id"
|
||||||
],
|
],
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
},
|
},
|
||||||
"google_auth_connected_by_users_id_fk": {
|
"google_auth_connected_by_users_id_fk": {
|
||||||
"name": "google_auth_connected_by_users_id_fk",
|
"name": "google_auth_connected_by_users_id_fk",
|
||||||
@ -3305,47 +3259,29 @@
|
|||||||
],
|
],
|
||||||
"onDelete": "no action",
|
"onDelete": "no action",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
>>>>>>> origin/main
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"compositePrimaryKeys": {},
|
"compositePrimaryKeys": {},
|
||||||
"uniqueConstraints": {},
|
"uniqueConstraints": {},
|
||||||
"checkConstraints": {}
|
"checkConstraints": {}
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD
|
|
||||||
"user_theme_preference": {
|
|
||||||
"name": "user_theme_preference",
|
|
||||||
"columns": {
|
|
||||||
"user_id": {
|
|
||||||
"name": "user_id",
|
|
||||||
=======
|
|
||||||
"google_starred_files": {
|
"google_starred_files": {
|
||||||
"name": "google_starred_files",
|
"name": "google_starred_files",
|
||||||
"columns": {
|
"columns": {
|
||||||
"id": {
|
"id": {
|
||||||
"name": "id",
|
"name": "id",
|
||||||
>>>>>>> origin/main
|
|
||||||
"type": "text",
|
"type": "text",
|
||||||
"primaryKey": true,
|
"primaryKey": true,
|
||||||
"notNull": true,
|
"notNull": true,
|
||||||
"autoincrement": false
|
"autoincrement": false
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD
|
|
||||||
"active_theme_id": {
|
|
||||||
"name": "active_theme_id",
|
|
||||||
=======
|
|
||||||
"user_id": {
|
"user_id": {
|
||||||
"name": "user_id",
|
"name": "user_id",
|
||||||
>>>>>>> origin/main
|
|
||||||
"type": "text",
|
"type": "text",
|
||||||
"primaryKey": false,
|
"primaryKey": false,
|
||||||
"notNull": true,
|
"notNull": true,
|
||||||
"autoincrement": false
|
"autoincrement": false
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD
|
|
||||||
"updated_at": {
|
|
||||||
"name": "updated_at",
|
|
||||||
=======
|
|
||||||
"google_file_id": {
|
"google_file_id": {
|
||||||
"name": "google_file_id",
|
"name": "google_file_id",
|
||||||
"type": "text",
|
"type": "text",
|
||||||
@ -3355,7 +3291,6 @@
|
|||||||
},
|
},
|
||||||
"created_at": {
|
"created_at": {
|
||||||
"name": "created_at",
|
"name": "created_at",
|
||||||
>>>>>>> origin/main
|
|
||||||
"type": "text",
|
"type": "text",
|
||||||
"primaryKey": false,
|
"primaryKey": false,
|
||||||
"notNull": true,
|
"notNull": true,
|
||||||
@ -3364,15 +3299,128 @@
|
|||||||
},
|
},
|
||||||
"indexes": {},
|
"indexes": {},
|
||||||
"foreignKeys": {
|
"foreignKeys": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"user_theme_preference_user_id_users_id_fk": {
|
|
||||||
"name": "user_theme_preference_user_id_users_id_fk",
|
|
||||||
"tableFrom": "user_theme_preference",
|
|
||||||
=======
|
|
||||||
"google_starred_files_user_id_users_id_fk": {
|
"google_starred_files_user_id_users_id_fk": {
|
||||||
"name": "google_starred_files_user_id_users_id_fk",
|
"name": "google_starred_files_user_id_users_id_fk",
|
||||||
"tableFrom": "google_starred_files",
|
"tableFrom": "google_starred_files",
|
||||||
>>>>>>> origin/main
|
"tableTo": "users",
|
||||||
|
"columnsFrom": [
|
||||||
|
"user_id"
|
||||||
|
],
|
||||||
|
"columnsTo": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"onDelete": "cascade",
|
||||||
|
"onUpdate": "no action"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"checkConstraints": {}
|
||||||
|
},
|
||||||
|
"custom_themes": {
|
||||||
|
"name": "custom_themes",
|
||||||
|
"columns": {
|
||||||
|
"id": {
|
||||||
|
"name": "id",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": true,
|
||||||
|
"autoincrement": false
|
||||||
|
},
|
||||||
|
"user_id": {
|
||||||
|
"name": "user_id",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"autoincrement": false
|
||||||
|
},
|
||||||
|
"name": {
|
||||||
|
"name": "name",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"autoincrement": false
|
||||||
|
},
|
||||||
|
"description": {
|
||||||
|
"name": "description",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"autoincrement": false,
|
||||||
|
"default": "''"
|
||||||
|
},
|
||||||
|
"theme_data": {
|
||||||
|
"name": "theme_data",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"autoincrement": false
|
||||||
|
},
|
||||||
|
"created_at": {
|
||||||
|
"name": "created_at",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"autoincrement": false
|
||||||
|
},
|
||||||
|
"updated_at": {
|
||||||
|
"name": "updated_at",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"autoincrement": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {
|
||||||
|
"custom_themes_user_id_users_id_fk": {
|
||||||
|
"name": "custom_themes_user_id_users_id_fk",
|
||||||
|
"tableFrom": "custom_themes",
|
||||||
|
"tableTo": "users",
|
||||||
|
"columnsFrom": [
|
||||||
|
"user_id"
|
||||||
|
],
|
||||||
|
"columnsTo": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"onDelete": "cascade",
|
||||||
|
"onUpdate": "no action"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"checkConstraints": {}
|
||||||
|
},
|
||||||
|
"user_theme_preference": {
|
||||||
|
"name": "user_theme_preference",
|
||||||
|
"columns": {
|
||||||
|
"user_id": {
|
||||||
|
"name": "user_id",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": true,
|
||||||
|
"autoincrement": false
|
||||||
|
},
|
||||||
|
"active_theme_id": {
|
||||||
|
"name": "active_theme_id",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"autoincrement": false
|
||||||
|
},
|
||||||
|
"updated_at": {
|
||||||
|
"name": "updated_at",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"autoincrement": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {
|
||||||
|
"user_theme_preference_user_id_users_id_fk": {
|
||||||
|
"name": "user_theme_preference_user_id_users_id_fk",
|
||||||
|
"tableFrom": "user_theme_preference",
|
||||||
"tableTo": "users",
|
"tableTo": "users",
|
||||||
"columnsFrom": [
|
"columnsFrom": [
|
||||||
"user_id"
|
"user_id"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user