diff --git a/.github/workflows/dataconnect.yml b/.github/workflows/dataconnect.yml index a3d9304201f..56d0e031d29 100644 --- a/.github/workflows/dataconnect.yml +++ b/.github/workflows/dataconnect.yml @@ -34,7 +34,7 @@ env: FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }} FDC_ANDROID_EMULATOR_API_LEVEL: ${{ inputs.androidEmulatorApiLevel || '34' }} FDC_NODEJS_VERSION: ${{ inputs.nodeJsVersion || '20' }} - FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.27.0' }} + FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '15.0.0' }} FDC_FIREBASE_TOOLS_DIR: /tmp/firebase-tools FDC_FIREBASE_COMMAND: /tmp/firebase-tools/node_modules/.bin/firebase FDC_PYTHON_VERSION: ${{ inputs.pythonVersion || '3.13' }} diff --git a/.github/workflows/dataconnect_demo_app.yml b/.github/workflows/dataconnect_demo_app.yml index 98d6c4c5390..e435b1394e2 100644 --- a/.github/workflows/dataconnect_demo_app.yml +++ b/.github/workflows/dataconnect_demo_app.yml @@ -18,7 +18,7 @@ on: env: FDC_NODE_VERSION: ${{ inputs.nodeVersion || '20' }} - FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.27.0' }} + FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '15.0.0' }} FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }} FDC_FIREBASE_TOOLS_DIR: ${{ github.workspace }}/firebase-tools FDC_FIREBASE_COMMAND: ${{ github.workspace }}/firebase-tools/node_modules/.bin/firebase diff --git a/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/KeyVariablesIntegrationTest.kt b/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/KeyVariablesIntegrationTest.kt index 231be08834f..1f8ebf832f2 100644 --- a/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/KeyVariablesIntegrationTest.kt +++ b/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/KeyVariablesIntegrationTest.kt @@ -117,9 +117,9 @@ class KeyVariablesIntegrationTest : DemoConnectorIntegrationTestBase() { val key = connector.insertPrimaryKeyIsInt64.execute(foo = id, value = value).data.key - val queryResult = connector.getPrimaryKeyIsInt64byKey.execute(key) + val queryResult = connector.getPrimaryKeyIsInt64ByKey.execute(key) queryResult.data.primaryKeyIsInt64 shouldBe - GetPrimaryKeyIsInt64byKeyQuery.Data.PrimaryKeyIsInt64(foo = id, value = value) + GetPrimaryKeyIsInt64ByKeyQuery.Data.PrimaryKeyIsInt64(foo = id, value = value) } @Test @@ -160,44 +160,38 @@ class KeyVariablesIntegrationTest : DemoConnectorIntegrationTestBase() { val nested6 = createPrimaryKeyNested6(nested3.key, nested4.key) val nested7 = createPrimaryKeyNested7(nested5a.key, nested5b.key, nested6.key) - val queryResult = connector.getPrimaryKeyNested7byKey.execute(nested7.key) + val queryResult = connector.getPrimaryKeyNested7ByKey.execute(nested7.key) queryResult.data shouldBe - GetPrimaryKeyNested7byKeyQuery.Data( - GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7( + GetPrimaryKeyNested7ByKeyQuery.Data( + GetPrimaryKeyNested7ByKeyQuery.Data.Key( nested7.value, - GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5a( + GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5a( nested5a.value, - GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5a.Nested1( + GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5a.Nested1( nested1s[0].key.id, nested1s[0].value ), - GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5a.Nested2( + GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5a.Nested2( nested2s[0].key.id, nested2s[0].value ), ), - GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5b( + GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5b( nested5b.value, - GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5b.Nested1( + GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5b.Nested1( nested1s[1].key.id, nested1s[1].value ), - GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5b.Nested2( + GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5b.Nested2( nested2s[1].key.id, nested2s[1].value ), ), - GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested6( + GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested6( nested6.value, - GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested6.Nested3( - nested3.key.id, - nested3.value - ), - GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested6.Nested4( - nested4.key.id, - nested4.value - ), + GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested6.Nested3(nested3.key.id, nested3.value), + GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested6.Nested4(nested4.key.id, nested4.value), ), ) ) diff --git a/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/NestedStructsIntegrationTest.kt b/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/NestedStructsIntegrationTest.kt index 9a81d6a6ebe..a7adf28ab28 100644 --- a/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/NestedStructsIntegrationTest.kt +++ b/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/NestedStructsIntegrationTest.kt @@ -35,80 +35,80 @@ class NestedStructsIntegrationTest : DemoConnectorIntegrationTestBase() { val nested1a = createNested1(nested1 = null, nested2Keys) val nested1b = createNested1(nested1 = nested1a.key, nested2Keys) - val queryResult = connector.getNested1byKey.execute(nested1b.key) + val queryResult = connector.getNested1ByKey.execute(nested1b.key) queryResult.data shouldBe - GetNested1byKeyQuery.Data( - GetNested1byKeyQuery.Data.Nested1( + GetNested1ByKeyQuery.Data( + GetNested1ByKeyQuery.Data.Nested1( id = nested1b.key.id, nested1 = - GetNested1byKeyQuery.Data.Nested1.Nested1( + GetNested1ByKeyQuery.Data.Nested1.Nested1( id = nested1a.key.id, nested1 = null, nested2 = - GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2( + GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2( id = nested2s[0].key.id, value = nested2s[0].value, nested3 = - GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2.Nested3( + GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2.Nested3( id = nested3s[0].key.id, value = nested3s[0].value, ), nested3NullableNull = null, nested3NullableNonNull = - GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2.Nested3nullableNonNull( + GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2.Nested3NullableNonNull( id = nested3s[1].key.id, value = nested3s[1].value, ), ), nested2NullableNull = null, nested2NullableNonNull = - GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2nullableNonNull( + GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2NullableNonNull( id = nested2s[1].key.id, value = nested2s[1].value, nested3 = - GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2nullableNonNull.Nested3( + GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2NullableNonNull.Nested3( id = nested3s[2].key.id, value = nested3s[2].value, ), nested3NullableNull = null, nested3NullableNonNull = - GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2nullableNonNull - .Nested3nullableNonNull( + GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2NullableNonNull + .Nested3NullableNonNull( id = nested3s[3].key.id, value = nested3s[3].value, ), ), ), nested2 = - GetNested1byKeyQuery.Data.Nested1.Nested2( + GetNested1ByKeyQuery.Data.Nested1.Nested2( id = nested2s[2].key.id, value = nested2s[2].value, nested3 = - GetNested1byKeyQuery.Data.Nested1.Nested2.Nested3( + GetNested1ByKeyQuery.Data.Nested1.Nested2.Nested3( id = nested3s[4].key.id, value = nested3s[4].value, ), nested3NullableNull = null, nested3NullableNonNull = - GetNested1byKeyQuery.Data.Nested1.Nested2.Nested3nullableNonNull( + GetNested1ByKeyQuery.Data.Nested1.Nested2.Nested3NullableNonNull( id = nested3s[5].key.id, value = nested3s[5].value, ), ), nested2NullableNull = null, nested2NullableNonNull = - GetNested1byKeyQuery.Data.Nested1.Nested2nullableNonNull( + GetNested1ByKeyQuery.Data.Nested1.Nested2NullableNonNull( id = nested2s[3].key.id, value = nested2s[3].value, nested3 = - GetNested1byKeyQuery.Data.Nested1.Nested2nullableNonNull.Nested3( + GetNested1ByKeyQuery.Data.Nested1.Nested2NullableNonNull.Nested3( id = nested3s[6].key.id, value = nested3s[6].value, ), nested3NullableNull = null, nested3NullableNonNull = - GetNested1byKeyQuery.Data.Nested1.Nested2nullableNonNull.Nested3nullableNonNull( + GetNested1ByKeyQuery.Data.Nested1.Nested2NullableNonNull.Nested3NullableNonNull( id = nested3s[7].key.id, value = nested3s[7].value, ), diff --git a/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/ScalarVariablesAndDataIntegrationTest.kt b/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/ScalarVariablesAndDataIntegrationTest.kt index 736bd97551e..6144c203055 100644 --- a/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/ScalarVariablesAndDataIntegrationTest.kt +++ b/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/ScalarVariablesAndDataIntegrationTest.kt @@ -754,7 +754,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase() runTest(timeout = 60.seconds) { checkAll(propTestConfig, Arb.thisTest.longs()) { longs -> val insertResult = - connector.insertInt64variants.execute( + connector.insertInt64Variants.execute( nonNullWithZeroValue = 0, nonNullWithPositiveValue = longs.positiveValue1, nonNullWithNegativeValue = longs.negativeValue1, @@ -769,9 +769,9 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase() nullableWithMinValue = Long.MIN_VALUE } - val queryResult = connector.getInt64variantsByKey.execute(insertResult.data.key) + val queryResult = connector.getInt64VariantsByKey.execute(insertResult.data.key) queryResult.data.int64Variants shouldBe - GetInt64variantsByKeyQuery.Data.Int64variants( + GetInt64VariantsByKeyQuery.Data.Int64Variants( nonNullWithZeroValue = 0, nonNullWithPositiveValue = longs.positiveValue1, nonNullWithNegativeValue = longs.negativeValue1, @@ -790,11 +790,11 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase() @Test fun insertInt64VariantsWithDefaultValues() = runTest(timeout = 60.seconds) { - val insertResult = connector.insertInt64variantsWithHardcodedDefaults.execute {} + val insertResult = connector.insertInt64VariantsWithHardcodedDefaults.execute {} - val queryResult = connector.getInt64variantsByKey.execute(insertResult.data.key) + val queryResult = connector.getInt64VariantsByKey.execute(insertResult.data.key) queryResult.data.int64Variants shouldBe - GetInt64variantsByKeyQuery.Data.Int64variants( + GetInt64VariantsByKeyQuery.Data.Int64Variants( nonNullWithZeroValue = 0, nonNullWithPositiveValue = HardcodedValues.NON_NULL_POSITIVE_LONG, nonNullWithNegativeValue = HardcodedValues.NON_NULL_NEGATIVE_LONG, @@ -814,7 +814,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase() runTest(timeout = 60.seconds) { checkAll(propTestConfig, Arb.thisTest.longs()) { longs -> val insertResult = - connector.insertInt64variants.execute( + connector.insertInt64Variants.execute( nonNullWithZeroValue = 0, nonNullWithPositiveValue = longs.positiveValue1, nonNullWithNegativeValue = longs.negativeValue1, @@ -829,7 +829,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase() nullableWithMinValue = Long.MIN_VALUE } - connector.updateInt64variantsByKey.execute(insertResult.data.key) { + connector.updateInt64VariantsByKey.execute(insertResult.data.key) { nonNullWithZeroValue = Long.MAX_VALUE nonNullWithPositiveValue = Long.MIN_VALUE nonNullWithNegativeValue = 0 @@ -843,9 +843,9 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase() nullableWithMinValue = longs.positiveValue5 } - val queryResult = connector.getInt64variantsByKey.execute(insertResult.data.key) + val queryResult = connector.getInt64VariantsByKey.execute(insertResult.data.key) queryResult.data.int64Variants shouldBe - GetInt64variantsByKeyQuery.Data.Int64variants( + GetInt64VariantsByKeyQuery.Data.Int64Variants( nonNullWithZeroValue = Long.MAX_VALUE, nonNullWithPositiveValue = Long.MIN_VALUE, nonNullWithNegativeValue = 0, @@ -866,7 +866,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase() runTest(timeout = 60.seconds) { checkAll(propTestConfig, Arb.thisTest.longs()) { longs -> val insertResult = - connector.insertInt64variants.execute( + connector.insertInt64Variants.execute( nonNullWithZeroValue = 0, nonNullWithPositiveValue = longs.positiveValue1, nonNullWithNegativeValue = longs.negativeValue1, @@ -881,7 +881,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase() nullableWithMinValue = Long.MIN_VALUE } - connector.updateInt64variantsByKey.execute(insertResult.data.key) { + connector.updateInt64VariantsByKey.execute(insertResult.data.key) { nullableWithNullValue = null nullableWithZeroValue = null nullableWithPositiveValue = null @@ -890,9 +890,9 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase() nullableWithMinValue = null } - val queryResult = connector.getInt64variantsByKey.execute(insertResult.data.key) + val queryResult = connector.getInt64VariantsByKey.execute(insertResult.data.key) queryResult.data.int64Variants shouldBe - GetInt64variantsByKeyQuery.Data.Int64variants( + GetInt64VariantsByKeyQuery.Data.Int64Variants( nonNullWithZeroValue = 0, nonNullWithPositiveValue = longs.positiveValue1, nonNullWithNegativeValue = longs.negativeValue1, @@ -913,7 +913,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase() runTest(timeout = 60.seconds) { checkAll(propTestConfig, Arb.thisTest.longs()) { longs -> val insertResult = - connector.insertInt64variants.execute( + connector.insertInt64Variants.execute( nonNullWithZeroValue = 0, nonNullWithPositiveValue = longs.positiveValue1, nonNullWithNegativeValue = longs.negativeValue1, @@ -928,11 +928,11 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase() nullableWithMinValue = Long.MIN_VALUE } - connector.updateInt64variantsByKey.execute(insertResult.data.key) {} + connector.updateInt64VariantsByKey.execute(insertResult.data.key) {} - val queryResult = connector.getInt64variantsByKey.execute(insertResult.data.key) + val queryResult = connector.getInt64VariantsByKey.execute(insertResult.data.key) queryResult.data.int64Variants shouldBe - GetInt64variantsByKeyQuery.Data.Int64variants( + GetInt64VariantsByKeyQuery.Data.Int64Variants( nonNullWithZeroValue = 0, nonNullWithPositiveValue = longs.positiveValue1, nonNullWithNegativeValue = longs.negativeValue1, diff --git a/firebase-dataconnect/emulator/dataconnect/connector/demo/demo_ops.gql b/firebase-dataconnect/emulator/dataconnect/connector/demo/demo_ops.gql index 0d4b85aae75..e94aca3f16f 100644 --- a/firebase-dataconnect/emulator/dataconnect/connector/demo/demo_ops.gql +++ b/firebase-dataconnect/emulator/dataconnect/connector/demo/demo_ops.gql @@ -14,32 +14,32 @@ mutation InsertFoo($id: String!, $bar: String) @auth(level: PUBLIC) { - foo_insert(data: {id: $id, bar: $bar}) + key: foo_insert(data: {id: $id, bar: $bar}) } mutation UpsertFoo($id: String!, $bar: String) @auth(level: PUBLIC) { - foo_upsert(data: {id: $id, bar: $bar}) + key: foo_upsert(data: {id: $id, bar: $bar}) } mutation DeleteFoo($id: String!) @auth(level: PUBLIC) { - foo_delete(id: $id) + key: foo_delete(id: $id) } mutation DeleteFoosByBar($bar: String!) @auth(level: PUBLIC) { - foo_deleteMany(where: {bar: {eq: $bar}}) + count: foo_deleteMany(where: {bar: {eq: $bar}}) } mutation UpdateFoo($id: String!, $newBar: String) @auth(level: PUBLIC) { - foo_update(id: $id, data: {bar: $newBar}) + key: foo_update(id: $id, data: {bar: $newBar}) } mutation UpdateFoosByBar($oldBar: String, $newBar: String) @auth(level: PUBLIC) { - foo_updateMany(where: {bar: {eq: $oldBar}}, data: {bar: $newBar}) + count: foo_updateMany(where: {bar: {eq: $oldBar}}, data: {bar: $newBar}) } query GetFooById($id: String!) @@ -59,7 +59,7 @@ query GetFoosByBar($bar: String) # This is an example mutation that has no variables, for testing purposes. mutation UpsertHardcodedFoo @auth(level: PUBLIC) { - foo_upsert(data: {id: "18e61f0a-8abc-4b18-9c4c-28c2f4e82c8f", bar: "BAR"}) + key: foo_upsert(data: {id: "18e61f0a-8abc-4b18-9c4c-28c2f4e82c8f", bar: "BAR"}) } # This is an example query that has no variables, for testing purposes. @@ -72,7 +72,7 @@ query GetHardcodedFoo # This is an example mutation that has an empty selection set (Googlers see b/448629126). mutation UpsertFooEmptySelectionSet($id: String!, $bar: String) @auth(level: PUBLIC) { - foo_upsert(data: {id: $id, bar: $bar}) @redact + key: foo_upsert(data: {id: $id, bar: $bar}) @redact } # This is an example query that has an empty selection set (Googlers see b/448629126). @@ -87,7 +87,7 @@ mutation InsertStringVariants( $nullableWithNonNullValue: String, $nullableWithEmptyValue: String, ) @auth(level: PUBLIC) { - stringVariants_insert(data: { + key: stringVariants_insert(data: { nonNullWithNonEmptyValue: $nonNullWithNonEmptyValue, nonNullWithEmptyValue: $nonNullWithEmptyValue, nullableWithNullValue: $nullableWithNullValue, @@ -120,7 +120,7 @@ mutation InsertStringVariantsWithHardcodedDefaults( $nullableWithNonNullValue: String = "af8k72s98t", $nullableWithEmptyValue: String = "", ) @auth(level: PUBLIC) { - stringVariants_insert(data: { + key: stringVariants_insert(data: { nonNullWithNonEmptyValue: $nonNullWithNonEmptyValue, nonNullWithEmptyValue: $nonNullWithEmptyValue, nullableWithNullValue: $nullableWithNullValue, @@ -152,7 +152,7 @@ mutation InsertIntVariants( $nullableWithMaxValue: Int, $nullableWithMinValue: Int, ) @auth(level: PUBLIC) { - intVariants_insert(data: { + key: intVariants_insert(data: { nonNullWithZeroValue: $nonNullWithZeroValue, nonNullWithPositiveValue: $nonNullWithPositiveValue, nonNullWithNegativeValue: $nonNullWithNegativeValue, @@ -180,7 +180,7 @@ mutation InsertIntVariantsWithHardcodedDefaults( $nullableWithMaxValue: Int = 2147483647, $nullableWithMinValue: Int = -2147483648, ) @auth(level: PUBLIC) { - intVariants_insert(data: { + key: intVariants_insert(data: { nonNullWithZeroValue: $nonNullWithZeroValue, nonNullWithPositiveValue: $nonNullWithPositiveValue, nonNullWithNegativeValue: $nonNullWithNegativeValue, @@ -257,7 +257,7 @@ mutation InsertFloatVariants( $nullableWithMinValue: Float, $nullableWithMaxSafeIntegerValue: Float, ) @auth(level: PUBLIC) { - floatVariants_insert(data: { + key: floatVariants_insert(data: { nonNullWithZeroValue: $nonNullWithZeroValue, nonNullWithNegativeZeroValue: $nonNullWithNegativeZeroValue, nonNullWithPositiveValue: $nonNullWithPositiveValue, @@ -293,7 +293,7 @@ mutation InsertFloatVariantsWithHardcodedDefaults( $nullableWithMinValue: Float = 4.9E-324, $nullableWithMaxSafeIntegerValue: Float = 9007199254740991.0, ) @auth(level: PUBLIC) { - floatVariants_insert(data: { + key: floatVariants_insert(data: { nonNullWithZeroValue: $nonNullWithZeroValue, nonNullWithNegativeZeroValue: $nonNullWithNegativeZeroValue, nonNullWithPositiveValue: $nonNullWithPositiveValue, @@ -376,7 +376,7 @@ mutation InsertBooleanVariants( $nullableWithTrueValue: Boolean, $nullableWithFalseValue: Boolean, ) @auth(level: PUBLIC) { - booleanVariants_insert(data: { + key: booleanVariants_insert(data: { nonNullWithTrueValue: $nonNullWithTrueValue, nonNullWithFalseValue: $nonNullWithFalseValue, nullableWithNullValue: $nullableWithNullValue, @@ -392,7 +392,7 @@ mutation InsertBooleanVariantsWithHardcodedDefaults( $nullableWithTrueValue: Boolean = true, $nullableWithFalseValue: Boolean = false, ) @auth(level: PUBLIC) { - booleanVariants_insert(data: { + key: booleanVariants_insert(data: { nonNullWithTrueValue: $nonNullWithTrueValue, nonNullWithFalseValue: $nonNullWithFalseValue, nullableWithNullValue: $nullableWithNullValue, @@ -441,7 +441,7 @@ mutation InsertInt64Variants( $nullableWithMaxValue: Int64, $nullableWithMinValue: Int64, ) @auth(level: PUBLIC) { - int64Variants_insert(data: { + key: int64Variants_insert(data: { nonNullWithZeroValue: $nonNullWithZeroValue, nonNullWithPositiveValue: $nonNullWithPositiveValue, nonNullWithNegativeValue: $nonNullWithNegativeValue, @@ -469,7 +469,7 @@ mutation InsertInt64VariantsWithHardcodedDefaults( $nullableWithMaxValue: Int64 = 9223372036854775807, $nullableWithMinValue: Int64 = -9223372036854775808, ) @auth(level: PUBLIC) { - int64Variants_insert(data: { + key: int64Variants_insert(data: { nonNullWithZeroValue: $nonNullWithZeroValue, nonNullWithPositiveValue: $nonNullWithPositiveValue, nonNullWithNegativeValue: $nonNullWithNegativeValue, @@ -534,7 +534,7 @@ mutation InsertUUIDVariants( $nullableWithNullValue: UUID, $nullableWithNonNullValue: UUID, ) @auth(level: PUBLIC) { - uUIDVariants_insert(data: { + key: uUIDVariants_insert(data: { nonNullValue: $nonNullValue, nullableWithNullValue: $nullableWithNullValue, nullableWithNonNullValue: $nullableWithNonNullValue, @@ -549,7 +549,7 @@ mutation InsertUUIDVariants( # $nullableWithNullValue: UUID = null, # $nullableWithNonNullValue: UUID = "59ab3886-8b84-4233-a5e6-da58c0e8b97d", #) @auth(level: PUBLIC) { -# uUIDVariants_insert(data: { +# key: uUIDVariants_insert(data: { # nonNullValue: $nonNullValue, # nullableWithNullValue: $nullableWithNullValue, # nullableWithNonNullValue: $nullableWithNonNullValue, @@ -561,7 +561,7 @@ mutation InsertUUIDVariants( # variables. This definition is merely here so that the codegen will generate classes so that the # test can still be written in Kotlin and compile, even though it is disabled. mutation InsertUUIDVariantsWithHardcodedDefaults @auth(level: PUBLIC) { - uUIDVariants_insert(data: { + key: uUIDVariants_insert(data: { nonNullValue: "7f385800-13d6-491a-98c8-b4dee3fb45cb", nullableWithNullValue: null, nullableWithNonNullValue: "ede8dc0e-600c-4093-8812-071f2cedc8db", @@ -590,7 +590,7 @@ query GetUUIDVariantsByKey($key: UUIDVariants_Key!) @auth(level: PUBLIC) { } mutation InsertSyntheticId($value: String!) @auth(level: PUBLIC) { - syntheticId_insert(data: { value: $value }) + key: syntheticId_insert(data: { value: $value }) } query GetSyntheticIdById($id: UUID!) @auth(level: PUBLIC) { @@ -598,7 +598,7 @@ query GetSyntheticIdById($id: UUID!) @auth(level: PUBLIC) { } mutation InsertPrimaryKeyIsString($id: String!, $value: String!) @auth(level: PUBLIC) { - primaryKeyIsString_insert(data: { + key: primaryKeyIsString_insert(data: { id: $id, value: $value }) @@ -609,7 +609,7 @@ query GetPrimaryKeyIsStringByKey($key: PrimaryKeyIsString_Key!) @auth(level: PUB } mutation InsertPrimaryKeyIsUUID($id: UUID!, $value: String!) @auth(level: PUBLIC) { - primaryKeyIsUUID_insert(data: { + key: primaryKeyIsUUID_insert(data: { id: $id, value: $value }) @@ -625,7 +625,7 @@ mutation InsertPrimaryKeyIsInt($foo: Int!, $value: String!) @auth(level: PUBLIC) # used that already exists, it will just be replaced. There is a minuscule chance that the test # that generated the conflicting ID is running concurrently, but that chance is so small that I'm # choosing to ignore it. - primaryKeyIsInt_upsert(data: { + key: primaryKeyIsInt_upsert(data: { foo: $foo, value: $value }) @@ -641,7 +641,7 @@ mutation InsertPrimaryKeyIsFloat($foo: Float!, $value: String!) @auth(level: PUB # unlikely case of an value being used that already exists, it will just be replaced. There is a # minuscule chance that the test that generated the conflicting ID is running concurrently, but # that chance is so small that I'm choosing to ignore it. - primaryKeyIsFloat_upsert(data: { + key: primaryKeyIsFloat_upsert(data: { foo: $foo, value: $value }) @@ -657,7 +657,7 @@ mutation InsertPrimaryKeyIsDate($foo: Date!, $value: String!) @auth(level: PUBLI # unlikely case of an value being used that already exists, it will just be replaced. There is a # minuscule chance that the test that generated the conflicting ID is running concurrently, but # that chance is so small that I'm choosing to ignore it. - primaryKeyIsDate_upsert(data: { + key: primaryKeyIsDate_upsert(data: { foo: $foo, value: $value }) @@ -673,7 +673,7 @@ mutation InsertPrimaryKeyIsTimestamp($foo: Timestamp!, $value: String!) @auth(le # the unlikely case of an value being used that already exists, it will just be replaced. There is # a minuscule chance that the test that generated the conflicting ID is running concurrently, but # that chance is so small that I'm choosing to ignore it. - primaryKeyIsTimestamp_upsert(data: { + key: primaryKeyIsTimestamp_upsert(data: { foo: $foo, value: $value }) @@ -684,7 +684,7 @@ query GetPrimaryKeyIsTimestampByKey($key: PrimaryKeyIsTimestamp_Key!) @auth(leve } mutation InsertPrimaryKeyIsInt64($foo: Int64!, $value: String!) @auth(level: PUBLIC) { - primaryKeyIsInt64_upsert(data: { + key: primaryKeyIsInt64_upsert(data: { foo: $foo, value: $value }) @@ -695,7 +695,7 @@ query GetPrimaryKeyIsInt64ByKey($key: PrimaryKeyIsInt64_Key!) @auth(level: PUBLI } mutation InsertPrimaryKeyIsComposite($foo: Int!, $bar: String!, $baz: Boolean!, $value: String!) @auth(level: PUBLIC) { - primaryKeyIsComposite_insert(data: { + key: primaryKeyIsComposite_insert(data: { foo: $foo, bar: $bar, baz: $baz, @@ -708,19 +708,19 @@ query GetPrimaryKeyIsCompositeByKey($key: PrimaryKeyIsComposite_Key!) @auth(leve } mutation InsertPrimaryKeyNested1($value: String!) @auth(level: PUBLIC) { - primaryKeyNested1_insert(data: { value: $value } ) + key: primaryKeyNested1_insert(data: { value: $value } ) } mutation InsertPrimaryKeyNested2($value: String!) @auth(level: PUBLIC) { - primaryKeyNested2_insert(data: { value: $value } ) + key: primaryKeyNested2_insert(data: { value: $value } ) } mutation InsertPrimaryKeyNested3($value: String!) @auth(level: PUBLIC) { - primaryKeyNested3_insert(data: { value: $value } ) + key: primaryKeyNested3_insert(data: { value: $value } ) } mutation InsertPrimaryKeyNested4($value: String!) @auth(level: PUBLIC) { - primaryKeyNested4_insert(data: { value: $value } ) + key: primaryKeyNested4_insert(data: { value: $value } ) } mutation InsertPrimaryKeyNested5( @@ -728,7 +728,7 @@ mutation InsertPrimaryKeyNested5( $nested1: PrimaryKeyNested1_Key!, $nested2: PrimaryKeyNested2_Key! ) @auth(level: PUBLIC) { - primaryKeyNested5_insert(data: { + key: primaryKeyNested5_insert(data: { value: $value, nested1: $nested1, nested2: $nested2 @@ -740,7 +740,7 @@ mutation InsertPrimaryKeyNested6( $nested3: PrimaryKeyNested3_Key!, $nested4: PrimaryKeyNested4_Key! ) @auth(level: PUBLIC) { - primaryKeyNested6_insert(data: { + key: primaryKeyNested6_insert(data: { value: $value, nested3: $nested3, nested4: $nested4 @@ -753,7 +753,7 @@ mutation InsertPrimaryKeyNested7( $nested5b: PrimaryKeyNested5_Key!, $nested6: PrimaryKeyNested6_Key! ) @auth(level: PUBLIC) { - primaryKeyNested7_insert(data: { + key: primaryKeyNested7_insert(data: { value: $value, nested5a: $nested5a, nested5b: $nested5b, @@ -762,7 +762,7 @@ mutation InsertPrimaryKeyNested7( } query GetPrimaryKeyNested7ByKey($key: PrimaryKeyNested7_Key!) @auth(level: PUBLIC) { - primaryKeyNested7(key: $key) { + key: primaryKeyNested7(key: $key) { value nested5a { value @@ -807,7 +807,7 @@ mutation InsertNested1( $nested2NullableNull: Nested2_Key, $value: String! ) @auth(level: PUBLIC) { - nested1_insert(data: { + key: nested1_insert(data: { nested1: $nested1, nested2: $nested2, nested2NullableNonNull: $nested2NullableNonNull, @@ -928,7 +928,7 @@ mutation InsertNested2( $nested3NullableNull: Nested3_Key, $value: String! ) @auth(level: PUBLIC) { - nested2_insert(data: { + key: nested2_insert(data: { nested3: $nested3, nested3NullableNonNull: $nested3NullableNonNull, nested3NullableNull: $nested3NullableNull, @@ -937,15 +937,15 @@ mutation InsertNested2( } mutation InsertNested3($value: String!) @auth(level: PUBLIC) { - nested3_insert(data: { value: $value }) + key: nested3_insert(data: { value: $value }) } mutation InsertManyToOneParent($child: ManyToOneChild_Key) @auth(level: PUBLIC) { - manyToOneParent_insert(data: { child: $child }) + key: manyToOneParent_insert(data: { child: $child }) } mutation InsertManyToOneChild @auth(level: PUBLIC) { - manyToOneChild_insert(data: {value: null}) + key: manyToOneChild_insert(data: {value: null}) } query GetManyToOneChildByKey($key: ManyToOneChild_Key!) @auth(level: PUBLIC) { @@ -957,15 +957,15 @@ query GetManyToOneChildByKey($key: ManyToOneChild_Key!) @auth(level: PUBLIC) { } mutation InsertManyToManyChildA @auth(level: PUBLIC) { - manyToManyChildA_insert(data: {}) + key: manyToManyChildA_insert(data: {}) } mutation InsertManyToManyChildB @auth(level: PUBLIC) { - manyToManyChildB_insert(data: {}) + key: manyToManyChildB_insert(data: {}) } mutation InsertManyToManyParent($childA: ManyToManyChildA_Key!, $childB: ManyToManyChildB_Key!) @auth(level: PUBLIC) { - manyToManyParent_insert(data: {childA: $childA, childB: $childB}) + key: manyToManyParent_insert(data: {childA: $childA, childB: $childB}) } query GetManyToManyChildAByKey($key: ManyToManyChildA_Key!) @auth(level: PUBLIC) { @@ -977,7 +977,7 @@ query GetManyToManyChildAByKey($key: ManyToManyChildA_Key!) @auth(level: PUBLIC) } mutation InsertManyToOneSelfCustomName($ref: ManyToOneSelfCustomName_Key) @auth(level: PUBLIC) { - manyToOneSelfCustomName_insert(data: {ref: $ref}) + key: manyToOneSelfCustomName_insert(data: {ref: $ref}) } query GetManyToOneSelfCustomNameByKey($key: ManyToOneSelfCustomName_Key!) @auth(level: PUBLIC) { @@ -991,7 +991,7 @@ query GetManyToOneSelfCustomNameByKey($key: ManyToOneSelfCustomName_Key!) @auth( } mutation InsertManyToOneSelfMatchingName($ref: ManyToOneSelfMatchingName_Key) @auth(level: PUBLIC) { - manyToOneSelfMatchingName_insert(data: {manyToOneSelfMatchingName: $ref}) + key: manyToOneSelfMatchingName_insert(data: {manyToOneSelfMatchingName: $ref}) } query GetManyToOneSelfMatchingNameByKey($key: ManyToOneSelfMatchingName_Key!) @auth(level: PUBLIC) { @@ -1005,11 +1005,11 @@ query GetManyToOneSelfMatchingNameByKey($key: ManyToOneSelfMatchingName_Key!) @a } mutation InsertManyToManySelfParent($child1: ManyToManySelfChild_Key!, $child2: ManyToManySelfChild_Key!) @auth(level: PUBLIC) { - manyToManySelfParent_insert(data: {child1: $child1, child2: $child2}) + key: manyToManySelfParent_insert(data: {child1: $child1, child2: $child2}) } mutation InsertManyToManySelfChild @auth(level: PUBLIC) { - manyToManySelfChild_insert(data: {}) + key: manyToManySelfChild_insert(data: {}) } query GetManyToManySelfChildByKey($key: ManyToManySelfChild_Key!) @auth(level: PUBLIC) { @@ -1027,7 +1027,7 @@ mutation InsertOptionalStrings( $nullable3: String, $nullableWithSchemaDefault: String, ) @auth(level: PUBLIC) { - optionalStrings_insert(data: { + key: optionalStrings_insert(data: { required1: $required1, required2: $required2, nullable1: $nullable1, @@ -1058,7 +1058,7 @@ mutation InsertNonNullableLists( $dates: [Date!]!, $timestamps: [Timestamp!]!, ) @auth(level: PUBLIC) { - nonNullableLists_insert(data: { + key: nonNullableLists_insert(data: { strings: $strings, ints: $ints, floats: $floats, @@ -1116,7 +1116,7 @@ mutation InsertNullableLists( $dates: [Date!], $timestamps: [Timestamp!], ) @auth(level: PUBLIC) { - nullableLists_insert(data: { + key: nullableLists_insert(data: { strings: $strings, ints: $ints, floats: $floats, @@ -1204,18 +1204,18 @@ query DateNonNullable_GetAllByTagAndDefaultValue($tag: String!, $value: Date! = } mutation DateNonNullable_UpdateByKey($key: DateNonNullable_Key!, $value: Date) @auth(level: PUBLIC) { - dateNonNullable_update(key: $key, data: { value: $value }) + key: dateNonNullable_update(key: $key, data: { value: $value }) } mutation DateNonNullable_UpdateByTagAndValue($tag: String!, $value: Date, $newValue: Date) @auth(level: PUBLIC) { - dateNonNullable_updateMany( + count: dateNonNullable_updateMany( where: { value: { eq: $value }, tag: { eq: $tag } }, data: { value: $newValue } ) } mutation DateNonNullable_DeleteByTagAndValue($tag: String!, $value: Date) @auth(level: PUBLIC) { - dateNonNullable_deleteMany( + count: dateNonNullable_deleteMany( where: { value: { eq: $value }, tag: { eq: $tag } } ) } @@ -1273,18 +1273,18 @@ query DateNullable_GetAllByTagAndDefaultValue($tag: String!, $value: Date! = "17 } mutation DateNullable_UpdateByKey($key: DateNullable_Key!, $value: Date) @auth(level: PUBLIC) { - dateNullable_update(key: $key, data: { value: $value }) + key: dateNullable_update(key: $key, data: { value: $value }) } mutation DateNullable_UpdateByTagAndValue($tag: String!, $value: Date, $newValue: Date) @auth(level: PUBLIC) { - dateNullable_updateMany( + count: dateNullable_updateMany( where: { value: { eq: $value }, tag: { eq: $tag } }, data: { value: $newValue } ) } mutation DateNullable_DeleteByTagAndValue($tag: String!, $value: Date) @auth(level: PUBLIC) { - dateNullable_deleteMany( + count: dateNullable_deleteMany( where: { value: { eq: $value }, tag: { eq: $tag } } ) } @@ -1321,11 +1321,11 @@ query DateNullableWithDefaults_GetByKey($key: DateNullableWithDefaults_Key!) @au ############################################################################### mutation NonNullTimestamp_Insert($value: Timestamp!) @auth(level: PUBLIC) { - nonNullTimestamp_insert(data: { value: $value }) + key: nonNullTimestamp_insert(data: { value: $value }) } mutation NonNullTimestamp_UpdateByKey($key: NonNullTimestamp_Key!, $value: Timestamp) @auth(level: PUBLIC) { - nonNullTimestamp_update(key: $key, data: { value: $value }) + key: nonNullTimestamp_update(key: $key, data: { value: $value }) } mutation NonNullTimestamp_Insert3($tag: String, $value1: Timestamp!, $value2: Timestamp!, $value3: Timestamp!) @auth(level: PUBLIC) { @@ -1351,7 +1351,7 @@ query NonNullTimestamp_GetAllByTagAndValue($tag: String, $value: Timestamp!) @au ############################################################################### mutation NonNullTimestampsWithDefaults_Insert($value: Timestamp! = "3575-04-12T10:11:12.541991Z") @auth(level: PUBLIC) { - nonNullTimestampsWithDefaults_insert(data: { valueWithVariableDefault: $value }) + key: nonNullTimestampsWithDefaults_insert(data: { valueWithVariableDefault: $value }) } query NonNullTimestampsWithDefaults_GetByKey($key: NonNullTimestampsWithDefaults_Key!) @auth(level: PUBLIC) { @@ -1365,7 +1365,7 @@ query NonNullTimestampsWithDefaults_GetByKey($key: NonNullTimestampsWithDefaults } mutation InsertNullableTimestamp($value: Timestamp) @auth(level: PUBLIC) { - nullableTimestamp_insert(data: { value: $value }) + key: nullableTimestamp_insert(data: { value: $value }) } mutation UpdateNullableTimestamp($key: NullableTimestamp_Key!, $value: Timestamp) @auth(level: PUBLIC) { @@ -1377,7 +1377,7 @@ query GetNullableTimestampByKey($key: NullableTimestamp_Key!) @auth(level: PUBLI } mutation InsertNullableTimestampsWithDefaults($value: Timestamp = "2554-12-20T13:03:45.110429Z") @auth(level: PUBLIC) { - nullableTimestampsWithDefaults_insert(data: { valueWithVariableDefault: $value }) + key: nullableTimestampsWithDefaults_insert(data: { valueWithVariableDefault: $value }) } query GetNullableTimestampsWithDefaultsByKey($key: NullableTimestampsWithDefaults_Key!) @auth(level: PUBLIC) { @@ -1632,7 +1632,7 @@ query EnumNonNullable_GetAllByTagAndDefaultValue($tag: String!, $value: N5ekmae3 } mutation EnumNonNullable_UpdateByKey($key: EnumNonNullable_Key!, $value: N5ekmae3jn) @auth(level: PUBLIC) { - enumNonNullable_update(key: $key, data: { value: $value }) + key: enumNonNullable_update(key: $key, data: { value: $value }) } ############################################################################### @@ -1675,7 +1675,7 @@ query EnumNullable_GetAllByTagAndDefaultValue($tag: String!, $value: N5ekmae3jn } mutation EnumNullable_UpdateByKey($key: EnumNullable_Key!, $value: N5ekmae3jn) @auth(level: PUBLIC) { - enumNullable_update(key: $key, data: { value: $value }) + key: enumNullable_update(key: $key, data: { value: $value }) } ############################################################################### diff --git a/firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json b/firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json index d44d1b87a3f..fd4cd57c41b 100644 --- a/firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json +++ b/firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json @@ -1,5 +1,5 @@ { - "defaultVersion": "2.17.3", + "defaultVersion": "3.0.0", "versions": [ { "version": "1.3.4", @@ -1220,6 +1220,34 @@ "arch": "amd64", "size": 29974712, "sha512DigestHex": "c28e1bfb116d5c206cd15db768caf083f6a1867966de4cb6d11eb1eb72c61a625dd7d2089e597b39b20386a04c949142712ffba47f1d6a3ff40e4726e083bac9" + }, + { + "version": "3.0.0", + "os": "windows", + "arch": "amd64", + "size": 30653440, + "sha512DigestHex": "c12d90244caae8356ae1c83829e0057289087a222de2b109eef9e56deb8285bd06a6d11e0367b3c0f0bc82f7da70d0de95e3908cc0edc4f8526e8ef03b26e7b0" + }, + { + "version": "3.0.0", + "os": "macos", + "arch": "amd64", + "size": 30155616, + "sha512DigestHex": "8abb7e7ac0fc0b494dcda2cb5101a4fdc5ecb84c2568dfcea53fc479b9450b9fdda155b57699ca945c1edd712b007c73c085556e3f20fa1bf103706e1303ee29" + }, + { + "version": "3.0.0", + "os": "macos", + "arch": "arm64", + "size": 29630050, + "sha512DigestHex": "e44dae459cf91630e4a93d8a9d916046f284c4e4bf9d8d11dc9d15eaf9ce1bbdf211b203e32146b65437a059f4a4eddb6ea054ec11e55c8b4a93b8011deb9c01" + }, + { + "version": "3.0.0", + "os": "linux", + "arch": "amd64", + "size": 30077112, + "sha512DigestHex": "fbfe68b412e9990728b3d42680c6802d0111c606ef639a3fd1b94b4ef9815d147fd453811ac123f8381779a112146937725a106edc3d0d0938e7c451988a3bc1" } ] } \ No newline at end of file