Commit5f666ccunknown_key
fix: resolve stray conflict markers in schema.ts — restore orgSsoSessions + incidentHookConfigs table definitions
1 file changed+13−175f666cc936c6898f461e7f38cb920d1fa54d50ec
1 changed file+13−17
Modifiedsrc/db/schema.ts+13−17View fileUnifiedSplit
@@ -4359,18 +4359,6 @@ export const scimTokens = pgTable("scim_tokens", {
43594359 */
43604360export const orgSsoSessions = pgTable(
43614361 "org_sso_sessions",
4362
4363// Migration 0077 — Incident hook configs
4364// Maps a monitoring provider (PagerDuty / Datadog / Opsgenie / generic) to a
4365// specific repo. Inbound webhooks are validated against secret_hash (SHA-256
4366// of the user-chosen webhook secret passed in the ?secret= query param).
4367// ---------------------------------------------------------------------------
4368export const incidentHookConfigs = pgTable(
4369 "incident_hook_configs",
4370>>>>>>> 9953332 (feat: production incident auto-fix — PagerDuty/Datadog webhook → AI-generated fix PR)
4371
4372
4373>>>>>>> 3a845e4 (feat: enterprise SSO (SAML 2.0 + OIDC) and SCIM user provisioning)
43744362 {
43754363 id: uuid("id").primaryKey().defaultRandom(),
43764364 userId: uuid("user_id")
@@ -4394,6 +4382,19 @@ export type NewOrgSsoConfig = typeof orgSsoConfigs.$inferInsert;
43944382export type ScimToken = typeof scimTokens.$inferSelect;
43954383export type OrgSsoSession = typeof orgSsoSessions.$inferSelect;
43964384
4385// ---------------------------------------------------------------------------
4386// Migration 0077 — Incident hook configs
4387// Maps a monitoring provider (PagerDuty / Datadog / Opsgenie / generic) to a
4388// specific repo. Inbound webhooks are validated against secret_hash (SHA-256
4389// of the user-chosen webhook secret passed in the ?secret= query param).
4390// ---------------------------------------------------------------------------
4391export const incidentHookConfigs = pgTable(
4392 "incident_hook_configs",
4393 {
4394 id: uuid("id").primaryKey().defaultRandom(),
4395 userId: uuid("user_id")
4396 .notNull()
4397 .references(() => users.id, { onDelete: "cascade" }),
43974398 repoId: uuid("repo_id")
43984399 .notNull()
43994400 .references(() => repositories.id, { onDelete: "cascade" }),
@@ -4414,10 +4415,6 @@ export type OrgSsoSession = typeof orgSsoSessions.$inferSelect;
44144415
44154416export type IncidentHookConfig = typeof incidentHookConfigs.$inferSelect;
44164417export type NewIncidentHookConfig = typeof incidentHookConfigs.$inferInsert;
4417>>>>>>> 9953332 (feat: production incident auto-fix — PagerDuty/Datadog webhook → AI-generated fix PR)
4418
4419
4420>>>>>>> 3a845e4 (feat: enterprise SSO (SAML 2.0 + OIDC) and SCIM user provisioning)
44214418
44224419/**
44234420 * Cloud deploy configurations — per-repo settings for push-triggered deploys
@@ -4480,7 +4477,6 @@ export type CloudDeployConfig = typeof cloudDeployConfigs.$inferSelect;
44804477export type NewCloudDeployConfig = typeof cloudDeployConfigs.$inferInsert;
44814478export type CloudDeployment = typeof cloudDeployments.$inferSelect;
44824479export type NewCloudDeployment = typeof cloudDeployments.$inferInsert;
4483>>>>>>> b11ffa9 (feat: multi-cloud deploy integration — push to main deploys to Fly/Railway/Render/Vercel)
44844480// ---------------------------------------------------------------------------
44854481// Recurring pattern detection (migration 0088)
44864482// ---------------------------------------------------------------------------
44874483