Repository: sqoop Updated Branches: refs/heads/trunk 911014243 -> e92daf2e5
SQOOP-2136: Test case SqlServerUpsertOutputFormatTest is failing (Jarek Jarcec Cecho via Venkat Ranganathan) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/e92daf2e Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/e92daf2e Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/e92daf2e Branch: refs/heads/trunk Commit: e92daf2e5e3baa5d9f3cc75b0d904c88ec3e68b9 Parents: 9110142 Author: Venkat Ranganathan <[email protected]> Authored: Wed Feb 25 18:28:13 2015 -0800 Committer: Venkat Ranganathan <[email protected]> Committed: Wed Feb 25 18:28:13 2015 -0800 ---------------------------------------------------------------------- .../sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormatTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/e92daf2e/src/test/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormatTest.java b/src/test/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormatTest.java index 924c116..ec6eb5e 100644 --- a/src/test/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormatTest.java +++ b/src/test/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormatTest.java @@ -70,7 +70,7 @@ public class SqlServerUpsertOutputFormatTest { + "_source.FirstColumn = _target.FirstColumn" + " WHEN MATCHED THEN UPDATE SET _target.SecondColumn = " + "_source.SecondColumn, _target.ThirdColumn = _source.ThirdColumn" - + " WHEN NOT MATCHED THEN INSERT ( FirstColumn, SecondColumn, " + + " WHEN NOT MATCHED THEN INSERT ( FirstColumn, SecondColumn," + " ThirdColumn ) VALUES " + "( _source.FirstColumn, _source.SecondColumn, _source.ThirdColumn ) " + "OPTION (NOLOCK);", recordWriter.getUpdateStatement());
