Escape schema and table names

chanmix51 · Apr 22, 2014 · 30e121a · 30e121a
1 parent 1f90c45
commit 30e121a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Pomm/Tools/CreateBaseMapTool.php b/Pomm/Tools/CreateBaseMapTool.php
@@ -91,7 +91,7 @@ protected function generateMapFile()
         $std_namespace = $this->getNamespace();
         $namespace       = $std_namespace.'\\Base';
         $class_name  = $this->options['class_name'];
-        $table_name  = sprintf("%s.%s", $this->options['schema'], $this->options['table']);
+        $table_name  = sprintf('%s.%s', $this->options['database']->getConnection()->escapeIdentifier($this->options['schema']), $this->options['database']->getConnection()->escapeIdentifier($this->options['table']));
         $extends     = $this->options['extends'];
         $primary_key = join(', ', $this->inspector->getTablePrimaryKey($this->options['oid']));
         $map_name   =  sprintf("%sMap", $class_name);

diff --git a/tests/Pomm/Fixture/TestDb/PommTest/Base/PikaMap.php b/tests/Pomm/Fixture/TestDb/PommTest/Base/PikaMap.php
@@ -11,7 +11,7 @@ public function initialize()
     {
 
         $this->object_class =  'TestDb\PommTest\Pika';
-        $this->object_name  =  'pomm_test.pika';
+        $this->object_name  =  '"pomm_test"."pika"';
 
         $this->addField('id', 'int4');
         $this->addField('some_char', 'bpchar');

diff --git a/tests/Pomm/Fixture/TestDb/PommTestProd/Base/ChuMap.php b/tests/Pomm/Fixture/TestDb/PommTestProd/Base/ChuMap.php
@@ -5,14 +5,14 @@
 use \Pomm\Object\BaseObjectMap;
 use \Pomm\Exception\Exception;
 
-abstract class ChuMap extends \\TestDb\PommTest\PikaMap
+abstract class ChuMap extends \TestDb\PommTest\PikaMap
 {
     public function initialize()
     {
         parent::initialize();
 
         $this->object_class =  'TestDb\PommTestProd\Chu';
-        $this->object_name  =  'pomm_test.chu';
+        $this->object_name  =  '"pomm_test"."chu"';
 
         $this->addField('some_some_type', 'pomm_test.some_type');
 

diff --git a/tests/Pomm/Test/Tools/CreateBaseMapToolTest.php b/tests/Pomm/Test/Tools/CreateBaseMapToolTest.php
@@ -109,7 +109,7 @@ public function testGenerateBaseMapInherits()
             $root_dir.'/ChuMap.php',
         ), array(
             'namespace' => '%dbname%\%schema%Prod',
-            'parent_namespace' => '\%dbname%\%schema%',
+            'parent_namespace' => '%dbname%\%schema%',
         ));
     }
 }