Merge pull request #3 from pedro151/v1.3.x

V1.3.x
pedro151 · Jun 11, 2016 · eff0673 · eff0673
2 parents 0dddb16 + 97fe9ae
commit eff0673
Show file tree

Hide file tree

Showing 21 changed files with 485 additions and 104 deletions.
diff --git a/bin/orm-generator.phar b/bin/orm-generator.phar
diff --git a/build/Classes/AdapterConfig/AbstractAdapter.php b/build/Classes/AdapterConfig/AbstractAdapter.php
@@ -147,6 +147,13 @@ public function createClassNamespace ( $table )
             $arrNames[] = AbstractMaker::getClassName ( $this->arrConfig[ 'driver' ] );
         }
 
+        if ( isset( $this->arrConfig[ 'folder-name' ] )
+             && $this->arrConfig[ 'folder-name' ]
+        )
+        {
+            $arrNames[] = AbstractMaker::getClassName ( $this->arrConfig[ 'folder-name' ] );
+        }
+
         if ( $table->hasSchema () )
         {
             $arrNames[] = AbstractMaker::getClassName ( $table->getSchema () );
@@ -362,7 +369,8 @@ public function __get ( $str )
             'link' ,
             'last_modify' ,
             'path' ,
-            'folder-database'
+            'folder-database',
+            'folder-name'
         );
 
         if ( in_array ( $str , $arr ) )

