test case for #676

tests/cases/integration/Entity/entity.compositePK.phpt

@@ -9,6 +9,7 @@ namespace NextrasTests\Orm\Integration\Entity;
 
 
 use DateTimeImmutable;
+use Nette\Utils\DateTime;
 use Nextras\Dbal\IConnection;
 use Nextras\Orm\Exception\InvalidArgumentException;
 use NextrasTests\Orm\DataTestCase;
@@ -17,6 +18,7 @@ use NextrasTests\Orm\User;
 use NextrasTests\Orm\UserStat;
 use NextrasTests\Orm\UserStatX;
 use Tester\Assert;
+use Tester\Environment;
 
 
 require_once __DIR__ . '/../../../bootstrap.php';
@@ -55,7 +57,7 @@ class EntityCompositePKTest extends DataTestCase
 		$this->orm->persistAndFlush($userStat);
 	}
 
-	public function testCompositePKDateTime2()
+	public function testCompositePKDateTime2(): void
 	{
 		if ($this->section === Helper::SECTION_MSSQL) {
 			// An explicit value for the identity column in table 'users' can only be specified when a column list is used and IDENTITY_INSERT is ON.
@@ -74,7 +76,7 @@ class EntityCompositePKTest extends DataTestCase
 
 		$this->orm->clear();
 
-		$res = $this->orm->userStatsX->getBy(['date' => '2019-01-01']);
+		$res = $this->orm->userStatsX->getBy(['date' => new DateTime('2019-01-01')]);
 		Assert::same(100, $res->value);
 
 		$res->value = 200;
@@ -83,13 +85,13 @@ class EntityCompositePKTest extends DataTestCase
 
 		$this->orm->clear();
 
-		$res = $this->orm->userStatsX->getBy(['date' => '2019-01-01']);
+		$res = $this->orm->userStatsX->getBy(['date' => new DateTime('2019-01-01')]);
 		Assert::same(200, $res->value);
-		
+
 		Environment::$checkAssertions = false;
 	}
-	
-	
+
+
 
 	public function testGetBy(): void
 	{

tests/cases/integration/Entity/entity.pk.phpt

@@ -11,6 +11,7 @@ namespace NextrasTests\Orm\Integration\Entity;
 use DateTimeImmutable;
 use NextrasTests\Orm\DataTestCase;
 use NextrasTests\Orm\Log;
+use NextrasTests\Orm\TimeSeries;
 use Tester\Assert;
 
 
@@ -32,6 +33,23 @@ class EntityPkTest extends DataTestCase
 		$entry = $this->orm->logs->getById($datetime);
 		Assert::true($entry !== null);
 	}
+
+	public function testDateTimeWithProxyPkUpdate(): void
+	{
+		$timeSeries = new TimeSeries();
+		$timeSeries->id = $datetime = new DateTimeImmutable('2022-03-06T03:03:03Z');
+		$timeSeries->value = 3;
+		$this->orm->persistAndFlush($timeSeries);
+
+		$this->orm->clear();
+		$timeSeries = $this->orm->timeSeries->getById($datetime);
+		$timeSeries = $this->orm->timeSeries->getById($datetime);
+		$timeSeries->value = 5;
+		$this->orm->persistAndFlush($timeSeries);
+
+		$entry = $this->orm->timeSeries->getById($datetime);
+		Assert::true($entry !== null);
+	}
 }
 
 

tests/db/mssql-init.sql

@@ -141,6 +141,15 @@ CREATE TABLE user_stats
     CONSTRAINT user_stats_user_id FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE NO ACTION ON UPDATE CASCADE
 );
 
+CREATE TABLE user_stats_x
+(
+    user_id int            NOT NULL,
+    date    date           NOT NULL,
+    value   int            NOT NULL,
+    PRIMARY KEY (user_id, date),
+    CONSTRAINT user_stats_x_user_id FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE NO ACTION ON UPDATE CASCADE
+);
+
 
 CREATE TABLE users_x_users
 (
@@ -176,3 +185,11 @@ CREATE TABLE publishers_x_tags
     CONSTRAINT publishers_x_tags_tag FOREIGN KEY (tag_id) REFERENCES tags (id),
     CONSTRAINT publishers_x_tags_publisher FOREIGN KEY (publisher_id) REFERENCES publishers (publisher_id) ON DELETE CASCADE
 );
+
+
+CREATE TABLE time_series
+(
+    date  datetimeoffset NOT NULL,
+    value int            NOT NULL,
+    PRIMARY KEY (date)
+);

tests/db/mysql-init.sql

@@ -120,46 +120,13 @@ CREATE TABLE photos
     CONSTRAINT photos_album_id FOREIGN KEY (album_id) REFERENCES photo_albums (id) ON DELETE CASCADE ON UPDATE CASCADE
 ) AUTO_INCREMENT = 1;
 
