You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2017/08/16 17:01:49 UTC
[1/3] incubator-trafodion git commit: fix int type doesnot check
boundary
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 9cac537d3 -> baa034f89
fix int type doesnot check boundary
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5370426f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5370426f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5370426f
Branch: refs/heads/master
Commit: 5370426f82acba0ebd748a5e41797bf2c57dc53f
Parents: 27637fb
Author: mashengchen <ma...@gmail.com>
Authored: Fri Jul 14 17:10:14 2017 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Fri Jul 14 09:32:22 2017 +0000
----------------------------------------------------------------------
core/conn/jdbcT4/src/main/java/T4Messages.properties | 2 +-
.../trafodion/jdbc/t4/TrafT4PreparedStatement.java | 6 +++++-
.../java/org/trafodion/jdbc/t4/TrafT4ResultSet.java | 14 +++++++-------
3 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5370426f/core/conn/jdbcT4/src/main/java/T4Messages.properties
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/T4Messages.properties b/core/conn/jdbcT4/src/main/java/T4Messages.properties
index 35b5bb3..d74cdc4 100644
--- a/core/conn/jdbcT4/src/main/java/T4Messages.properties
+++ b/core/conn/jdbcT4/src/main/java/T4Messages.properties
@@ -208,7 +208,7 @@ data_truncation_msg=Fractional truncation
data_truncation_sqlstate=01S07
data_truncation_sqlcode=29045
-numeric_out_of_range_msg=Numeric value out of range
+numeric_out_of_range_msg=Numeric value out of range, Numeric is {0}
numeric_out_of_range_sqlstate=22003
numeric_out_of_range_sqlcode=29046
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5370426f/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java
index 66323dc..5de8c9a 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java
@@ -1287,7 +1287,7 @@ public class TrafT4PreparedStatement extends TrafT4Statement implements java.sql
case Types.INTEGER:
tmpbd = Utility.getBigDecimalValue(locale, x);
//Utility.checkLongTruncation(parameterIndex, tmpbd);
- //Utility.checkIntegerBoundary(locale, tmpbd);
+ Utility.checkIntegerBoundary(locale, tmpbd);
setInt(parameterIndex, tmpbd.intValue());
break;
case Types.BIGINT:
@@ -1296,6 +1296,10 @@ public class TrafT4PreparedStatement extends TrafT4Statement implements java.sql
if (type == InterfaceResultSet.SQLTYPECODE_LARGEINT_UNSIGNED){
Utility.checkUnsignedLongBoundary(locale, tmpbd);
setLong(parameterIndex, tmpbd);
+ } else if (type == InterfaceResultSet.SQLTYPECODE_INTEGER_UNSIGNED) {
+ // if data is unsigned int ,the java.sql.type is -5 (bigint), our sql type is -401
+ Utility.checkUnsignedIntegerBoundary(locale, tmpbd);
+ setLong(parameterIndex, tmpbd);
} else{
Utility.checkLongBoundary(locale, tmpbd);
setLong(parameterIndex, tmpbd.longValue());
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5370426f/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
index 55f31ac..f731aac 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
@@ -638,7 +638,7 @@ public class TrafT4ResultSet extends TrafT4Handle implements java.sql.ResultSet
return true;
default:
throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
- "numeric_out_of_range", null);
+ "numeric_out_of_range", shortValue);
}
}
} else {
@@ -708,7 +708,7 @@ public class TrafT4ResultSet extends TrafT4Handle implements java.sql.ResultSet
}
} else {
throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
- "numeric_out_of_range", null);
+ "numeric_out_of_range", d1);
}
}
return retValue;
@@ -1240,7 +1240,7 @@ public class TrafT4ResultSet extends TrafT4Handle implements java.sql.ResultSet
return (float) data;
} else {
throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "numeric_out_of_range",
- null);
+ data);
}
}
@@ -1303,7 +1303,7 @@ public class TrafT4ResultSet extends TrafT4Handle implements java.sql.ResultSet
}
} else {
throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
- "numeric_out_of_range", null);
+ "numeric_out_of_range", d);
}
}
} else {
@@ -1372,7 +1372,7 @@ public class TrafT4ResultSet extends TrafT4Handle implements java.sql.ResultSet
}
} else {
throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
- "numeric_out_of_range", null);
+ "numeric_out_of_range", bd.longValue());
}
} catch (NumberFormatException e2) {
@@ -1391,7 +1391,7 @@ public class TrafT4ResultSet extends TrafT4Handle implements java.sql.ResultSet
}
} else {
throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
- "numeric_out_of_range", null);
+ "numeric_out_of_range", d);
}
}
}
@@ -1750,7 +1750,7 @@ public class TrafT4ResultSet extends TrafT4Handle implements java.sql.ResultSet
}
} else {
throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
- "numeric_out_of_range", null);
+ "numeric_out_of_range", d);
}
}
[2/3] incubator-trafodion git commit: fix when using longValue may be
overflow
Posted by db...@apache.org.
fix when using longValue may be overflow
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e6696d2b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e6696d2b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e6696d2b
Branch: refs/heads/master
Commit: e6696d2b5dc6b69acadd4a3c27da848ad9261096
Parents: 5370426
Author: mashengchen <ma...@gmail.com>
Authored: Wed Jul 26 02:30:00 2017 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Wed Jul 26 02:30:00 2017 +0000
----------------------------------------------------------------------
.../src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e6696d2b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
index f731aac..1883442 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
@@ -1372,7 +1372,7 @@ public class TrafT4ResultSet extends TrafT4Handle implements java.sql.ResultSet
}
} else {
throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
- "numeric_out_of_range", bd.longValue());
+ "numeric_out_of_range", bd);
}
} catch (NumberFormatException e2) {
[3/3] incubator-trafodion git commit: Merge [TRAFODION-2685] PR 1180
Boundary check for int type
Posted by db...@apache.org.
Merge [TRAFODION-2685] PR 1180 Boundary check for int type
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/baa034f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/baa034f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/baa034f8
Branch: refs/heads/master
Commit: baa034f89701207bbff24d14cb0d45a1039b8f2f
Parents: 9cac537 e6696d2
Author: Dave Birdsall <db...@apache.org>
Authored: Wed Aug 16 17:00:51 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed Aug 16 17:00:51 2017 +0000
----------------------------------------------------------------------
core/conn/jdbcT4/src/main/java/T4Messages.properties | 2 +-
.../trafodion/jdbc/t4/TrafT4PreparedStatement.java | 6 +++++-
.../java/org/trafodion/jdbc/t4/TrafT4ResultSet.java | 14 +++++++-------
3 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/baa034f8/core/conn/jdbcT4/src/main/java/T4Messages.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/baa034f8/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/baa034f8/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
----------------------------------------------------------------------