fix: extract error details from SpannerException

Author: olavloite

google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java

@@ -1012,7 +1012,7 @@ void appendToOptions(Options options) {
     public int hashCode() {
       return LastStatementUpdateOption.class.hashCode();
     }
-    
+
     @Override
     public boolean equals(Object o) {
       return o instanceof LastStatementUpdateOption;

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java

@@ -265,6 +265,9 @@ static ErrorDetails extractErrorDetails(Throwable cause) {
       if (cause instanceof ApiException) {
         return ((ApiException) cause).getErrorDetails();
       }
+      if (cause instanceof SpannerException) {
+        return ((SpannerException) cause).getErrorDetails();
+      }
       prevCause = cause;
       cause = cause.getCause();
     }

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/RetryDmlAsPartitionedDmlMockServerTest.java

@@ -83,6 +83,8 @@ public void testTransactionMutationLimitExceeded_isNotRetriedByDefault() {
       assertEquals(0, exception.getSuppressed().length);
     }
     assertEquals(1, mockSpanner.countRequestsOfType(ExecuteSqlRequest.class));
+    ExecuteSqlRequest request = mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).get(0);
+    assertTrue(request.getLastStatement());
     assertEquals(0, mockSpanner.countRequestsOfType(CommitRequest.class));
   }
 
@@ -108,6 +110,7 @@ public void testTransactionMutationLimitExceeded_canBeRetriedAsPDML() {
     ExecuteSqlRequest transactionalRequest =
         mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).get(0);
     assertTrue(transactionalRequest.getTransaction().getBegin().hasReadWrite());
+    assertTrue(transactionalRequest.getLastStatement());
 
     // Partitioned DML uses an explicit BeginTransaction RPC.
     assertEquals(1, mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
@@ -117,6 +120,7 @@ public void testTransactionMutationLimitExceeded_canBeRetriedAsPDML() {
     ExecuteSqlRequest partitionedDmlRequest =
         mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).get(1);
     assertTrue(partitionedDmlRequest.getTransaction().hasId());
+    assertFalse(partitionedDmlRequest.getLastStatement());
 
     // Partitioned DML transactions are not committed.
     assertEquals(0, mockSpanner.countRequestsOfType(CommitRequest.class));
@@ -163,6 +167,7 @@ public void testTransactionMutationLimitExceeded_retryAsPDMLFails() {
     ExecuteSqlRequest transactionalRequest =
         mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).get(0);
     assertTrue(transactionalRequest.getTransaction().getBegin().hasReadWrite());
+    assertTrue(transactionalRequest.getLastStatement());
 
     // Partitioned DML uses an explicit BeginTransaction RPC.
     assertEquals(1, mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
@@ -172,6 +177,7 @@ public void testTransactionMutationLimitExceeded_retryAsPDMLFails() {
     ExecuteSqlRequest partitionedDmlRequest =
         mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).get(1);
     assertTrue(partitionedDmlRequest.getTransaction().hasId());
+    assertFalse(partitionedDmlRequest.getLastStatement());
 
     // Partitioned DML transactions are not committed.
     assertEquals(0, mockSpanner.countRequestsOfType(CommitRequest.class));