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 2018/02/06 19:29:09 UTC

[1/2] trafodion git commit: modify error when fixed the error checked by TScanCode

Repository: trafodion
Updated Branches:
  refs/heads/master 02950e298 -> b1e176f0c


modify error when fixed the error checked by TScanCode


Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/db4aa6ea
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/db4aa6ea
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/db4aa6ea

Branch: refs/heads/master
Commit: db4aa6eab23f43e26223df344e865dbeb68505d0
Parents: d80f009
Author: Kenny <xi...@esgyn.cn>
Authored: Mon Feb 5 11:10:31 2018 +0000
Committer: Kenny <xi...@esgyn.cn>
Committed: Mon Feb 5 11:10:31 2018 +0000

----------------------------------------------------------------------
 core/conn/unixodbc/odbc/odbcclient/unixcli/cli/ctosqlconv.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafodion/blob/db4aa6ea/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/ctosqlconv.cpp
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/ctosqlconv.cpp b/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/ctosqlconv.cpp
index 2b4c95f..4c67e1d 100644
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/ctosqlconv.cpp
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/ctosqlconv.cpp
@@ -2861,7 +2861,7 @@ unsigned long ODBC::ConvertCToSQL(SQLINTEGER	ODBCAppVersion,
 				if (intervalTmp->interval_sign == SQL_TRUE)
 					sprintf(cTmpBuf,"-%ld",intervalTmp->intval.day_second.hour);
 				else
-					sprintf(cTmpBuf,"%ld:%ld",intervalTmp->intval.day_second.hour,intervalTmp->intval.day_second.minute);
+					sprintf(cTmpBuf,"%ld",intervalTmp->intval.day_second.hour);
 				break;
 			case SQL_INTERVAL_MINUTE:
 				if (intervalTmp->interval_sign == SQL_TRUE)
@@ -2923,7 +2923,7 @@ unsigned long ODBC::ConvertCToSQL(SQLINTEGER	ODBCAppVersion,
 				if (intervalTmp->interval_sign == SQL_TRUE)
 					sprintf(cTmpBuf,"-%ld",intervalTmp->intval.day_second.hour);
 				else
-					sprintf(cTmpBuf,"%ld:%ld",intervalTmp->intval.day_second.hour,intervalTmp->intval.day_second.minute);
+					sprintf(cTmpBuf,"%ld",intervalTmp->intval.day_second.hour);
 				break;
 			case SQL_INTERVAL_MINUTE:
 				if (intervalTmp->interval_sign == SQL_TRUE)


[2/2] trafodion git commit: Merge [TRAFODION-2893] PR 1440 Correct conversion to interval hour

Posted by db...@apache.org.
Merge [TRAFODION-2893] PR 1440 Correct conversion to interval hour


Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/b1e176f0
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/b1e176f0
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/b1e176f0

Branch: refs/heads/master
Commit: b1e176f0c383623a1188feb5d797e8eacf2c7748
Parents: 02950e2 db4aa6e
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Feb 6 19:28:28 2018 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Feb 6 19:28:28 2018 +0000

----------------------------------------------------------------------
 core/conn/unixodbc/odbc/odbcclient/unixcli/cli/ctosqlconv.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------