-CREATE TABLE user_stats_x (
-	user_id int NOT NULL,
-	date DATETIME NOT NULL,
-	value int NOT NULL,
-	PRIMARY KEY(user_id, date),
-	CONSTRAINT user_stats_x_user_id FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE ON UPDATE CASCADE
-);
-
-
-CREATE TABLE users_x_users (
-	my_friends_id int NOT NULL,
-	friends_with_me_id int NOT NULL,
-	PRIMARY KEY (my_friends_id, friends_with_me_id),
-	CONSTRAINT my_friends_key FOREIGN KEY (my_friends_id) REFERENCES users (id) ON DELETE CASCADE ON UPDATE CASCADE,
-	CONSTRAINT friends_with_me_key FOREIGN KEY (friends_with_me_id) REFERENCES users (id) ON DELETE CASCADE ON UPDATE CASCADE
-);
-
 
 CREATE TRIGGER `book_collections_bu_trigger` BEFORE UPDATE ON `book_collections`
 FOR EACH ROW SET NEW.updated_at = NOW();
 
 CREATE TRIGGER `book_collections_bi_trigger` BEFORE INSERT ON `book_collections`
 FOR EACH ROW SET NEW.updated_at = NOW();
 
-
-CREATE TABLE photo_albums (
-	id int NOT NULL AUTO_INCREMENT,
-	title varchar(255) NOT NULL,
-	preview_id int NULL,
-	PRIMARY KEY(id)
-) AUTO_INCREMENT=1;
-
-CREATE TABLE photos (
-	id int NOT NULL AUTO_INCREMENT,
-	title varchar(255) NOT NULL,
-	album_id int NOT NULL,
-	PRIMARY KEY(id),
-	CONSTRAINT photos_album_id FOREIGN KEY (album_id) REFERENCES photo_albums (id) ON DELETE CASCADE ON UPDATE CASCADE
-) AUTO_INCREMENT=1;
-
 ALTER TABLE photo_albums
     ADD CONSTRAINT photo_albums_preview_id FOREIGN KEY (preview_id) REFERENCES photos (id) ON DELETE CASCADE ON UPDATE CASCADE;
 
@@ -180,6 +147,13 @@ CREATE TABLE user_stats
     CONSTRAINT user_stats_user_id FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE RESTRICT ON UPDATE CASCADE
 );
 
+CREATE TABLE user_stats_x (
+    user_id int NOT NULL,
+    date date NOT NULL,
+    value int NOT NULL,
+    PRIMARY KEY(user_id, date),
+    CONSTRAINT user_stats_x_user_id FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE ON UPDATE CASCADE
+);
 
 CREATE TABLE users_x_users
 (
@@ -191,17 +165,6 @@ CREATE TABLE users_x_users
 );
 
 
-CREATE TRIGGER `book_collections_bu_trigger`
-    BEFORE UPDATE
-    ON `book_collections`
-    FOR EACH ROW SET NEW.updated_at = NOW();
-
-CREATE TRIGGER `book_collections_bi_trigger`
-    BEFORE INSERT
-    ON `book_collections`
-    FOR EACH ROW SET NEW.updated_at = NOW();
-
-
 CREATE TABLE logs
 (
     date  TIMESTAMP NOT NULL,
@@ -218,3 +181,10 @@ CREATE TABLE publishers_x_tags
     CONSTRAINT publishers_x_tags_tag FOREIGN KEY (tag_id) REFERENCES tags (id),
     CONSTRAINT publishers_x_tags_publisher FOREIGN KEY (publisher_id) REFERENCES publishers (publisher_id) ON DELETE CASCADE
 );
+
+CREATE TABLE time_series
+(
+    date DATETIME NOT NULL,
+    value int NOT NULL,
+    PRIMARY KEY (date)
+)

tests/db/pgsql-init.sql

@@ -140,6 +140,15 @@ CREATE TABLE "user_stats"
     CONSTRAINT "user_stats_user_id" FOREIGN KEY ("user_id") REFERENCES "users" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
 );
 
