Merge branch 'main' into convert-params-with-comments

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/AbstractStatementParser.java

@@ -697,7 +697,11 @@ public boolean checkReturningClause(String sql) {
   }
 
   /**
+<<<<<<< HEAD
    * Returns true if this dialect supports nested comments.
+=======
+   * <<<<<<< HEAD Returns true if this dialect supports nested comments.
+>>>>>>> main
    *
    * <ul>
    *   <li>This method should return false for dialects that consider this to be a valid comment:

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

@@ -21,6 +21,9 @@
 
 import com.google.cloud.spanner.Dialect;
 import com.google.cloud.spanner.connection.StatementParserTest.CommentInjector;
+import static org.junit.Assert.assertEquals;
+
+import com.google.cloud.spanner.Dialect;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;