Address Comments

Author: PineappleIOnic

src/Database/Adapter/MariaDB.php

@@ -982,9 +982,17 @@ public function createDocuments(string $collection, array $documents, int $batch
             $name = $this->filter($collection);
 
             $attributeKeys = Database::INTERNAL_ATTRIBUTE_KEYS;
+
+            $hasInternalId = null;
             foreach ($documents as $document) {
                 $attributes = $document->getAttributes();
                 $attributeKeys = array_merge($attributeKeys, array_keys($attributes));
+
+                if ($hasInternalId === null) {
+                    $hasInternalId = !empty($document->getInternalId());
+                } elseif ($hasInternalId == empty($document->getInternalId())) {
+                    throw new DatabaseException('All documents must have an internalId if one is set');
+                }
             }
             $attributeKeys = array_unique($attributeKeys);
 

src/Database/Adapter/Postgres.php

@@ -1041,11 +1041,20 @@ public function createDocuments(string $collection, array $documents, int $batch
             $name = $this->filter($collection);
 
             $attributeKeys = Database::INTERNAL_ATTRIBUTE_KEYS;
+
+            $hasInternalId = null;
             foreach ($documents as $document) {
                 $attributes = $document->getAttributes();
                 $attributeKeys = array_merge($attributeKeys, array_keys($attributes));
+
+                if ($hasInternalId === null) {
+                    $hasInternalId = !empty($document->getInternalId());
+                } elseif ($hasInternalId == empty($document->getInternalId())) {
+                    throw new DatabaseException('All documents must have an internalId if one is set');
+                }
             }
             $attributeKeys = array_unique($attributeKeys);
+
             if ($this->sharedTables) {
                 $attributeKeys[] = '_tenant';
             }

tests/e2e/Adapter/Base.php

@@ -2273,6 +2273,36 @@ public function testCreateDocumentsWithDifferentAttributes(): void
         $this->assertNull($documents[1]->getAttribute('integer'));
         $this->assertEquals('default', $documents[1]->getAttribute('string_default'));
 
+        /**
+         * Expect fail, mix of internalId and no internalId
+         */
+        $documents = [
+            new Document([
+                '$id' => 'third',
+                '$internalId' => 'third',
+                'string' => 'text📝',
+            ]),
+            new Document([
+                '$id' => 'fourth',
+                'string' => 'text📝',
+            ]),
+        ];
+
+        try {
+            static::getDatabase()->createDocuments($collection, $documents);
+            $this->fail('Failed to throw exception');
+        } catch (Throwable $e) {
+            $this->assertTrue($e instanceof DatabaseException);
+        }
+
+        $documents = array_reverse($documents);
+        try {
+            static::getDatabase()->createDocuments($collection, $documents);
+            $this->fail('Failed to throw exception');
+        } catch (Throwable $e) {
+            $this->assertTrue($e instanceof DatabaseException);
+        }
+
         static::getDatabase()->deleteCollection($collection);
     }