Merge branch 'main' into base-grpc-call-context

Author: olavloite

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

@@ -144,6 +144,11 @@ public static Statement of(String sql) {
     return new Statement(sql, ImmutableMap.of(), /*queryOptions=*/ null);
   }
 
+  /** Creates a {@link Statement} with the given SQL text and parameters. */
+  public static Statement of(String sql, ImmutableMap<String, Value> parameters) {
+    return new Statement(sql, parameters, /*queryOptions=*/ null);
+  }
+
   /** Creates a new statement builder with the SQL text {@code sql}. */
   public static Builder newBuilder(String sql) {
     return new Builder(sql);

google-cloud-spanner/src/test/java/com/google/cloud/spanner/StatementTest.java

@@ -18,6 +18,8 @@
 
 import static com.google.common.testing.SerializableTester.reserializeAndAssert;
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThrows;
 
@@ -42,6 +44,17 @@ public void basic() {
     reserializeAndAssert(stmt);
   }
 
+  @Test
+  public void basicWithParameters() {
+    String sql = "SELECT @name";
+    Statement stmt = Statement.of(sql, ImmutableMap.of("name", Value.string("hello")));
+    assertEquals(sql, stmt.getSql());
+    assertFalse(stmt.getParameters().isEmpty());
+    assertEquals(Value.string("hello"), stmt.getParameters().get("name"));
+    assertEquals(sql + " {name: hello}", stmt.toString());
+    reserializeAndAssert(stmt);
+  }
+
   @Test
   public void serialization() {
     Statement stmt =