Generator bug fixes: schema name added, column prepare function added