fix some

atk4 · Jan 2, 2022 · 89d1883 · 89d1883
1 parent b277aa4
commit 89d1883
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/Model2Inner.php b/src/Model2Inner.php
@@ -26,6 +26,11 @@ protected function init(): void
                 continue;
             }
 
+            // TODO calculated fields, needs to copy (and maybe update some) more properties
+            if ($oField instanceof Field\SqlExpressionField) {
+                continue;
+            }
+
             $fieldDefaults = [get_class($oField)];
             foreach ([
                 'type',

diff --git a/tests/ExpressionSqlTest.php b/tests/ExpressionSqlTest.php
@@ -34,7 +34,7 @@ public function testBasic(): void
 
         if ($this->getDatabasePlatform() instanceof SqlitePlatform) {
             $this->assertSame(
-                'select "id", "total_net", "total_vat", ("total_net"+"total_vat") "total_gross" from "invoice"',
+                'select "id", "total_net", "total_vat", ("total_net"+"total_vat") "total_gross" from (select "id", "total_net", "total_vat" from "invoice") "__inner__"',
                 $i->action('select')->render()[0]
             );
         }
@@ -51,7 +51,7 @@ public function testBasic(): void
 
         if ($this->getDatabasePlatform() instanceof SqlitePlatform) {
             $this->assertEquals(
-                'select "id", "total_net", "total_vat", ("total_net"+"total_vat") "total_gross", (("total_net"+"total_vat")*2) "double_total_gross" from "invoice"',
+                'select "id", "total_net", "total_vat", ("total_net"+"total_vat") "total_gross", (("total_net"+"total_vat")*2) "double_total_gross" from (select "id", "total_net", "total_vat" from "invoice") "__inner__"',
                 $i->action('select')->render()[0]
             );
         }
@@ -76,7 +76,7 @@ public function testBasicCallback(): void
 
         if ($this->getDatabasePlatform() instanceof SqlitePlatform) {
             $this->assertSame(
-                'select "id", "total_net", "total_vat", ("total_net"+"total_vat") "total_gross" from "invoice"',
+                'select "id", "total_net", "total_vat", ("total_net"+"total_vat") "total_gross" from (select "id", "total_net", "total_vat" from "invoice") "__inner__"',
                 $i->action('select')->render()[0]
             );
         }
@@ -104,7 +104,7 @@ public function testQuery(): void
 
         if ($this->getDatabasePlatform() instanceof SqlitePlatform) {
             $this->assertSame(
-                'select "id", "total_net", "total_vat", (select sum("total_net") from "invoice") "sum_net" from "invoice"',
+                'select "id", "total_net", "total_vat", (select sum("total_net") from (select "id", "total_net", "total_vat" from "invoice") "__inner__") "sum_net" from (select "id", "total_net", "total_vat" from "invoice") "__inner__"',
                 $i->action('select')->render()[0]
             );
         }
@@ -151,7 +151,7 @@ public function testExpressions(): void
         }
 
         $this->assertSameSql(
-            'select "id", "name", "surname", "cached_name", (' . $concatSql . ') "full_name" from "user" where ((' . $concatSql . ') != "cached_name")',
+            'select "id", "name", "surname", "cached_name", (' . $concatSql . ') "full_name" from (select "id", "name", "surname", "cached_name" from "user") "__inner__" where ((' . $concatSql . ') != "cached_name")',
             $m->action('select')->render()[0]
         );