Commit 195c4bab authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

1.0.3 (29/11/2024) 

------------------

- [Fix] Problème de chargement de DDL avec Oracle : pas de schémas
- [Fix] Récupération plus propre & souple du printWorkingDirectory (PWD) en CLI
parent 4b071753

CHANGELOG.md

+7 −0
Original line number Diff line number Diff line 
1.0.3 (29/11/2024)

------------------



- [Fix] Problème de chargement de DDL avec Oracle : pas de schémas

- [Fix] Récupération plus propre & souple du printWorkingDirectory (PWD) en CLI





1.0.2 (21/11/2024)

------------------

src/Command/LoadCommand.php

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ use Symfony\Component\Console\Style\SymfonyStyle; 
use Unicaen\BddAdmin\BddAwareTrait;

use Unicaen\BddAdmin\Data\DataManager;

use Unicaen\BddAdmin\Ddl\Ddl;

use Unicaen\BddAdmin\Util;



/**

 * Description of LoadCommand
@@ -37,7 +38,7 @@ class LoadCommand extends Command 
        $filename = $input->getArgument('filename');



        if (!str_starts_with($filename, DIRECTORY_SEPARATOR)){

            $filename = $_SERVER['PWD'].DIRECTORY_SEPARATOR.$filename;

            $filename = Util::getPrintWorkingDirectory().DIRECTORY_SEPARATOR.$filename;

        }



        if (!file_exists($filename)){

src/Command/SaveCommand.php

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ use Symfony\Component\Console\Style\SymfonyStyle; 
use Unicaen\BddAdmin\BddAwareTrait;

use Unicaen\BddAdmin\Data\DataManager;

use Unicaen\BddAdmin\Ddl\Ddl;

use Unicaen\BddAdmin\Util;



/**

 * Description of SaveCommand
@@ -37,7 +38,7 @@ class SaveCommand extends Command 
        $filename = $input->getArgument('filename');



        if (!str_starts_with($filename, DIRECTORY_SEPARATOR)){

            $filename = $_SERVER['PWD'].DIRECTORY_SEPARATOR.$filename;

            $filename = Util::getPrintWorkingDirectory().DIRECTORY_SEPARATOR.$filename;

        }



        if (file_exists($filename)){

src/Ddl/Ddl.php

+5 −3
Original line number Diff line number Diff line
@@ -208,12 +208,14 @@ class Ddl implements Iterator, ArrayAccess 
        $filters = DdlFilters::normalize($filters);



        foreach ($this->data as $ddlType => $ddlConf) {

            if (is_array($ddlConf)) {

                foreach ($ddlConf as $name => $null) {

                    if (!$filters[$ddlType]->match($name)) {

                        unset($this->data[$ddlType][$name]);

                    }

                }

            }

        }



        return $this;

    }

src/Util.php

+16 −0
Original line number Diff line number Diff line
@@ -66,4 +66,20 @@ class Util 
                return var_export($var, true);

        }

    }







    static public function getPrintWorkingDirectory(): string

    {

        // Au besoin, la variable SCRIPT_LAUNCH_DIR pourra être initialisée en BASH : export SCRIPT_LAUNCH_DIR="$PWD"

        $dir = getenv('SCRIPT_LAUNCH_DIR');

        if (!$dir){

            $dir = getenv('PWD');

        }

        if (!$dir){

            $dir = getcwd();

        }



        return $dir;

    }

}
 
 No newline at end of file