Skip to content

Commit cd9ddea

Browse files
committed
Issue #3020902 by Berdir, alexpott: PostgresqlDateSql fails to serialize
(cherry picked from commit 60574dd)
1 parent 01554b3 commit cd9ddea

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

modules/views/src/Plugin/views/query/PostgresqlDateSql.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Drupal\views\Plugin\views\query;
44

55
use Drupal\Core\Database\Connection;
6+
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
67

78
/**
89
* PostgreSQL-specific date handling.
@@ -14,6 +15,8 @@
1415
*/
1516
class PostgresqlDateSql implements DateSqlInterface {
1617

18+
use DependencySerializationTrait;
19+
1720
/**
1821
* The database connection.
1922
*

modules/views/src/Plugin/views/query/SqliteDateSql.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Drupal\views\Plugin\views\query;
44

55
use Drupal\Core\Database\Connection;
6+
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
67

78
/**
89
* SQLite-specific date handling.
@@ -14,6 +15,8 @@
1415
*/
1516
class SqliteDateSql implements DateSqlInterface {
1617

18+
use DependencySerializationTrait;
19+
1720
/**
1821
* The database connection.
1922
*

modules/views/tests/src/Kernel/ViewElementTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ public function testViewElementEmbed() {
8282
$this->assertEqual($render['#embed'], TRUE);
8383
$this->setRawContent($renderer->renderRoot($render));
8484

85+
// Ensure that the render array can be serialized.
86+
serialize($render);
87+
8588
$xpath = $this->xpath('//div[@class="views-element-container"]');
8689
$this->assertTrue($xpath, 'The view container has been found in the rendered output.');
8790

0 commit comments

Comments
 (0)