Changeset 7502

Timestamp:

02/16/08 07:54:21 (8 months ago)

Author:

fabien

Message:

fixed propel:build-schema task --xml option

Files:

• branches/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildSchemaTask.class.php (modified) (1 diff)

branches/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildSchemaTask.class.php

@@ -55 +55 @@
-    $this->callPhing('creole', self::DO_NOT_CHECK_SCHEMA);
-
+    $xmlSchemaPath = sfConfig::get('sf_config_dir').'/schema.xml';
+    $ymlSchemaPath = sfConfig::get('sf_config_dir').'/schema.yml';
+
-    // Fix database name
-sfConfig::get('sf_config_dir').'/schema.xml'
+$xmlSchemaPath
-    {
-sfConfig::get('sf_config_dir').'/schema.xml'
+$xmlSchemaPath
-      $schema = preg_replace('/<database\s+name="[^"]+"/s', '<database name="propel"', $schema);
-sfConfig::get('sf_config_dir').'/schema.xml'
+$xmlSchemaPath
-    }
-
-isset($options['xml'])
+$options['xml']
-    {
-      $this->schemaToYML(self::DO_NOT_CHECK_SCHEMA, '');
-      $this->cleanup();
+
+      if (file_exists($xmlSchemaPath))
+      {
+        unlink($xmlSchemaPath);
+      }
+    }
+    else
+    {
+      if (file_exists($ymlSchemaPath))
+      {
+        unlink($ymlSchemaPath);
+      }
-    }
-  }