Added query language validation

Author: dantleech

src/PHPCR/Util/Console/Command/NodesUpdateCommand.php

@@ -42,7 +42,7 @@ protected function configure()
     {
         parent::configure();
 
-        $this->configureNodeManipulationInput($this);
+        $this->configureNodeManipulationInput();
 
         $this->setName('phpcr:nodes:update')
             ->addOption(
@@ -54,20 +54,24 @@ protected function configure()
                 'query-language', 'l', 
                 InputOption::VALUE_OPTIONAL, 
                 'The query language (e.g. sql, jcr_sql2)',
-                'jcr_sql2'
+                'jcr-sql2'
             )
             ->setDescription('Command to manipulate the nodes in the workspace.')
             ->setHelp(<<<HERE
-The <info>nodes:update</info> command updates properties of nodes of type x matching
-the given select criteria.
+The <info>phpcr:nodes:update</info> can manipulate the properties of nodes 
+found using the given query.
 
-    php bin/phpcr nodes:update --type="nt:unstructured" --where="foo='bar'" --set-prop=foo=bar
+For example, to set the property "foo" to "bar" on all unstructured nodes:
+
+    php bin/phpcr phpcr:nodes:update --query="SELECT * FROM [nt:unstructured]" --set-prop=foo=bar
+
+Or to update only nodes matching a certain criteria:
+
+    php bin/phpcr nodes:update --query="SELECT * FROM [nt:unstructured] WHERE [phpcr:class]=\"Some\\Class\\Here\" --add-mixin=mix:mimetype
 
 The options for manipulating nodes are the same as with the 
 <info>node:touch</info> command and
 can be repeated to update multiple properties.
-
-The <info>--where</info> option corresponds to the "where" part of a standard query.
 HERE
 );
     }
@@ -77,6 +81,8 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $this->dialog = new DialogHelper();
+
         $query = $input->getOption('query');
         $queryLanguage = strtoupper($input->getOption('query-language'));
         $setProp = $input->getOption('set-prop');
@@ -87,8 +93,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $helper = $this->getPhpcrCliHelper();
         $session = $this->getPhpcrSession();
 
-        $this->dialog = new DialogHelper();
-
         if (!$query) {
             throw new \InvalidArgumentException(
                 'You must provide a SELECT query, e.g. --select="SELECT * FROM [nt:unstructured]"'

src/PHPCR/Util/Console/Command/WorkspaceQueryCommand.php

@@ -45,7 +45,7 @@ protected function configure()
 
         $this->setName('phpcr:workspace:query')
             ->addArgument('query', InputArgument::REQUIRED, 'A query statement to execute')
-            ->addOption('language', 'l', InputOption::VALUE_OPTIONAL, 'The query language (sql, jcr_sql2', 'jcr_sql2')
+            ->addOption('language', 'l', InputOption::VALUE_OPTIONAL, 'The query language (e.g. jcr-sql2', 'jcr-sql2')
             ->addOption('limit', null, InputOption::VALUE_OPTIONAL, 'The query limit', 0)
             ->addOption('offset', null, InputOption::VALUE_OPTIONAL, 'The query offset', 0)
             ->setDescription('Execute a JCR SQL2 statement')

src/PHPCR/Util/Console/Helper/PhpcrCliHelper.php

@@ -142,20 +142,32 @@ public function processNode(OutputInterface $output, $node, $options)
      */
     public function createQuery($language, $sql)
     {
+        $this->validateQueryLanguage($language);
+
         $session = $this->getSession();
         $qm = $session->getWorkspace()->getQueryManager();
         $language = strtoupper($language);
+        $query = $qm->createQuery($sql, $language);
+
+        return $query;
+    }
 
-        $constantName = '\PHPCR\Query\QueryInterface::'.$language;
-        if (!defined($constantName)) {
-            throw new \RuntimeException(sprintf(
-                "Query language '\\PHPCR\\Query\\QueryInterface::%s' not defined.",
-                $language
+    /**
+     * Validate the given query language.
+     *
+     * @param string Language type
+     *
+     * @return null
+     */
+    protected function validateQueryLanguage($language)
+    {
+        $qm = $this->getSession()->getWorkspace()->getQueryManager();
+        $langs = $qm->getSupportedQueryLanguages();
+        if (!in_array($language, $langs)) {
+            throw new \Exception(sprintf(
+                'Query language "%s" not supported, available query languages: %s',
+                $language, implode(',', $langs)
             ));
         }
-
-        $query = $qm->createQuery($sql, constant($constantName));
-
-        return $query;
     }
 }

tests/PHPCR/Tests/Util/Console/Command/BaseCommandTest.php

@@ -36,6 +36,7 @@ public function setUp()
         $this->session = $this->getMock('PHPCR\SessionInterface');
         $this->workspace = $this->getMock('PHPCR\WorkspaceInterface');
         $this->repository = $this->getMock('PHPCR\RepositoryInterface');
+        $this->queryManager = $this->getMock('PHPCR\Query\QueryManagerInterface');
 
         $this->row1 = $this->getMock('PHPCR\Tests\Stubs\MockRow');
         $this->node1 = $this->getMock('PHPCR\Tests\Stubs\MockNode');
@@ -57,6 +58,14 @@ public function setUp()
             ->method('getName')
             ->will($this->returnValue('test'));
 
+        $this->workspace->expects($this->any())
+            ->method('getQueryManager')
+            ->will($this->returnValue($this->queryManager));
+
+        $this->queryManager->expects($this->any())
+            ->method('getSupportedQueryLanguages')
+            ->will($this->returnValue(array('JCR-SQL2')));
+
         $this->application = new Application();
         $this->application->setHelperSet($this->helperSet);
     }

tests/PHPCR/Tests/Util/Console/Command/NodesUpdateCommandTest.php

@@ -12,9 +12,6 @@ public function setUp()
     {
         parent::setUp();
         $this->application->add(new NodesUpdateCommand());
-        $this->queryManager = $this->getMock(
-            'PHPCR\Query\QueryManagerInterface'
-        );
         $this->query = $this->getMock('PHPCR\Query\QueryInterface');
     }
 

tests/PHPCR/Tests/Util/Console/Command/WorkspaceQueryCommandTest.php

@@ -12,18 +12,18 @@ public function setUp()
     {
         parent::setUp();
         $this->application->add(new WorkspaceQueryCommand());
-        $this->queryManager = $this->getMock(
-            'PHPCR\Query\QueryManagerInterface'
-        );
         $this->query = $this->getMock('PHPCR\Query\QueryInterface');
     }
 
-    public function testNodeTypeQuery()
+    public function testQuery()
     {
-        $this->session->expects($this->once())
+        $this->queryManager->expects($this->any())
+            ->method('getSupportedQueryLanguages')
+            ->will($this->returnValue(array('JCR-SQL2')));
+        $this->session->expects($this->any())
             ->method('getWorkspace')
             ->will($this->returnValue($this->workspace));
-        $this->workspace->expects($this->once())
+        $this->workspace->expects($this->any())
             ->method('getQueryManager')
             ->will($this->returnValue($this->queryManager));
         $this->queryManager->expects($this->once())