From 6b0964b9c2fa3d460d2d1a0eefd57d0b4ab6750c Mon Sep 17 00:00:00 2001 From: Andrea Lam Date: Thu, 23 Feb 2017 16:48:39 -0800 Subject: [PATCH 1/5] Add survey button. --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 5ac5af2ae..8be559f88 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,12 @@ We hope you enjoy using the Microsoft JDBC Driver for SQL Server. SQL Server Team +##Take our survey + +Let us know more about your Java & SQL Server configuration: + + + ## Status of Most Recent Builds | AppVeyor (Windows) | Travis CI (Linux) | |--------------------------|--------------------------| From fd3949d618fd7a13b54e25227f59d386404cc2fc Mon Sep 17 00:00:00 2001 From: v-nisidh Date: Tue, 14 Mar 2017 17:13:51 -0700 Subject: [PATCH 2/5] Fixed Badges Issue Fixed Badges Issue --- README.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 81a8264aa..f86c7a161 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ We hope you enjoy using the Microsoft JDBC Driver for SQL Server. SQL Server Team -##Take our survey +## Take our survey Let us know more about your Java & SQL Server configuration: @@ -22,12 +22,7 @@ Let us know more about your Java & SQL Server configuration: ## Status of Most Recent Builds | AppVeyor (Windows) | Travis CI (Linux) | |--------------------------|--------------------------| -| [![av-image][]][av-site] | [![tv-image][]][tv-site] | - -[av-image]: https://ci.appveyor.com/api/projects/status/o6fjg16678ol64d3?svg=true "Windows" -[av-site]: https://ci.appveyor.com/project/Microsoft-JDBC/mssql-jdbc -[tv-image]: https://travis-ci.org/Microsoft/mssql-jdbc.svg? "Linux" -[tv-site]: https://travis-ci.org/Microsoft/mssql-jdbc +| [![AppVeyor ](https://ci.appveyor.com/api/projects/status/o6fjg16678ol64d3?svg=true "Windows")](https://ci.appveyor.com/project/Microsoft-JDBC/mssql-jdbc) | [![Travis CI](https://travis-ci.org/Microsoft/mssql-jdbc.svg? "Linux")](https://travis-ci.org/Microsoft/mssql-jdbc ) |vg? "Linux" ## Announcements What's coming next? We will look into adding a more comprehensive set of tests, improving our javadocs, and start developing the next set of features. From 755e2820f680374f37e4c4c41a6196dea1bbbdfb Mon Sep 17 00:00:00 2001 From: Andrea Lam Date: Tue, 14 Mar 2017 17:18:12 -0700 Subject: [PATCH 3/5] Update survey --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f86c7a161..4b314f962 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,9 @@ SQL Server Team ## Take our survey -Let us know more about your Java & SQL Server configuration: +Let us know more about your how you program with Java. - + ## Status of Most Recent Builds | AppVeyor (Windows) | Travis CI (Linux) | From abf2e1b928c77b0af5d13c889691398c33de2ce2 Mon Sep 17 00:00:00 2001 From: Michael Haderman Date: Tue, 21 Mar 2017 13:32:34 -0700 Subject: [PATCH 4/5] Make SQLServerException constructors public so that interfaces like ISQLServerBulk record can be implemented outside of the package. --- .../microsoft/sqlserver/jdbc/SQLServerException.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerException.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerException.java index 527cac546..7d758420d 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerException.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerException.java @@ -132,14 +132,14 @@ static String getErrString(String errCode) { * @param cause * The exception that caused this exception */ - SQLServerException(String errText, + public SQLServerException(String errText, SQLState sqlState, DriverError driverError, Throwable cause) { this(errText, sqlState.getSQLStateCode(), driverError.getErrorCode(), cause); } - SQLServerException(String errText, + public SQLServerException(String errText, String errState, int errNum, Throwable cause) { @@ -149,7 +149,7 @@ static String getErrString(String errCode) { ActivityCorrelator.setCurrentActivityIdSentFlag(); // set the activityid flag so that we don't send the current ActivityId later. } - SQLServerException(String errText, + public SQLServerException(String errText, Throwable cause) { super(errText); initCause(cause); @@ -157,7 +157,7 @@ static String getErrString(String errCode) { ActivityCorrelator.setCurrentActivityIdSentFlag(); } - /* L0 */ SQLServerException(Object obj, + /* L0 */ public SQLServerException(Object obj, String errText, String errState, int errNum, @@ -180,7 +180,7 @@ static String getErrString(String errCode) { * @param bStack * true to generate the stack trace */ - /* L0 */ SQLServerException(Object obj, + /* L0 */ public SQLServerException(Object obj, String errText, String errState, StreamError streamError, From 80a79840a7e3acd0779c402944f2fa3e6021857a Mon Sep 17 00:00:00 2001 From: Michael Haderman Date: Sun, 9 Apr 2017 20:42:27 -0700 Subject: [PATCH 5/5] Make SQLServerException constructors public so that interfaces like ISQLServerBulk record can be implemented outside of the package. --- .../sqlserver/jdbc/SQLServerException.java | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerException.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerException.java index 7d758420d..f1720359f 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerException.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerException.java @@ -82,7 +82,7 @@ final void setDriverErrorCode(int value) { /** * Log an exception to the driver log file - * + * * @param o * the io buffer that generated the exception * @param errText @@ -91,8 +91,8 @@ final void setDriverErrorCode(int value) { * true to generate the stack trace */ /* L0 */ private void logException(Object o, - String errText, - boolean bStack) { + String errText, + boolean bStack) { String id = ""; if (o != null) id = o.toString(); @@ -123,7 +123,7 @@ static String getErrString(String errCode) { /** * Make a new SQLException - * + * * @param errText * the excception message * @param errState @@ -133,16 +133,16 @@ static String getErrString(String errCode) { * The exception that caused this exception */ public SQLServerException(String errText, - SQLState sqlState, - DriverError driverError, - Throwable cause) { + SQLState sqlState, + DriverError driverError, + Throwable cause) { this(errText, sqlState.getSQLStateCode(), driverError.getErrorCode(), cause); } public SQLServerException(String errText, - String errState, - int errNum, - Throwable cause) { + String errState, + int errNum, + Throwable cause) { super(errText, errState, errNum); initCause(cause); logException(null, errText, true); @@ -150,7 +150,7 @@ public SQLServerException(String errText, } public SQLServerException(String errText, - Throwable cause) { + Throwable cause) { super(errText); initCause(cause); logException(null, errText, true); @@ -158,10 +158,10 @@ public SQLServerException(String errText, } /* L0 */ public SQLServerException(Object obj, - String errText, - String errState, - int errNum, - boolean bStack) { + String errText, + String errState, + int errNum, + boolean bStack) { super(errText, errState, errNum); logException(obj, errText, bStack); ActivityCorrelator.setCurrentActivityIdSentFlag(); @@ -169,7 +169,7 @@ public SQLServerException(String errText, /** * Make a new SQLException - * + * * @param obj * @param errText * the exception message @@ -181,10 +181,10 @@ public SQLServerException(String errText, * true to generate the stack trace */ /* L0 */ public SQLServerException(Object obj, - String errText, - String errState, - StreamError streamError, - boolean bStack) { + String errText, + String errState, + StreamError streamError, + boolean bStack) { super(errText, errState, streamError.getErrorNumber()); // Log SQL error with info from StreamError. @@ -195,7 +195,7 @@ public SQLServerException(String errText, /** * Build a new SQL Exception from an error detected by the driver. - * + * * @param con * the connection * @param obj @@ -208,10 +208,10 @@ public SQLServerException(String errText, * @throws SQLServerException */ /* L0 */static void makeFromDriverError(SQLServerConnection con, - Object obj, - String errText, - String state, - boolean bStack) throws SQLServerException { + Object obj, + String errText, + String state, + boolean bStack) throws SQLServerException { // The sql error code is 0 since the error was not returned from the database // The state code is supplied by the calling code as XOPEN compliant. // XOPEN is used as the primary code here since they are published free @@ -237,7 +237,7 @@ public SQLServerException(String errText, /** * Build a new SQL Exception from a streamError detected by the driver. - * + * * @param con * the connection * @param obj @@ -249,10 +249,10 @@ public SQLServerException(String errText, * @throws SQLServerException */ /* L0 */ static void makeFromDatabaseError(SQLServerConnection con, - Object obj, - String errText, - StreamError streamError, - boolean bStack) throws SQLServerException { + Object obj, + String errText, + StreamError streamError, + boolean bStack) throws SQLServerException { String state = generateStateCode(con, streamError.getErrorNumber(), streamError.getErrorState()); SQLServerException theException = new SQLServerException(obj, SQLServerException.checkAndAppendClientConnId(errText, con), state, streamError, @@ -270,9 +270,9 @@ public SQLServerException(String errText, // This code is same as the conversion logic that previously existed in connecthelper. static void ConvertConnectExceptionToSQLServerException(String hostName, - int portNumber, - SQLServerConnection conn, - Exception ex) throws SQLServerException { + int portNumber, + SQLServerConnection conn, + Exception ex) throws SQLServerException { Exception connectException = ex; // Throw the exception if exception was caught by code above (stored in connectException). if (connectException != null) { @@ -287,7 +287,7 @@ static void ConvertConnectExceptionToSQLServerException(String hostName, /** * Map XOPEN states. - * + * * @param state * the state * @return the mapped state @@ -316,7 +316,7 @@ static void ConvertConnectExceptionToSQLServerException(String hostName, /** * Generate the JDBC state code based on the error number returned from the database - * + * * @param con * the connection * @param errNum @@ -326,8 +326,8 @@ static void ConvertConnectExceptionToSQLServerException(String hostName, * @return the state code */ /* L0 */ static String generateStateCode(SQLServerConnection con, - int errNum, - int databaseState) { + int errNum, + int databaseState) { // Generate a SQL 99 or XOPEN state from a database generated error code boolean xopenStates = (con != null && con.xopenStates); if (xopenStates) { @@ -372,7 +372,7 @@ static void ConvertConnectExceptionToSQLServerException(String hostName, /** * Append ClientConnectionId to an error message if applicable - * + * * @param errMsg * - the orginal error message. * @param conn @@ -380,7 +380,7 @@ static void ConvertConnectExceptionToSQLServerException(String hostName, * @return error string concated by ClientConnectionId(in string format) if applicable, otherwise, return original error string. */ static String checkAndAppendClientConnId(String errMsg, - SQLServerConnection conn) throws SQLServerException { + SQLServerConnection conn) throws SQLServerException { if (null != conn && conn.attachConnId()) { UUID clientConnId = conn.getClientConIdInternal(); assert null != clientConnId;