[Console] Added server parameter to test:prepare

SCIF · Nov 29, 2011 · 5de7929 · 5de7929
1 parent 2a27158
commit 5de7929
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 20 deletions.
diff --git a/src/Propel/Generator/Command/PrepareTests.php b/src/Propel/Generator/Command/PrepareTests.php
@@ -13,6 +13,26 @@
  */
 class PrepareTests extends Command
 {
+    /**
+     * @var string
+     */
+    const DEFAULT_VENDOR    = 'mysql';
+
+    /**
+     * @var string
+     */
+    const DEFAULT_DB_SERVER = '127.0.0.1';
+
+    /**
+     * @var string
+     */
+    const DEFAULT_DB_USER   = 'root';
+
+    /**
+     * @var string
+     */
+    const DEFAULT_DB_PASSWD = '';
+
     /**
      * @var array
      */
@@ -49,9 +69,10 @@ protected function configure()
     {
         $this
             ->setDefinition(array(
-                new InputOption('vendor', null, InputOption::VALUE_REQUIRED, 'The database vendor', 'mysql'),
-                new InputOption('user', 'u', InputOption::VALUE_REQUIRED, 'The database user', 'root'),
-                new InputOption('password', 'p', InputOption::VALUE_REQUIRED, 'The database password', ''),
+                new InputOption('vendor', null, InputOption::VALUE_REQUIRED, 'The database vendor', self::DEFAULT_VENDOR),
+                new InputOption('server', 's', InputOption::VALUE_REQUIRED, 'The database server', self::DEFAULT_DB_SERVER),
+                new InputOption('user', 'u', InputOption::VALUE_REQUIRED, 'The database user', self::DEFAULT_DB_USER),
+                new InputOption('password', 'p', InputOption::VALUE_REQUIRED, 'The database password', selft::DEFAULT_DB_PASSWD),
                 new InputOption('fixtures-dir', null, InputOption::VALUE_REQUIRED, 'A fixture directory to build', null),
             ))
             ->setName('test:prepare')
@@ -91,6 +112,7 @@ protected function buildFixtures($fixturesDir, InputInterface $input, OutputInte
             $content = file_get_contents('build.properties.dist');
 
             $content = str_replace('##DATABASE_VENDOR##', $input->getOption('vendor'), $content);
+            $content = str_replace('##DATABASE_SERVER##', $input->getOption('server'), $content);
             $content = str_replace('##DATABASE_USER##', $input->getOption('user'), $content);
             $content = str_replace('##DATABASE_PASSWORD##', $input->getOption('password'), $content);
 
@@ -104,6 +126,7 @@ protected function buildFixtures($fixturesDir, InputInterface $input, OutputInte
             $content = file_get_contents('runtime-conf.xml.dist');
 
             $content = str_replace('##DATABASE_VENDOR##', $input->getOption('vendor'), $content);
+            $content = str_replace('##DATABASE_SERVER##', $input->getOption('server'), $content);
             $content = str_replace('##DATABASE_USER##', $input->getOption('user'), $content);
             $content = str_replace('##DATABASE_PASSWORD##', $input->getOption('password'), $content);
 

diff --git a/tests/Fixtures/bookstore/build.properties.dist b/tests/Fixtures/bookstore/build.properties.dist
@@ -12,7 +12,7 @@
 
 propel.project                          = bookstore
 propel.database                         = ##DATABASE_VENDOR##
-propel.database.url                     = ##DATABASE_VENDOR##:dbname=test
+propel.database.url                     = ##DATABASE_VENDOR##:##DATABASE_SERVER##;dbname=test
 propel.mysql.tableType                  = InnoDB
 propel.disableIdentifierQuoting         = true
 propel.schema.autoPrefix                = false

diff --git a/tests/Fixtures/bookstore/runtime-conf.xml.dist b/tests/Fixtures/bookstore/runtime-conf.xml.dist
@@ -16,7 +16,7 @@
                 <!-- Connection parameters. See PDO documentation for DSN format and available option constants. -->
                 <connection>
                     <classname>\Propel\Runtime\Connection\DebugPDO</classname>
-                    <dsn>##DATABASE_VENDOR##:dbname=test</dsn>
+                    <dsn>##DATABASE_VENDOR##:##DATABASE_SERVER##;dbname=test</dsn>
                     <user>##DATABASE_USER##</user>
                     <password>##DATABASE_PASSWORD##</password>
                     <options>
@@ -48,7 +48,7 @@
                 <adapter>##DATABASE_VENDOR##</adapter>
                 <connection>
                     <classname>\Propel\Runtime\Connection\DebugPDO</classname>
-                    <dsn>##DATABASE_VENDOR##:dbname=test</dsn>
+                    <dsn>##DATABASE_VENDOR##:##DATABASE_SERVER##;dbname=test</dsn>
                     <user>##DATABASE_USER##</user>
                     <password>##DATABASE_PASSWORD##</password>
                     <options>
@@ -67,7 +67,7 @@
                 <adapter>##DATABASE_VENDOR##</adapter>
                 <connection>
                     <classname>\Propel\Runtime\Connection\DebugPDO</classname>
-                    <dsn>##DATABASE_VENDOR##:dbname=test</dsn>
+                    <dsn>##DATABASE_VENDOR##:##DATABASE_SERVER##;dbname=test</dsn>
                     <user>##DATABASE_USER##</user>
                     <password>##DATABASE_PASSWORD##</password>
                     <options>

diff --git a/tests/Fixtures/namespaced/build.properties.dist b/tests/Fixtures/namespaced/build.properties.dist
@@ -12,7 +12,7 @@
 
 propel.project                  = bookstore_namespaced
 propel.database                 = ##DATABASE_VENDOR##
-propel.database.url             = ##DATABASE_VENDOR##:dbname=test
+propel.database.url             = ##DATABASE_VENDOR##:##DATABASE_SERVER##;dbname=test
 propel.mysql.tableType          = InnoDB
 propel.disableIdentifierQuoting = true
 

diff --git a/tests/Fixtures/namespaced/runtime-conf.xml.dist b/tests/Fixtures/namespaced/runtime-conf.xml.dist
@@ -16,7 +16,7 @@
                 <!-- Connection parameters. See PDO documentation for DSN format and available option constants. -->
                 <connection>
                     <classname>\Propel\Runtime\Connection\DebugPDO</classname>
-                    <dsn>##DATABASE_VENDOR##:dbname=test</dsn>
+                    <dsn>##DATABASE_VENDOR##:##DATABASE_SERVER##;dbname=test</dsn>
                     <user>##DATABASE_USER##</user>
                     <password>##DATABASE_PASSWORD##</password>
                     <options>

diff --git a/tests/Fixtures/reverse/mysql/build.properties.dist b/tests/Fixtures/reverse/mysql/build.properties.dist
@@ -13,11 +13,11 @@
 propel.project = reverse_bookstore
 
 propel.database = mysql
-propel.database.url = mysql:dbname=reverse_bookstore
+propel.database.url = mysql:##DATABASE_SERVER##;dbname=reverse_bookstore
 
 # For MySQL or Oracle, you also need to specify username & password
-#propel.database.user = [db username]
-#propel.database.password = [db password]
+propel.database.user = ##DATABASE_USER##
+propel.database.password = ##DATABASE_PASSWORD##
 
 propel.mysql.tableType = InnoDB
 

diff --git a/tests/Fixtures/reverse/mysql/runtime-conf.xml.dist b/tests/Fixtures/reverse/mysql/runtime-conf.xml.dist
@@ -14,12 +14,9 @@
                 <adapter>mysql</adapter>
                 <connection>
                     <classname>\Propel\Runtime\Connection\DebugPDO</classname>
-                    <dsn>mysql:dbname=reverse_bookstore</dsn>
-                    <!--
-                    For MySQL and Oracle you must specify username + password separate from DSN:
-                    <user>bookstore</user>
-                    <password></password>
-                    -->
+                    <dsn>mysql:##DATABASE_SERVER##;dbname=reverse_bookstore</dsn>
+                    <user>##DATABASE_USER##</user>
+                    <password>##DATABASE_PASSWORD##</password>
                 <options>
                         <option id="ATTR_PERSISTENT">false</option>
                     </options>

diff --git a/tests/Fixtures/schemas/build.properties.dist b/tests/Fixtures/schemas/build.properties.dist
@@ -12,7 +12,7 @@
 
 propel.project                  = bookstore
 propel.database                 = ##DATABASE_VENDOR##
-propel.database.url             = ##DATABASE_VENDOR##:dbname=test
+propel.database.url             = ##DATABASE_VENDOR##:##DATABASE_SERVER##;dbname=test
 propel.database.user            = ##DATABASE_USER##
 propel.database.password        = ##DATABASE_PASSWORD##
 propel.mysql.tableType          = InnoDB

diff --git a/tests/Fixtures/schemas/runtime-conf.xml.dist b/tests/Fixtures/schemas/runtime-conf.xml.dist
@@ -14,7 +14,7 @@
                 <adapter>##DATABASE_VENDOR##</adapter>
                 <connection>
                     <classname>\Propel\Runtime\Connection\DebugPDO</classname>
-                    <dsn>##DATABASE_VENDOR##:dbname=test</dsn>
+                    <dsn>##DATABASE_VENDOR##:##DATABASE_SERVER##;dbname=test</dsn>
                     <user>##DATABASE_USER##</user>
                     <password>##DATABASE_PASSWORD##</password>
                     <options>