3 Commits (sql-refactor)