even more cleanup

verfriemelt-dot-org · Nov 22, 2024 · 55de6d8 · 55de6d8
1 parent 58daebb
commit 55de6d8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/_/DataModel/TreeDataModel.php b/_/DataModel/TreeDataModel.php
@@ -144,7 +144,8 @@ private function validateMove(TreeDataModel $moveTo)
         }
 
         if (
-            $moveTo->getLeft() > $this->left && $moveTo->getRight() < $this->right
+            isset($this->left) && isset($this->right)
+            && $moveTo->getLeft() > $this->left && $moveTo->getRight() < $this->right
         ) {
             throw new DatabaseException('cannot move model under itself');
         }
@@ -225,7 +226,7 @@ protected function prepareDataForStorage(bool $includeNonFuzzy = false): array
         foreach ((new DataModelAnalyser($this))->fetchProperties() as $attribute) {
             // skip pk
             if (static::getPrimaryKey() !== null && $attribute->getName() === static::getPrimaryKey(
-            ) && $this->{static::getPrimaryKey()} === null) {
+            ) && !isset($this->{static::getPrimaryKey()})) {
                 continue;
             }
 

diff --git a/tests/Integration/DataModel/DataModelAttributeTest.php b/tests/Integration/DataModel/DataModelAttributeTest.php
@@ -68,9 +68,17 @@ public function setUp(): void
 
         parent::setUp();
 
-        static::$connection->query('create table lowerdummy ( id integer primary key not null, complexfieldname text );');
-        static::$connection->query('create table "camelCaseDummy" ( id integer primary key not null, "complexFieldName" text );');
-        static::$connection->query('create table snake_case_dummy ( id integer primary key not null, complex_field_name text );');
+        if (static::$connection instanceof SQLite) {
+            static::$connection->query('create table lowerdummy ( id integer primary key not null, complexfieldname text );');
+            static::$connection->query('create table "camelCaseDummy" ( id integer primary key not null, "complexFieldName" text );');
+            static::$connection->query('create table snake_case_dummy ( id integer primary key not null, complex_field_name text );');
+        } else {
+            static::$connection->query('create table lowerdummy ( id serial primary key not null, complexfieldname text );');
+            static::$connection->query('create table "camelCaseDummy" ( id serial primary key not null, "complexFieldName" text );');
+            static::$connection->query('create table snake_case_dummy ( id serial primary key not null, complex_field_name text );');
+        }
+
+
     }
 
     #[Override]

diff --git a/tests/Integration/DataModel/TreeDataModelTest.php b/tests/Integration/DataModel/TreeDataModelTest.php
@@ -308,6 +308,7 @@ public function test_move(): void
             ],
         ]);
 
+
         $c->move()->under($a)->save();
         $this->validateStruct([
             'a' => [
@@ -342,8 +343,8 @@ public function test_move(): void
         $this->validateStruct([
             'b' => [
                 'a' => [
-                    'd' => [],
                     'c' => [],
+                    'd' => [],
                 ],
             ],
         ]);