diff --git a/VERSIONS_HOTLINE/49000 b/VERSIONS_HOTLINE/49000 new file mode 100644 index 0000000000000000000000000000000000000000..431bf34d0d0d0ccf1c4944418967bf30c5625637 --- /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 11295e409f1f58817c6e8eb450f3770567678c8c..75ebe7bdbe94f7e86d2ec9e968c7ea61cd1c742a 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 0000000000000000000000000000000000000000..7e024cc0bfb35d6fd11590ac4c2b6e3c6b7b288e --- /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 077d568f22a5075bfd2a0914ddbdc0bc7ca29a58..b11259bfcb4b0de1a0a010772513f5f132d21fd4 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