Ticket #293: patch-prefixed-sql-tables.patch

lib/jelix/db/jDbConnection.class.php

@@ -3 +3 @@
-* @package     jelix
-* @subpackage  db
-* @author      Laurent Jouanneau
-
+ Julien Issler
-* @copyright   2005-2006 Laurent Jouanneau
+* @copyright   2007 Julien Issler
-*
-* This class was get originally from the Copix project (CopixDbConnection, Copix 2.3dev20050901, http://www.copix.org)
-* However only few lines of code are still copyrighted 2001-2005 CopixTeam (LGPL licence).
@@ -119 +120 @@
-           return "'".$this->_quote ($text)."'";
-    }
-
+        /**
+         * Prefix the given table with the prefix specified in the connection's profile
+         * If there's no prefix for the connection's profile, return the table's name unchanged.
+         *
+         * @param string $table the table's name
+         * @return string the prefixed table's name
+         * @author Julien Issler
+         **/
+        public function prefixTable($table_name){
+                if(!isset($this->profil['table_prefix']))
+                        return $table_name;
+                return $this->profil['table_prefix'].$table_name;
+        }
+
-    /**
-    * sets the autocommit state
-    * @param boolean state the status of autocommit

lib/jelix/dao/jDaoParser.class.php

@@ -160 +160 @@
-        }
-
-        $infos['fields'] = array ();
+
+                $infos['realname'] = '\'.$this->_conn->profil[\'table_prefix\'].\''.$infos['realname'];
+
-        $this->_tables[$infos['name']] = $infos;
-
+
-        return $infos;
-    }
-

lib/jelix/dao/jDaoGenerator.class.php

@@ -3 +3 @@
-* @package    jelix
-* @subpackage dao
-* @author     Croes Gérald, Laurent Jouanneau
-
+, Julien Issler
-* @contributor Bastien Jaillot (bug fix)
-* @copyright  2001-2005 CopixTeam, 2005-2006 Laurent Jouanneau
+* @copyright 2007 Julien Issler
-* This class was get originally from the Copix project (CopixDAOGeneratorV1, Copix 2.3dev20050901, http://www.copix.org)
-* Few lines of code are still copyrighted 2001-2005 CopixTeam (LGPL licence).
-* Initial authors of this Copix class are Gerald Croes and Laurent Jouanneau,
@@ -101 +102 @@
-      $src[] = '   protected $_tables = '.var_export($tables, true).';';
-      $src[] = '   protected $_primaryTable = \''.$this->_datasParser->getPrimaryTable().'\';';
-      $src[] = '   protected $_selectClause=\''.$sqlSelectClause.'\';';
-=\''.$sqlFromClause.'\'
+
-      $src[] = '   protected $_whereClause=\''.$sqlWhereClause.'\';';
-      $src[] = '   protected $_DaoRecordClassName=\''.$this->_DaoRecordClassName.'\';';
-      $src[] = '   public static $_properties = '.var_export($properties, true).';';
-      $src[] = '   public static $_pkFields = array('.$this->_writeFieldNamesWith ($start = '\'', $end='\'', $beetween = ',', $pkFields).');';
-
+
+          $src[] = '   public function __construct($conn){';
+          $src[] = '       parent::__construct($conn);';
+          $src[] = '       if(!isset($this->_conn->profil[\'table_prefix\'])) $this->_conn->profil[\'table_prefix\']=\'\';';
+          $src[] = '       $this->_fromClause=\''.$sqlFromClause.'\';';
+          $src[] = '   }';
+
-      // cannot put this methods directly into jDaoBase because of a php bug on static methods/properties
-      $src[] = '   public function getProperties() { return self::$_properties; }';
-      $src[] = '   public function getPrimaryKeyNames() { return self::$_pkFields;}';