Skip to content

Commit

Permalink
Merge branch '8.2.x' of https://github.com/teiid/teiid into master
Browse files Browse the repository at this point in the history
  • Loading branch information
shawkins committed Nov 20, 2012
2 parents d86f8ff + 5c9b115 commit a6904c9
Show file tree
Hide file tree
Showing 54 changed files with 253 additions and 723 deletions.
9 changes: 9 additions & 0 deletions api/src/main/java/org/teiid/translator/TypeFacility.java
Expand Up @@ -26,6 +26,7 @@
import java.math.BigInteger;
import java.sql.Time;
import java.sql.Timestamp;
import java.sql.Types;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
Expand Down Expand Up @@ -146,7 +147,15 @@ public static final int getSQLTypeFromRuntimeType(Class<?> type) {
return JDBCSQLTypeInfo.getSQLTypeFromRuntimeType(type);
}

/**
* Get the runtime type name for the given SQL type
* @param sqlType
* @return
*/
public static final String getDataTypeNameFromSQLType(int sqlType) {
if (sqlType == Types.ARRAY) {
return RUNTIME_NAMES.OBJECT;
}
return JDBCSQLTypeInfo.getTypeName(sqlType);
}

Expand Down
2 changes: 1 addition & 1 deletion build/assembly/jboss-as7/dist.xml
Expand Up @@ -314,7 +314,7 @@
</includes>

<binaries>
<includeDependencies>false</includeDependencies>
<includeDependencies>true</includeDependencies>
<unpack>false</unpack>
<dependencySets>
<dependencySet>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit a6904c9

Please sign in to comment.