Force uppercase the column name and work a better test for column and table names.