From 95576f3779fd0a81b9b5d57e906f47a3e73fd0ba Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@afi-sa.fr>
Date: Mon, 17 Oct 2016 15:30:07 +0200
Subject: [PATCH] hotline #49000 fix items deletion on total import

---
 VERSIONS_HOTLINE/49000              |  1 +
 cosmogramme/php/_init.php           |  2 +-
 cosmogramme/sql/patch/patch_307.php |  6 ++++++
 tests/db/UpgradeDBTest.php          | 24 ++++++++++++++++++++++++
 4 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 VERSIONS_HOTLINE/49000
 create mode 100644 cosmogramme/sql/patch/patch_307.php

diff --git a/VERSIONS_HOTLINE/49000 b/VERSIONS_HOTLINE/49000
new file mode 100644
index 00000000000..431bf34d0d0
--- /dev/null
+++ b/VERSIONS_HOTLINE/49000
@@ -0,0 +1 @@
+ - ticket #49000 : correction de l'import total: des exemplaires n'étaient pas supprimés
\ No newline at end of file
diff --git a/cosmogramme/php/_init.php b/cosmogramme/php/_init.php
index 11295e409f1..75ebe7bdbe9 100644
--- a/cosmogramme/php/_init.php
+++ b/cosmogramme/php/_init.php
@@ -1,7 +1,7 @@
 <?php
 error_reporting(E_ERROR | E_PARSE);
 
-define("PATCH_LEVEL","306");
+define("PATCH_LEVEL","307");
 
 define("APPLI","cosmogramme");
 define("COSMOPATH", "/var/www/html/vhosts/opac2/www/htdocs");
diff --git a/cosmogramme/sql/patch/patch_307.php b/cosmogramme/sql/patch/patch_307.php
new file mode 100644
index 00000000000..7e024cc0bfb
--- /dev/null
+++ b/cosmogramme/sql/patch/patch_307.php
@@ -0,0 +1,6 @@
+<?php
+try {
+  $adapter = Zend_Db_Table_Abstract::getDefaultAdapter();
+  $adapter->query('alter table exemplaires modify column to_delete boolean not null default false');
+} catch(Exception $e) {}
+?>
diff --git a/tests/db/UpgradeDBTest.php b/tests/db/UpgradeDBTest.php
index 077d568f22a..b11259bfcb4 100644
--- a/tests/db/UpgradeDBTest.php
+++ b/tests/db/UpgradeDBTest.php
@@ -922,4 +922,28 @@ class UpgradeDB_306_Test extends UpgradeDBTestCase {
   public function itemsTableShouldHaveColumnToDelete() {
     $this->assertFieldType('exemplaires', 'to_delete', 'tinyint(1)');
   }
+}
+
+
+
+class UpgradeDB_307_Test extends UpgradeDBTestCase {
+  public function prepare() {
+    try {
+      $this->query('alter table exemplaires modify column to_delete boolean null default null')
+           ->query('update exemplaires set to_delete null');
+    } catch(Exception $e) {
+    }
+  }
+
+  /** @test */
+  public function itemsTableShouldHaveColumnToDeleteNotNullable() {
+    $this->assertFieldType('exemplaires', 'to_delete', 'tinyint(1)');
+  }
+
+
+  /** @test */
+  public function itemsTableShouldNotHaveItemsWithDeleteNull() {
+    $items = $this->query('select * from exemplaires where to_delete is null')->fetch();
+    $this->assertEmpty($items);
+  }
 }
\ No newline at end of file
-- 
GitLab