google-sql: move tier to top level