fix(migrations): 补齐 SQLite 迁移与 versioned 的索引与数据迁移缺口

对齐 000005/010/011 的邀请索引、tag_id 迁入与 MCP principal 唯一索引,
并扩展测试覆盖分享链接、OAuth upsert 与 v4 标签迁移路径。
main
wizardchen 2026-08-20 11:46:38 +08:00 committed by lyingbug
parent b888172dce
commit 71fe7f31ee
8 changed files with 152 additions and 1 deletions

View File

@ -61,6 +61,11 @@ func TestSQLiteMigrationsCreateVersionedSchema(t *testing.T) {
)
}
}
assertSQLiteShareLinkInvitationsWork(t, db)
assertSQLiteMCPOAuthPrincipalUpsertWorks(t, db)
require.False(t, sqliteColumnExists(t, db, "knowledges", "tag_id"),
"SQLite migrations must drop legacy knowledges.tag_id after multi-tag migration")
}
func TestSQLiteMigrationsUpgradeV4PreservesData(t *testing.T) {
@ -81,6 +86,12 @@ func TestSQLiteMigrationsUpgradeV4PreservesData(t *testing.T) {
require.False(t, dirtyBefore)
_, err := db.Exec("INSERT INTO tenants (name, business) VALUES (?, ?)", "upgrade-sentinel", "migration-test")
require.NoError(t, err)
_, err = db.Exec(
"INSERT INTO knowledges (id, tenant_id, knowledge_base_id, type, title, source, tag_id) "+
"VALUES (?, 1, ?, 'document', 'tagged-doc', 'manual', ?)",
"legacy-knowledge-1", "legacy-kb-1", "legacy-tag-1",
)
require.NoError(t, err)
// Run the full migration set from the repo root.
chdirAndRestore(t, repoRoot)
@ -109,6 +120,14 @@ func TestSQLiteMigrationsUpgradeV4PreservesData(t *testing.T) {
var sentinelName string
require.NoError(t, db.QueryRow("SELECT name FROM tenants WHERE business = ?", "migration-test").Scan(&sentinelName))
require.Equal(t, "upgrade-sentinel", sentinelName)
var relationCount int
require.NoError(t, db.QueryRow(
"SELECT COUNT(*) FROM knowledge_tag_relations WHERE knowledge_id = ? AND tag_id = ?",
"legacy-knowledge-1", "legacy-tag-1",
).Scan(&relationCount))
require.Equal(t, 1, relationCount)
require.False(t, sqliteColumnExists(t, db, "knowledges", "tag_id"))
}
func sqliteRepoRoot(t *testing.T) string {
@ -161,6 +180,66 @@ func sqliteColumnExists(t *testing.T, db *sql.DB, table, column string) bool {
return n == 1
}
func assertSQLiteShareLinkInvitationsWork(t *testing.T, db *sql.DB) {
t.Helper()
_, err := db.Exec("INSERT INTO tenants (name, business) VALUES (?, ?)", "share-link-tenant", "share-link-test")
require.NoError(t, err)
expiresAt := "2099-01-01 00:00:00"
shareLinkInsert := "INSERT INTO tenant_invitations " +
"(tenant_id, invitee_user_id, token, role, status, expires_at) " +
"VALUES (1, '', ?, 'member', 'pending', ?)"
_, err = db.Exec(shareLinkInsert, "token-a", expiresAt)
require.NoError(t, err)
_, err = db.Exec(shareLinkInsert, "token-b", expiresAt)
require.NoError(t, err)
var count int
require.NoError(t, db.QueryRow(
"SELECT COUNT(*) FROM tenant_invitations WHERE tenant_id = 1 AND invitee_user_id = '' AND status = 'pending'",
).Scan(&count))
require.Equal(t, 2, count)
}
func assertSQLiteMCPOAuthPrincipalUpsertWorks(t *testing.T, db *sql.DB) {
t.Helper()
_, err := db.Exec(
"INSERT INTO mcp_services (id, tenant_id, name, transport_type) VALUES (?, 1, 'svc', 'http')",
"svc-migration-1",
)
require.NoError(t, err)
tokenInsertPrefix := "INSERT INTO mcp_oauth_tokens " +
"(id, tenant_id, user_id, service_id, principal_type, principal_id, access_token) "
_, err = db.Exec(
tokenInsertPrefix +
"VALUES ('tok-1', 1, 'u1', 'svc-migration-1', 'web_user', 'u1', 'token-1')",
)
require.NoError(t, err)
_, err = db.Exec(
tokenInsertPrefix +
"VALUES ('tok-2', 1, 'u1', 'svc-migration-1', 'web_user', 'u1', 'token-2') " +
"ON CONFLICT(tenant_id, principal_type, principal_id, service_id) " +
"DO UPDATE SET access_token = excluded.access_token",
)
require.NoError(t, err)
var accessToken string
require.NoError(t, db.QueryRow(
"SELECT access_token FROM mcp_oauth_tokens "+
"WHERE tenant_id = 1 AND principal_type = 'web_user' "+
"AND principal_id = 'u1' AND service_id = 'svc-migration-1'",
).Scan(&accessToken))
require.Equal(t, "token-2", accessToken)
var rowCount int
require.NoError(t, db.QueryRow(
"SELECT COUNT(*) FROM mcp_oauth_tokens WHERE tenant_id = 1 AND service_id = 'svc-migration-1'",
).Scan(&rowCount))
require.Equal(t, 1, rowCount)
}
func copySQLiteMigrationsV4(t *testing.T, repoRoot string) string {
t.Helper()
dest := t.TempDir()

View File

@ -1,3 +1,15 @@
DROP INDEX IF EXISTS idx_tenant_invitations_token;
DROP INDEX IF EXISTS idx_tenant_invitations_unique_pending;
-- Legacy unique index cannot coexist with multiple share-link rows.
DELETE FROM tenant_invitations
WHERE invitee_user_id = ''
AND deleted_at IS NULL;
CREATE UNIQUE INDEX IF NOT EXISTS idx_tenant_invitations_unique_pending
ON tenant_invitations(tenant_id, invitee_user_id)
WHERE status = 'pending' AND deleted_at IS NULL;
ALTER TABLE tenant_invitations DROP COLUMN accepted_count;
ALTER TABLE tenant_invitations DROP COLUMN token;
ALTER TABLE messages DROP COLUMN attachments;

View File

@ -6,3 +6,16 @@ ALTER TABLE messages ADD COLUMN attachments TEXT NOT NULL DEFAULT '[]';
ALTER TABLE tenant_invitations ADD COLUMN token VARCHAR(64) NOT NULL DEFAULT '';
ALTER TABLE tenant_invitations ADD COLUMN accepted_count INTEGER NOT NULL DEFAULT 0;
-- Share-link rows use invitee_user_id=''; relax the pending uniqueness index
-- so multiple share links can coexist on one tenant (see versioned 000054).
DROP INDEX IF EXISTS idx_tenant_invitations_unique_pending;
CREATE UNIQUE INDEX IF NOT EXISTS idx_tenant_invitations_unique_pending
ON tenant_invitations(tenant_id, invitee_user_id)
WHERE status = 'pending'
AND deleted_at IS NULL
AND invitee_user_id <> '';
CREATE UNIQUE INDEX IF NOT EXISTS idx_tenant_invitations_token
ON tenant_invitations(token)
WHERE token <> '' AND deleted_at IS NULL;

View File

@ -1,6 +1,7 @@
-- Mirrors versioned migrations:
-- 000055_knowledge_processing_spans knowledge_processing_spans table
-- 000056_knowledge_pending_subtasks knowledges.pending_subtasks_count
-- 000066_expand_knowledge_span_name name VARCHAR(255)
CREATE TABLE IF NOT EXISTS knowledge_processing_spans (
id INTEGER PRIMARY KEY AUTOINCREMENT,
@ -8,7 +9,7 @@ CREATE TABLE IF NOT EXISTS knowledge_processing_spans (
attempt INTEGER NOT NULL DEFAULT 1,
span_id VARCHAR(64) NOT NULL,
parent_span_id VARCHAR(64),
name VARCHAR(64) NOT NULL,
name VARCHAR(255) NOT NULL,
kind VARCHAR(16) NOT NULL,
status VARCHAR(16) NOT NULL,
input TEXT,

View File

@ -1,3 +1,18 @@
ALTER TABLE knowledges ADD COLUMN tag_id VARCHAR(36);
CREATE INDEX IF NOT EXISTS idx_knowledges_tag ON knowledges(tag_id);
UPDATE knowledges
SET tag_id = (
SELECT ktr.tag_id
FROM knowledge_tag_relations ktr
WHERE ktr.knowledge_id = knowledges.id
ORDER BY ktr.created_at ASC
LIMIT 1
)
WHERE EXISTS (
SELECT 1 FROM knowledge_tag_relations ktr WHERE ktr.knowledge_id = knowledges.id
);
DROP INDEX IF EXISTS idx_ktr_tag;
DROP INDEX IF EXISTS idx_ktr_knowledge;
DROP TABLE IF EXISTS knowledge_tag_relations;

View File

@ -13,3 +13,13 @@ CREATE INDEX IF NOT EXISTS idx_ktr_knowledge
CREATE INDEX IF NOT EXISTS idx_ktr_tag
ON knowledge_tag_relations (tag_id);
-- Migrate existing single-tag data into the join table.
INSERT INTO knowledge_tag_relations (knowledge_id, tag_id, created_at)
SELECT id, tag_id, updated_at
FROM knowledges
WHERE tag_id IS NOT NULL AND tag_id != ''
AND deleted_at IS NULL;
DROP INDEX IF EXISTS idx_knowledges_tag;
ALTER TABLE knowledges DROP COLUMN tag_id;

View File

@ -1,3 +1,9 @@
DROP INDEX IF EXISTS idx_mcp_oauth_tokens_principal;
DROP INDEX IF EXISTS idx_mcp_oauth_tokens_tenant_principal_svc;
CREATE UNIQUE INDEX IF NOT EXISTS idx_mcp_oauth_tokens_tenant_user_svc
ON mcp_oauth_tokens(tenant_id, user_id, service_id);
ALTER TABLE mcp_oauth_tokens DROP COLUMN principal_id;
ALTER TABLE mcp_oauth_tokens DROP COLUMN principal_type;
ALTER TABLE tenants DROP COLUMN api_principal_config;

View File

@ -5,3 +5,18 @@ ALTER TABLE tenants ADD COLUMN api_principal_config TEXT;
ALTER TABLE mcp_oauth_tokens ADD COLUMN principal_type VARCHAR(32);
ALTER TABLE mcp_oauth_tokens ADD COLUMN principal_id VARCHAR(512);
UPDATE mcp_oauth_tokens
SET principal_type = 'web_user',
principal_id = user_id
WHERE (principal_type IS NULL OR principal_type = '')
AND user_id IS NOT NULL
AND user_id <> '';
DROP INDEX IF EXISTS idx_mcp_oauth_tokens_tenant_user_svc;
CREATE UNIQUE INDEX IF NOT EXISTS idx_mcp_oauth_tokens_tenant_principal_svc
ON mcp_oauth_tokens(tenant_id, principal_type, principal_id, service_id);
CREATE INDEX IF NOT EXISTS idx_mcp_oauth_tokens_principal
ON mcp_oauth_tokens(principal_type, principal_id);