TEIID-2524 adding a property to trim column names

teiid · Jun 4, 2013 · c44e250 · c44e250
1 parent 4e07cab
commit c44e250
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java b/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java
@@ -23,19 +23,15 @@
 
 import static org.teiid.translator.TypeFacility.RUNTIME_NAMES.*;
 
-import java.sql.Connection;
-import java.sql.SQLException;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.teiid.core.util.PropertiesUtils;
 import org.teiid.language.Command;
 import org.teiid.language.Function;
 import org.teiid.language.Limit;
-import org.teiid.metadata.MetadataFactory;
 import org.teiid.translator.ExecutionContext;
 import org.teiid.translator.SourceSystemFunctions;
 import org.teiid.translator.Translator;
@@ -45,6 +41,7 @@
 import org.teiid.translator.jdbc.ConvertModifier;
 import org.teiid.translator.jdbc.FunctionModifier;
 import org.teiid.translator.jdbc.JDBCExecutionFactory;
+import org.teiid.translator.jdbc.JDBCMetdataProcessor;
 import org.teiid.translator.jdbc.ModFunctionModifier;
 import org.teiid.translator.jdbc.SQLConversionVisitor;
 
@@ -319,15 +316,9 @@ public List<String> getSupportedFunctions() {
         return supportedFunctions;
     }    
 
-	@Override
-	public void getMetadata(MetadataFactory metadataFactory, Connection conn) throws TranslatorException {
-		try {
-			HiveMetadataProcessor metadataProcessor = new HiveMetadataProcessor();
-			PropertiesUtils.setBeanProperties(metadataProcessor, metadataFactory.getModelProperties(), "importer"); //$NON-NLS-1$
-			metadataProcessor.getConnectorMetadata(conn, metadataFactory);
-		} catch (SQLException e) {
-			throw new TranslatorException(e);
-		}
-	}    
+    @Override
+    protected JDBCMetdataProcessor createMetadataProcessor() {
+    	return new HiveMetadataProcessor();
+    }
 
 }
diff --git a/...ectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveMetadataProcessor.java b/...ectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveMetadataProcessor.java
@@ -36,6 +36,8 @@
 
 public class HiveMetadataProcessor extends JDBCMetdataProcessor {
 
+	private boolean trimColumnNames;
+
 	@Override
 	public void getConnectorMetadata(Connection conn, MetadataFactory metadataFactory)	throws SQLException {
 		List<String> tables = getTables(conn);
@@ -91,7 +93,10 @@ private void addTable(String tableName, Connection conn, MetadataFactory metadat
 		Statement stmt = conn.createStatement();
 		ResultSet rs =  stmt.executeQuery("DESCRIBE "+tableName); //$NON-NLS-1$
 		while (rs.next()){
-			String name = rs.getString(1); 
+			String name = rs.getString(1);
+			if (trimColumnNames) {
+				name = name.trim();
+			}
 			String type = rs.getString(2); 
 			String runtimeType = getRuntimeType(type);
 
@@ -100,5 +105,9 @@ private void addTable(String tableName, Connection conn, MetadataFactory metadat
 			column.setUpdatable(true);
 		}
 		rs.close();
-	}	
+	}
+
+	public void setTrimColumNames(boolean trimColumnNames) {
+		this.trimColumnNames = trimColumnNames;
+	}
 }