+CREATE TABLE "user_stats_x"
+(
+    "user_id" int         NOT NULL,
+    "date"    date        NOT NULL,
+    "value"   int         NOT NULL,
+    PRIMARY KEY ("user_id", "date"),
+    CONSTRAINT "user_stats_x_user_id" FOREIGN KEY ("user_id") REFERENCES "users" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
 
 CREATE TABLE "users_x_users"
 (
@@ -189,3 +198,11 @@ CREATE TABLE "publishers_x_tags"
     CONSTRAINT "publishers_x_tags_tag" FOREIGN KEY ("tag_id") REFERENCES "tags" ("id"),
     CONSTRAINT "publishers_x_tags_publisher" FOREIGN KEY ("publisher_id") REFERENCES "publishers" ("publisher_id") ON DELETE CASCADE ON UPDATE CASCADE
 );
+
+
+CREATE TABLE "time_series"
+(
+    "date"  TIMESTAMPTZ NOT NULL,
+    "value" int         NOT NULL,
+    PRIMARY KEY ("date")
+);

tests/inc/model/Model.php

@@ -22,6 +22,7 @@
  * @property-read UsersRepository $users
  * @property-read UserStatsRepository $userStats
  * @property-read UserStatsXRepository $userStatsX
+ * @property-read TimeSeriesRepository $timeSeries
  */
 class Model extends OrmModel
 {

tests/inc/model/timeSeries/TimeSeries.php

@@ -0,0 +1,17 @@
+<?php declare(strict_types = 1);
+
+namespace NextrasTests\Orm;
+
+
+use DateTimeImmutable;
+use Nextras\Orm\Entity\Entity;
+
+
+/**
+ * @property DateTimeImmutable $id     {primary-proxy}
+ * @property DateTimeImmutable $date   {primary}
+ * @property int               $value
+ */
+final class TimeSeries extends Entity
+{
+}

tests/inc/model/timeSeries/TimeSeriesMapper.php

@@ -0,0 +1,14 @@
+<?php declare(strict_types = 1);
+
+namespace NextrasTests\Orm;
+
+
+use Nextras\Orm\Mapper\Dbal\DbalMapper;
+
+
+/**
+ * @extends DbalMapper<Log>
+ */
+final class TimeSeriesMapper extends DbalMapper
+{
+}

tests/inc/model/timeSeries/TimeSeriesRepository.php

@@ -0,0 +1,18 @@
+<?php declare(strict_types = 1);
+
+namespace NextrasTests\Orm;
+
+
+use Nextras\Orm\Repository\Repository;
+
+
+/**
+ * @extends Repository<Log>
+ */
+final class TimeSeriesRepository extends Repository
+{
+	static function getEntityClassNames(): array
+	{
+		return [TimeSeries::class];
+	}
+}

tests/inc/model/userStatX/UserStatsXMapper.php

@@ -2,9 +2,9 @@
 
 namespace NextrasTests\Orm;
 
-use Nextras\Orm\Mapper\Mapper;
+use Nextras\Orm\Mapper\Dbal\DbalMapper;
 
 
-final class UserStatsXMapper extends Mapper
+final class UserStatsXMapper extends DbalMapper
 {
 }

tests/sqls/NextrasTests/Orm/Integration/Entity/EntityCompositePKTest_testCompositePKDateTime2.sql

@@ -0,0 +1,12 @@
+START TRANSACTION;
+INSERT INTO "users" VALUES (DEFAULT);
+SELECT CURRVAL('"users_id_seq"');
+COMMIT;
+START TRANSACTION;
+INSERT INTO "user_stats_x" ("user_id", "date", "value") VALUES (1, '2019-01-01 00:00:00.000000'::timestamp, 100);
+COMMIT;
+SELECT "user_stats_x".* FROM "user_stats_x" AS "user_stats_x" WHERE (("user_stats_x"."date" = '2019-01-01 00:00:00.000000'::timestamp));
+START TRANSACTION;
+UPDATE "user_stats_x" SET "value" = 200 WHERE "user_id" = 1 AND "date" = '2019-01-01 00:00:00.000000'::timestamp;
+COMMIT;
+SELECT "user_stats_x".* FROM "user_stats_x" AS "user_stats_x" WHERE (("user_stats_x"."date" = '2019-01-01 00:00:00.000000'::timestamp));

tests/sqls/NextrasTests/Orm/Integration/Entity/EntityPkTest_testDateTimeWithProxyPkUpdate.sql

@@ -0,0 +1,9 @@
+START TRANSACTION;
+INSERT INTO "time_series" ("date", "value") VALUES ('2022-03-06 03:03:03.000000'::timestamptz, 3);
+COMMIT;
+SELECT "time_series".* FROM "time_series" AS "time_series" WHERE (("time_series"."date" = '2022-03-06 03:03:03.000000'::timestamptz));
+SELECT "time_series".* FROM "time_series" AS "time_series" WHERE (("time_series"."date" = '2022-03-06 03:03:03.000000'::timestamptz));
+START TRANSACTION;
+UPDATE "time_series" SET "value" = 5 WHERE "date" = '2022-03-06 04:03:03.000000';
+COMMIT;
+SELECT "time_series".* FROM "time_series" AS "time_series" WHERE (("time_series"."date" = '2022-03-06 03:03:03.000000'::timestamptz));