diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java index 621baf8690..5d1a51390d 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java @@ -1164,6 +1164,16 @@ public static void useDefaultEnvironment() { SpannerOptions.environment = SpannerEnvironmentImpl.INSTANCE; } + @Override + protected String getDefaultProject() { + String projectId = getDefaultProjectId(); + // The project id does not matter if we are using the emulator. + if (projectId == null && System.getenv("SPANNER_EMULATOR_HOST") != null) { + return "emulator-project"; + } + return projectId; + } + public TransportChannelProvider getChannelProvider() { return channelProvider; }