Author: mstrzele
Date: 2010-09-01 08:30:41 +0200 (Wed, 01 Sep 2010)
New Revision: 30794

Modified:
   plugins/sfPostgresDoctrinePlugin/VERSION
   
plugins/sfPostgresDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict/Pgsql.php
   plugins/sfPostgresDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export.php
   
plugins/sfPostgresDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Schema.php
   plugins/sfPostgresDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import.php
   plugins/sfPostgresDoctrinePlugin/package.xml
Log:


Modified: plugins/sfPostgresDoctrinePlugin/VERSION
===================================================================
--- plugins/sfPostgresDoctrinePlugin/VERSION    2010-08-31 17:33:26 UTC (rev 
30793)
+++ plugins/sfPostgresDoctrinePlugin/VERSION    2010-09-01 06:30:41 UTC (rev 
30794)
@@ -1 +1 @@
-1.1.21
+1.1.22

Modified: 
plugins/sfPostgresDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict/Pgsql.php
===================================================================
--- 
plugins/sfPostgresDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict/Pgsql.php
    2010-08-31 17:33:26 UTC (rev 30793)
+++ 
plugins/sfPostgresDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict/Pgsql.php
    2010-09-01 06:30:41 UTC (rev 30794)
@@ -368,8 +368,11 @@
 
                foreach (sfProjectConfiguration::getActive()->getPluginPaths() 
as $path) {
                        if (strpos($path, 'sfPostgresDoctrinePlugin') !== 
false) {
-                               $types = 
sfYaml::load(sfConfig::get('sf_config_dir') . DIRECTORY_SEPARATOR . 
'plugins/sfPostgresDoctrinePlugin' . DIRECTORY_SEPARATOR . 'types.yml');
-                               break;
+                               $ymlFile = sfConfig::get('sf_config_dir') . 
DIRECTORY_SEPARATOR . 'plugins/sfPostgresDoctrinePlugin' . DIRECTORY_SEPARATOR 
. 'types.yml';
+                               if (file_exists($ymlFile)) {
+                                       $types = sfYaml::load($ymlFile);
+                                       break;
+                               }
                        }
                }
 

Modified: 
plugins/sfPostgresDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Schema.php
===================================================================
--- 
plugins/sfPostgresDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Schema.php 
    2010-08-31 17:33:26 UTC (rev 30793)
+++ 
plugins/sfPostgresDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Schema.php 
    2010-09-01 06:30:41 UTC (rev 30794)
@@ -61,8 +61,11 @@
 
         foreach (sfProjectConfiguration::getActive()->getPluginPaths() as 
$path) {
             if (strpos($path, 'sfPostgresDoctrinePlugin') !== false) {
-                $behaviors = 
sfYaml::load(sfConfig::get('sf_config_dir').DIRECTORY_SEPARATOR.'plugins/sfPostgresDoctrinePlugin'.DIRECTORY_SEPARATOR.'behaviors.yml');
-                break;
+               $ymlFile = 
sfYaml::load(sfConfig::get('sf_config_dir').DIRECTORY_SEPARATOR.'plugins/sfPostgresDoctrinePlugin'.DIRECTORY_SEPARATOR.'behaviors.yml');
+                       if (file_exists($ymlFile)) {
+                               $behaviors = sfYaml::load($ymlFile);
+                               break;
+                       }
             }
         }
 

Modified: 
plugins/sfPostgresDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export.php
===================================================================
--- plugins/sfPostgresDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export.php    
2010-08-31 17:33:26 UTC (rev 30793)
+++ plugins/sfPostgresDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export.php    
2010-09-01 06:30:41 UTC (rev 30794)
@@ -1158,9 +1158,11 @@
 
                foreach (sfProjectConfiguration::getActive()->getPluginPaths() 
as $path) {
                        if (strpos($path, 'sfPostgresDoctrinePlugin') !== 
false) {
-                               $types = 
sfYaml::load(sfConfig::get('sf_config_dir') . DIRECTORY_SEPARATOR . 
'plugins/sfPostgresDoctrinePlugin' . DIRECTORY_SEPARATOR . 'types.yml');
-
-                               break;
+                               $ymlFile = sfConfig::get('sf_config_dir') . 
DIRECTORY_SEPARATOR . 'plugins/sfPostgresDoctrinePlugin' . DIRECTORY_SEPARATOR 
. 'types.yml';
+                               if (file_exists($ymlFile)) {
+                                       $types = sfYaml::load($ymlFile);
+                                       break;
+                               }
                        }
                }
 

Modified: 
plugins/sfPostgresDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import.php
===================================================================
--- plugins/sfPostgresDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import.php    
2010-08-31 17:33:26 UTC (rev 30793)
+++ plugins/sfPostgresDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import.php    
2010-09-01 06:30:41 UTC (rev 30794)
@@ -396,8 +396,11 @@
 
           foreach (sfProjectConfiguration::getActive()->getPluginPaths() as 
$path) {
                if (strpos($path, 'sfPostgresDoctrinePlugin') !== false) {
-                       $omit = sfYaml::load(sfConfig::get('sf_config_dir') . 
DIRECTORY_SEPARATOR . 'plugins/sfPostgresDoctrinePlugin' . DIRECTORY_SEPARATOR 
. 'omit.yml');
-                       break;
+                       $ymlFile = sfConfig::get('sf_config_dir') . 
DIRECTORY_SEPARATOR . 'plugins/sfPostgresDoctrinePlugin' . DIRECTORY_SEPARATOR 
. 'omit.yml';
+                       if (file_exists($ymlFile)) {
+                               $omit = sfYaml::load($ymlFile);
+                               break;
+                       }
                }
              }
 

Modified: plugins/sfPostgresDoctrinePlugin/package.xml
===================================================================
--- plugins/sfPostgresDoctrinePlugin/package.xml        2010-08-31 17:33:26 UTC 
(rev 30793)
+++ plugins/sfPostgresDoctrinePlugin/package.xml        2010-09-01 06:30:41 UTC 
(rev 30794)
@@ -17,7 +17,7 @@
                <email>[email protected]</email>
                <active>yes</active>
        </lead>
-       <date>2010-08-30</date>
+       <date>2010-09-01</date>
        <version>
                <release>1.1.21</release>
                <api>1.1.21</api>
@@ -46,6 +46,7 @@
                        <file role="data" name="behaviors.yml" />
                                <file role="data" name="types.yml" />
                                <file role="data" name="views.yml" />
+                               <file role="data" name="omit.yml" />
                    </dir>                                                      
        
                </dir>  
                
@@ -589,5 +590,24 @@
                       * mstrzele: fixed bug with tables patterns               
              
                    </notes>
                </release>
+                                                                               
<release>
+                   <version>
+                         <release>1.1.22</release>
+                     <api>1.1.22</api>
+                   </version>
+                   <stability>
+                     <release>stable</release>
+                     <api>stable</api>
+                   </stability>
+                   <license uri="http://www.symfony-project.com/license";>
+                     MIT license
+                   </license>
+                   <date>2010-09-01</date>
+                   <license>MIT</license>
+                   <notes>                    
+                      * mstrzele: add missing omit.yml file
+                      * mstrzele: add checking of existens for yaml config 
files                             
+                   </notes>
+               </release>
        </changelog>
 </package>

-- 
You received this message because you are subscribed to the Google Groups 
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/symfony-svn?hl=en.

Reply via email to