Move models2 to models, test SQL generation