diff --git a/build/Classes/AdapterMakerFile/ZendFrameworkOne/DbTable.php b/build/Classes/AdapterMakerFile/ZendFrameworkOne/DbTable.php
@@ -37,6 +37,14 @@ public function parseRelation ( \Classes\MakerFile $makerFile, \Classes\Db\DbTab
         foreach ( $dbTable->getForeingkeys () as $objColumn )
         {
             $constrant = $objColumn->getFks ();
+
+            $arrClass = array (
+                $makerFile->getConfig ()->createClassNamespace ( $constrant ),
+                'DbTable',
+                AbstractMaker::getClassName ( $constrant->getTable () )
+            );
+            $class = implode ( ZendFrameworkOne::SEPARETOR , array_filter ( $arrClass ) );
+
             $references[] = sprintf (
                 "
        '%s' => array (
@@ -46,11 +54,7 @@ public function parseRelation ( \Classes\MakerFile $makerFile, \Classes\Db\DbTab
        )",
                 AbstractMaker::getClassName ( $constrant->getNameConstrant () ),
                 $objColumn->getName (),
-                $makerFile->getConfig ()->createClassNamespace ( $constrant )
-                . ZendFrameworkOne::SEPARETOR
-                . 'DbTable'
-                . ZendFrameworkOne::SEPARETOR
-                . AbstractMaker::getClassName ( $constrant->getTable () ),
+                $class,
                 $constrant->getColumn ()
 
             );
@@ -66,11 +70,14 @@ public function parseRelation ( \Classes\MakerFile $makerFile, \Classes\Db\DbTab
         {
             foreach ( $objColumn->getDependences () as $dependence )
             {
-                $dependents[] = $makerFile->getConfig ()->createClassNamespace ( $dependence )
-                    . ZendFrameworkOne::SEPARETOR
-                    . 'DbTable'
-                    . ZendFrameworkOne::SEPARETOR
-                    . AbstractMaker::getClassName ( $dependence->getTable () );
+                $arrClass = array (
+                    $makerFile->getConfig ()->createClassNamespace ( $dependence ),
+                    'DbTable',
+                    AbstractMaker::getClassName ( $dependence->getTable () )
+                );
+                $class = implode ( ZendFrameworkOne::SEPARETOR , array_filter ( $arrClass ) );
+
+                $dependents[] = $class;
             }
         }
 

diff --git a/build/Classes/AdapterMakerFile/ZendFrameworkOne/Entity.php b/build/Classes/AdapterMakerFile/ZendFrameworkOne/Entity.php
@@ -59,11 +59,14 @@ private function listParents ( \Classes\MakerFile $makerFile , \Classes\Db\DbTab
                 . ZendFrameworkOne::SEPARETOR
                 . $objColumn->getName ();
 
+            $arrClass = array (
+                $makerFile->getConfig ()->createClassNamespace ( $constrant ),
+                AbstractMaker::getClassName ( $constrant->getTable () )
+            );
+            $class = implode ( ZendFrameworkOne::SEPARETOR , array_filter ( $arrClass ) );
+
             $parents[] = array (
-                'class'    => $makerFile->getConfig ()
-                                        ->createClassNamespace ( $constrant )
-                              . ZendFrameworkOne::SEPARETOR
-                              . AbstractMaker::getClassName ( $constrant->getTable () ) ,
+                'class'    => $class ,
                 'function' => AbstractMaker::getClassName ( $name ) ,
                 'table'    => $constrant->getTable () ,
                 'column'   => $objColumn->getName () ,
@@ -99,12 +102,15 @@ private function listDependence ( \Classes\MakerFile $makerFile , \Classes\Db\Db
 
                 if ( ! key_exists ( $name , $this->validFunc ) )
                 {
+                    $arrClass = array (
+                        $makerFile->getConfig ()->createClassNamespace ( $dependence ),
+                        AbstractMaker::getClassName ( $dependence->getTable () )
+                    );
+                    $class = implode ( ZendFrameworkOne::SEPARETOR , array_filter ( $arrClass ) );
+
                     $this->validFunc[ $name ] = true;
                     $depends[] = array (
-                        'class'    => $makerFile->getConfig ()
-                                                ->createClassNamespace ( $dependence )
-                                      . ZendFrameworkOne::SEPARETOR
-                                      . AbstractMaker::getClassName ( $dependence->getTable () ) ,
+                        'class'    =>  $class,
                         'function' => AbstractMaker::getClassName ( $name ) ,
                         'table'    => $dependence->getTable () ,
                         'column'   => $dependence->getColumn () ,

diff --git a/build/Classes/AdaptersDriver/AbsractAdapter.php b/build/Classes/AdaptersDriver/AbsractAdapter.php
@@ -112,7 +112,8 @@ private function populateForeignAndPrimaryKeys ( $constrant , $table_name , $sch
                                                  'constrant' => $constrant[ 'constraint_name' ] ,
                                                  'schema'    => $constrant[ 'foreign_schema' ] ,
                                                  'table'     => $constrant[ 'foreign_table' ] ,
-                                                 'column'    => $constrant[ 'foreign_column' ]
+                                                 'column'    => $constrant[ 'foreign_column' ],
+                                                 'database'  => $this->database
                                              )
                                          );
 
@@ -155,6 +156,7 @@ private function populateDependece ( $constrant , $table_name , $schema = 0 )
                           $constrant[ 'constraint_name' ] ,
                           $constrant[ 'table_name' ] ,
                           $constrant[ 'column_name' ] ,
+                          $this->database,
                           $constrant[ 'table_schema' ]
                       );
             }

diff --git a/build/Classes/AdaptersDriver/Mysql.php b/build/Classes/AdaptersDriver/Mysql.php
@@ -133,7 +133,8 @@ public function getListConstrant ()
      0 AS table_schema,
      k.table_name,
 	 k.column_name,
-     k.REFERENCED_TABLE_SCHEMA AS foreign_schema,
+     -- k.REFERENCED_TABLE_SCHEMA AS foreign_schema,
+     0 AS foreign_schema,
 	 k.REFERENCED_TABLE_NAME AS foreign_table,
 	 k.REFERENCED_COLUMN_NAME AS foreign_column
 FROM information_schema.TABLE_CONSTRAINTS as i

diff --git a/build/Classes/Config.php b/build/Classes/Config.php
@@ -64,18 +64,20 @@ class Config
      */
     private $adapterDriver;
 
-    public function __construct ( $argv , $basePath )
+    private $frameworkList  = array (
+            'zf1', 'phalcon'
+        );
+
+    public function __construct ( $argv, $basePath )
     {
-        if ( array_key_exists ( 'help' , $argv ) )
-        {
+        if ( array_key_exists ( 'help', $argv ) ) {
             die ( $this->getUsage () );
         }
-        if ( array_key_exists ( 'status' , $argv ) )
-        {
+        if ( array_key_exists ( 'status', $argv ) ) {
             $argv[ 'status' ] = true;
         }
 
-        $this->argv = $this->parseConfig ( $basePath , $argv );
+        $this->argv = $this->parseConfig ( $basePath, $argv );
     }
 
     /**
@@ -85,7 +87,7 @@ public function __construct ( $argv , $basePath )
      */
     public function getUsage ()
     {
-        $version = $this->getVersion();
+        $version = $this->getVersion ();
 
         return <<<EOF
 parameters:
@@ -119,26 +121,30 @@ public function getVersion ()
      * Analisa e estrutura a Configuracao do generate
      *
      * @param  string $basePath
-     * @param array   $argv
+     * @param array $argv
      *
      * @return array
      * @throws \Exception
      */
-    private function parseConfig ( $basePath , $argv )
+    private function parseConfig ( $basePath, $argv )
     {
         $this->_basePath = dirname ( $basePath );
 
         $configIni = isset( $argv[ 'config-ini' ] ) ? $argv[ 'config-ini' ]
             : $this->_basePath . $this->configIniDefault;
 
-        $configTemp = $this->loadIniFile ( realpath ( $configIni ) );
-        $configCurrent = self::parseConfigEnv ( $configTemp , $argv );
+        $configTemp    = $this->loadIniFile ( realpath ( $configIni ) );
+        $configCurrent = self::parseConfigEnv ( $configTemp, $argv );
 
-        if ( ! isset( $configCurrent[ 'framework' ] ) )
-        {
+        if ( !isset( $configCurrent[ 'framework' ] ) ) {
             throw new \Exception( "configure which framework you want to use! \n" );
         }
 
+        if ( !in_array ( $configCurrent[ 'framework' ], $this->frameworkList ) ) {
+            $frameworks = implode("\n\t", $this->frameworkList);
+            throw new \Exception( "list of frameworks: \n".$frameworks."\n" );
+        }
+
         return $argv + array_filter ( $configCurrent );
     }
 
@@ -149,16 +155,15 @@ private function parseConfig ( $basePath , $argv )
      *
      * @return string
      */
-    private static function parseConfigEnv ( $configTemp , $argv )
+    private static function parseConfigEnv ( $configTemp, $argv )
     {
         $thisSection = isset( $configTemp[ key ( $configTemp ) ][ 'config-env' ] ) ?
             $configTemp[ key ( $configTemp ) ][ 'config-env' ] : null;
 
         $thisSection = isset( $argv[ 'config-env' ] ) ? $argv[ 'config-env' ]
             : $thisSection;
 
-        if ( isset( $configTemp[ $thisSection ][ 'extends' ] ) )
-        {
+        if ( isset( $configTemp[ $thisSection ][ 'extends' ] ) ) {
             #faz marge da config principal com a config extendida
             return $configTemp[ $thisSection ]
                    + $configTemp[ $configTemp[ $thisSection ][ 'extends' ] ];
@@ -180,26 +185,23 @@ private static function parseConfigEnv ( $configTemp , $argv )
      */
     protected function loadIniFile ( $filename )
     {
-        if ( ! is_file ( $filename ) )
-        {
+        if ( !is_file ( $filename ) ) {
             throw new \Exception( "configuration file does not exist! \n" );
         }
 
-        $loaded = parse_ini_file ( $filename , true );
+        $loaded   = parse_ini_file ( $filename, true );
         $iniArray = array ();
-        foreach ( $loaded as $key => $data )
-        {
-            $pieces = explode ( $this->sectionSeparator , $key );
+        foreach ( $loaded as $key => $data ) {
+            $pieces      = explode ( $this->sectionSeparator, $key );
             $thisSection = trim ( $pieces[ 0 ] );
-            switch ( count ( $pieces ) )
-            {
+            switch ( count ( $pieces ) ) {
                 case 1:
                     $iniArray[ $thisSection ] = $data;
                     break;
 
                 case 2:
-                    $extendedSection = trim ( $pieces[ 1 ] );
-                    $iniArray[ $thisSection ] = array_merge ( array ( 'extends' => $extendedSection ) , $data );
+                    $extendedSection          = trim ( $pieces[ 1 ] );
+                    $iniArray[ $thisSection ] = array_merge ( array ( 'extends' => $extendedSection ), $data );
                     break;
 
                 default:
@@ -218,8 +220,7 @@ protected function loadIniFile ( $filename )
      */
     private function factoryConfig ()
     {
-        switch ( strtolower ( $this->argv[ 'framework' ] ) )
-        {
+        switch ( strtolower ( $this->argv[ 'framework' ] ) ) {
             case 'zf1':
                 return new ZendFrameworkOne( $this->argv );
             case 'phalcon':
@@ -237,8 +238,7 @@ private function factoryConfig ()
      */
     private function factoryDriver ()
     {
-        switch ( $this->argv[ 'driver' ] )
-        {
+        switch ( $this->argv[ 'driver' ] ) {
             case 'pgsql':
             case 'pdo_pgsql':
                 return new Pgsql( $this->getAdapterConfig () );
@@ -259,8 +259,7 @@ private function factoryDriver ()
      */
     public function getAdapterConfig ()
     {
-        if ( ! $this->adapterConfig instanceof AbstractAdapter )
-        {
+        if ( !$this->adapterConfig instanceof AbstractAdapter ) {
             $this->adapterConfig = $this->factoryConfig ();
         }
 
@@ -272,8 +271,7 @@ public function getAdapterConfig ()
      */
     public function getAdapterDriver ()
     {
-        if ( ! $this->adapterDriver )
-        {
+        if ( !$this->adapterDriver ) {
             $this->adapterDriver = $this->factoryDriver ();
         }
 

diff --git a/build/Classes/Db/Column.php b/build/Classes/Db/Column.php
@@ -175,15 +175,16 @@ public function addDependece ( Constrant $dependece )
      *
      * @return $this
      */
-    public function createDependece ( $constraint_name , $table_name , $column_name , $schema = null )
+    public function createDependece ( $constraint_name , $table_name , $column_name ,$database, $schema = null )
     {
         $objConstrantDependence = Constrant::getInstance ()
                                            ->populate (
                                                array (
                                                    'constrant' => $constraint_name ,
                                                    'schema'    => $schema ,
                                                    'table'     => $table_name ,
-                                                   'column'    => $column_name
+                                                   'column'    => $column_name,
+                                                   'database'  => $database
                                                )
                                            );
 

diff --git a/build/Classes/Db/Constrant.php b/build/Classes/Db/Constrant.php
@@ -62,14 +62,17 @@ public function populate ( $array )
             $this->schema = $array[ 'schema' ];
         }
 
+        $this->database = $array[ 'database' ];
         $this->constrant = $array[ 'constrant' ];
         $this->table = $array[ 'table' ];
         $this->column = $array[ 'column' ];
 
         return $this;
     }
 
-    public function getDatabase (){ }
+    public function getDatabase (){
+        return $this->database;
+    }
 
     /**
      * @return string

diff --git a/build/Classes/MakerFile.php b/build/Classes/MakerFile.php
@@ -64,6 +64,11 @@ public function parseLocation ( $basePath )
             $classDriver = explode ( '\\' , get_class ( $this->driver ) );
             $driverBase = end ( $classDriver );
         }
+        $folderName = '';
+        if ( $this->config->{"folder-name"} )
+        {
+            $folderName = $this->getClassName ( trim ( $this->config->{"folder-name"} ) );
+        }
 
         if ( $this->config->hasSchemas () )
         {
@@ -72,8 +77,9 @@ public function parseLocation ( $basePath )
             foreach ( $schemas as $schema )
             {
                 $arrUrl = array (
-                    $this->baseLocation ,
-                    $driverBase ,
+                    $this->baseLocation,
+                    $driverBase,
+                    $folderName,
                     $this->getClassName ( $schema )
                 );
 
@@ -88,6 +94,7 @@ public function parseLocation ( $basePath )
                 DIRECTORY_SEPARATOR , array_filter ( array (
                         $this->baseLocation ,
                         $driverBase ,
+                        $folderName ,
                         $this->getClassName ( $this->getConfig ()->getDatabase () )
                     )
                 )

diff --git a/build/Classes/templates/file_configs/ini.php b/build/Classes/templates/file_configs/ini.php
@@ -33,6 +33,8 @@
 path = ""
 ;folder with the database driver name
 folder-database = 0
+;folder with the name
+folder-name=''
 ;.ini file the framework configuration
 framework-ini = ""
 ;the path to the directory of the framework library