Skip to content

feat(drizzle): Drizzle ORM migration with query builder#2

Closed
dnplkndll wants to merge 19 commits intomainfrom
feat/drizzle-orm
Closed

feat(drizzle): Drizzle ORM migration with query builder#2
dnplkndll wants to merge 19 commits intomainfrom
feat/drizzle-orm

Conversation

@dnplkndll
Copy link
Owner

@dnplkndll dnplkndll commented Mar 11, 2026

Summary

  • Migrate ~100 repos from raw SQL infrastructure to Drizzle ORM with typed schema
  • Convert ~70 methods from raw SQL tagged templates (MySQL-specific NOW(), CURDATE(), DATE_ADD(), IFNULL()) to Drizzle query builder (eq, between, innerJoin, count, sum, etc.)
  • Add DateHelper utilities (daysFromNow, hoursFromNow, monthsFromNow, startOfToday) replacing MySQL date functions
  • Add 299 integration tests across 6 modules, all passing
  • ~17 methods intentionally kept as raw SQL (stored procs, complex reporting, cross-module JOINs)

Test plan

  • npx tsc --noEmit passes (verified locally)
  • CI workflow runs lint, typecheck, and all 299 integration tests
  • Manual smoke test of attendance, giving, and membership endpoints

🤖 Generated with Claude Code

@dnplkndll dnplkndll force-pushed the feat/drizzle-orm branch 4 times, most recently from 2c17605 to 12fefe8 Compare March 15, 2026 01:58
dnplkndll and others added 14 commits March 14, 2026 20:11
@dnplkndll @claude
feat(drizzle): add Drizzle ORM schema definitions and infrastructure
18f7dba 
Add drizzle-orm and drizzle-kit as dependencies. Define typed table schemas
for all 7 modules (attendance, content, doing, giving, membership, messaging,
reporting). Add connection factory in src/db/drizzle.ts with per-module
singleton caching using the existing mysql2 pool from @churchapps/apihelper.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
feat(drizzle): add DrizzleRepo base classes, remove dead infrastructure
066ae4f 
Add 3-tier base class hierarchy:
- BaseDrizzleRepo: db connection + executeRows() helper
- DrizzleRepo: standard CRUD for tables with id + churchId columns,
  with opt-in soft-delete support (protected readonly softDelete = true)
- GlobalDrizzleRepo: CRUD for global tables with id only (no churchId)

Remove ConfiguredRepo and GlobalConfiguredRepo (replaced by DrizzleRepo).
Update barrel exports in shared/infrastructure/index.ts.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
feat(drizzle): migrate doing module repos to Drizzle ORM
f9cbf37 
Convert all 13 doing module repositories from raw SQL (TypedDB) to Drizzle
query builder: ActionRepo, AssignmentRepo, AutomationRepo, BlockoutDateRepo,
ConditionRepo, ConjunctionRepo, ContentProviderAuthRepo, PlanItemRepo,
PlanRepo, PlanTypeRepo, PositionRepo, TaskRepo, TimeRepo.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
feat(drizzle): migrate messaging module repos to Drizzle ORM
febfe8a 
Convert all 13 messaging repositories from raw SQL to Drizzle query builder.
Remove no-op convertToModel/convertAllToModel overrides from repos.
Inline converter calls in 7 controllers and DeliveryHelper — repos now
return models directly, eliminating the unnecessary conversion layer.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
feat(drizzle): migrate giving module repos to Drizzle ORM
2312fc2 
Convert all 10 giving repositories from raw SQL to Drizzle query builder.
FundRepo uses softDelete=true, removing manual removed-column handling.
Remove no-op converter from EventLogRepo and inline in EventLogController.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
feat(drizzle): migrate content module repos to Drizzle ORM
339b2e6 
Convert all 21 content repositories from raw SQL to Drizzle query builder.
Bible repos (Book, Chapter, Verse, VerseText, Translation, Lookup) and
SongDetail/SongDetailLink use GlobalDrizzleRepo (no churchId column).
Remove passthrough converters from LinkRepo and SettingRepo.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
feat(drizzle): migrate attendance module repos to Drizzle ORM
88378d7 
Convert 7 attendance repositories from raw SQL to Drizzle query builder:
CampusRepo, ServiceRepo, ServiceTimeRepo (all with softDelete=true),
GroupServiceTimeRepo, SessionRepo, VisitRepo, VisitSessionRepo.
AttendanceRepo kept as standalone (multi-table raw SQL queries).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
feat(drizzle): migrate membership module repos to Drizzle ORM
55891e9 
Convert all 21 membership repositories from raw SQL to Drizzle query builder.
Global tables (ChurchRepo, UserRepo, ClientErrorRepo, OAuth* repos) use
GlobalDrizzleRepo. GroupRepo, PersonRepo, FormRepo, QuestionRepo use
softDelete=true.

Bug fixes:
- GroupRepo.loadByIds: add missing removed=false filter
- PersonRepo.loadByIds/loadByIdsOnly: add missing removed=false filter
- QuestionRepo.delete: fix CONCAT('d', sort) on int column

Remove passthrough converter overrides from 10 membership repos.
Inline converter calls in ChurchController.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
test(drizzle): add integration tests for all Drizzle repo modules
7ce25ba 
Add 299 integration tests across 6 test suites covering all migrated repos:
- attendance (36 tests): Campus, Service, ServiceTime, Session, Visit CRUD
- content (62 tests): Block, Calendar, Event, File, Page, Sermon, Song/Arrangement
- doing (59 tests): Automation, Plan, Position, Assignment, Task, Blockout
- giving (58 tests): Fund, Donation, DonationBatch, Subscription, Gateway
- membership (51 tests): Person, Group, Form, Question, Household, Role, OAuth
- messaging (33 tests): Connection, Conversation, Message, Notification, Device

