Fixed non-functioning column token extractor, added support to detect RETURNING statment columns.