Merge pull request #65 from krzysztofruszczynski/JsonFixes

Json fixes
DATA-DOG · Oct 9, 2019 · 2582d9f · 2582d9f
2 parents 6a1f713 + e3fb270
commit 2582d9f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/DataDog/AuditBundle/Entity/AuditLog.php b/src/DataDog/AuditBundle/Entity/AuditLog.php
@@ -44,7 +44,7 @@ class AuditLog
     private $blame;
 
     /**
-     * @ORM\Column(type="json_array", nullable=true)
+     * @ORM\Column(type="json", nullable=true)
      */
     private $diff;
 

diff --git a/src/DataDog/AuditBundle/EventSubscriber/AuditSubscriber.php b/src/DataDog/AuditBundle/EventSubscriber/AuditSubscriber.php
@@ -276,7 +276,7 @@ protected function insert(EntityManager $em, $entity, array $ch)
             'source' => $this->assoc($em, $entity),
             'target' => null,
             'blame' => $this->blame($em),
-            'diff' => json_encode($diff),
+            'diff' => $diff,
             'tbl' => $meta->table['name'],
         ]);
     }
@@ -293,7 +293,7 @@ protected function update(EntityManager $em, $entity, array $ch)
             'source' => $this->assoc($em, $entity),
             'target' => null,
             'blame' => $this->blame($em),
-            'diff' => json_encode($diff),
+            'diff' => $diff,
             'tbl' => $meta->table['name'],
         ]);
     }

diff --git a/src/DataDog/AuditBundle/Resources/config/doctrine/AuditLog.orm.xml b/src/DataDog/AuditBundle/Resources/config/doctrine/AuditLog.orm.xml
@@ -11,7 +11,7 @@
 
     <field name="action" length="12" />
     <field name="tbl" length="128" />
-    <field name="diff" type="json_array" nullable="true" />
+    <field name="diff" type="json" nullable="true" />
     <field name="loggedAt" type="datetime" />
 
     <one-to-one field="source" target-entity="Association">

diff --git a/src/DataDog/AuditBundle/Resources/config/doctrine/AuditLog.orm.yml b/src/DataDog/AuditBundle/Resources/config/doctrine/AuditLog.orm.yml
@@ -23,7 +23,7 @@ DataDog\AuditBundle\Entity\AuditLog:
     tbl:
       length: 128
     diff:
-      type: json_array
+      type: json
       nullable: true
     loggedAt:
       type: datetime