Includes shared db-helper.ts for test database setup/teardown,
jest.integration.config.cjs, and tsconfig.test.json.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
ci: add test workflow with lint, typecheck, and integration tests
7549e9b 
Runs on PRs to main and pushes to main. Two jobs:
1. lint-and-typecheck: eslint + tsc
2. integration-tests: spins up MySQL 8.0 service container,
   creates databases, runs initdb, then executes 299 Drizzle
   integration tests via jest with --experimental-vm-modules.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
refactor(drizzle): convert raw SQL to query builder across all modules
33d4905 
Replace ~70 methods using raw sql tagged templates with MySQL-specific
functions (NOW(), CURDATE(), DATE_ADD(), IFNULL(), DATE_FORMAT()) with
Drizzle query builder equivalents (eq, between, gte, lt, count, sum,
innerJoin, leftJoin, etc.) and new DateHelper utilities. This prepares
the codebase for PostgreSQL portability — only ~17 methods with complex
reporting/stored procs remain as raw SQL.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
feat: dual-dialect support (MySQL + PostgreSQL via DB_DIALECT)
eac0570 
Add postgres.js driver, pg-core schema files, SqlDialect helper, and
dialect-branching in all ~17 raw SQL methods. Connection strings auto-derive
from DB_DIALECT env var. All 299 integration tests pass on MySQL; PG path
ready for CloudNativePG deployment.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
ci: add PostgreSQL integration test job
360ff1f 
Run 299 integration tests against both MySQL 8.0 and PostgreSQL 16 in
parallel. Uses DB_DIALECT env var to switch schema resolution and
connection strings. Both jobs must pass for the PR to be mergeable.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
fix: PG compatibility, restore removed features, repo correctness
5a67aac 
- Auto-serialize Date params for postgres.js unsafe() calls
- PG schema: date mode, COALESCE, quoted identifiers in repos
- Dialect-aware identifier quoting in integration tests
- Restore sendInviteEmail endpoint, isNewUser flag, LinkRepo photo URL,
  PrivateMessageRepo rowToModel
- Restore security checks in MessageController and PersonController
- Strip id/churchId from .set() in all messaging repo save() methods
- Fix FormRepo loadAll filter, QuestionRepo sort on delete
- Add missing PG type translations (float, decimal, FOREIGN_KEY_CHECKS)
- CI: timeout-minutes 15, initdb double-precision regex fix

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
feat: drizzle-kit migrations + fix UserChurchHelper PG compatibility
85817bd 
Add drizzle-kit migration infrastructure supporting both MySQL and PostgreSQL:
- drizzle.config.ts: dialect-aware (DB_DIALECT) + per-module (DB_MODULE)
- tools/migrate.ts: programmatic runner using drizzle-orm migrators
- npm scripts: migrate, migrate:status, migrate:generate, migrate:generate:all
- Initial schema migrations generated for all 6 modules on both dialects

Fix UserChurchHelper.createForNewUser: replace MySQL-only raw SQL (backtick-
quoted `groups`, boolean = 0) with Drizzle query builder that works on both
dialects. Fix duplicate index names in content schema (sections table) for
both MySQL and PG schemas.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
dnplkndll and others added 4 commits March 15, 2026 05:49
@dnplkndll @claude
refactor: replace dbScripts with drizzle-kit migrations for DDL
6f2f3cd 
Remove ~100 per-table CREATE TABLE SQL files from tools/dbScripts/ — table
creation is now handled by drizzle-kit migrations in drizzle/<dialect>/<module>/.
Drizzle schemas are the single source of truth for DDL.

Retained in tools/dbScripts/:
- demo.sql / populateData.sql (seed data, still uses mysqlToPgSql for PG)
- cleanup.sql, deleteForChurch.sql, updateConversationStats.sql (MySQL stored
  procs — PG equivalents are inlined in ConversationRepo)

Rewrote tools/initdb.ts to call drizzle-orm migrators instead of reading SQL
files. Stripped DDL-only regex rules from mysqlToPgSql (kept DML rules for
demo data). Simplified moduleDefinitions to moduleExtras (demo + stored procs).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
fix: VisitRepo toDateOnly timezone bug + initdb stored proc handling
d4f7aee 
VisitRepo.toDateOnly used local-timezone Date methods (via DateHelper),
causing date-shift when server TZ != UTC. Now uses getUTC* methods
directly. Also fixes initdb loadDemoData to detect and route stored
procs/CALL statements through executeDDL (skipped on PG).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
fix: MySQL index collisions, remove debug logging, wire schemaOnly flag
4b4a42f 
- Fix duplicate index names in MySQL schemas: positions and
  subscriptionFunds tables had index name collisions with planItems
  and fundDonations respectively (PG schemas were already correct)
- Remove verbose debug logging from Environment.ts (was added for
  troubleshooting, not appropriate for upstream)
- Wire up --schema-only flag in initdb.ts (was parsed but unused)
- Add drizzle-kit migration files for the index renames

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll @claude
refactor: consolidate index fixes into initial migrations
70aca7b 
Regenerate doing and giving MySQL migrations so the index name
corrections (idx_pos_church_plan, idx_sub_church_fund) are in the
0000 initial migration instead of a separate 0001 fix migration.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dnplkndll
Copy link
Owner Author

dnplkndll commented Mar 15, 2026

Closing — upstream PR created at ChurchApps#22.

@dnplkndll dnplkndll closed this Mar 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@dnplkndll