Changeset 992

Timestamp:

06/15/08 16:02:11 (6 months ago)

Author:

bastnic

Message:

oracle support with PDO-OCI,p=Gwendal Jouannic

Files:

branches/1.0.x/build/manifests/jelix-lib.mn (modified) (1 diff)
branches/1.0.x/build/manifests/jelix-lib.mn (modified) (1 diff)
branches/1.0.x/build/manifests/jelix-lib.mn (modified) (1 diff)
branches/1.0.x/build/manifests/jelix-lib.mn (modified) (1 diff)
branches/1.0.x/lib/jelix-scripts/commands/createdao.cmd.php (modified) (5 diffs)
branches/1.0.x/lib/jelix-scripts/commands/createdao.cmd.php (modified) (5 diffs)
branches/1.0.x/lib/jelix-scripts/commands/createdao.cmd.php (modified) (5 diffs)
branches/1.0.x/lib/jelix-scripts/commands/createdao.cmd.php (modified) (5 diffs)
branches/1.0.x/lib/jelix/CREDITS (modified) (1 diff)
branches/1.0.x/lib/jelix/CREDITS (modified) (1 diff)
branches/1.0.x/lib/jelix/CREDITS (modified) (1 diff)
branches/1.0.x/lib/jelix/CREDITS (modified) (1 diff)
branches/1.0.x/lib/jelix/db/jDbPDOConnection.class.php (modified) (3 diffs)
branches/1.0.x/lib/jelix/db/jDbPDOConnection.class.php (modified) (3 diffs)
branches/1.0.x/lib/jelix/db/jDbPDOConnection.class.php (modified) (3 diffs)
branches/1.0.x/lib/jelix/db/jDbPDOConnection.class.php (modified) (3 diffs)
branches/1.0.x/lib/jelix/db/jDbTools.class.php (modified) (2 diffs)
branches/1.0.x/lib/jelix/db/jDbTools.class.php (modified) (2 diffs)
branches/1.0.x/lib/jelix/db/jDbTools.class.php (modified) (2 diffs)
branches/1.0.x/lib/jelix/db/jDbTools.class.php (modified) (2 diffs)
branches/1.0.x/lib/jelix/plugins/db/oci/oci.daobuilder.php (modified) (2 diffs)
branches/1.0.x/lib/jelix/plugins/db/oci/oci.daobuilder.php (modified) (2 diffs)
branches/1.0.x/lib/jelix/plugins/db/oci/oci.daobuilder.php (modified) (2 diffs)
branches/1.0.x/lib/jelix/plugins/db/oci/oci.daobuilder.php (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

branches/1.0.x/build/manifests/jelix-lib.mn

r829 r992

393 393 cd lib/jelix/plugins/db/oci
394 394 oci.daobuilder.php
395 oci.dbtools.php
395 396
396 397 cd lib/jelix/plugins/tpl/common
branches/1.0.x/build/manifests/jelix-lib.mn

r829 r992

393 393 cd lib/jelix/plugins/db/oci
394 394 oci.daobuilder.php
395 oci.dbtools.php
395 396
396 397 cd lib/jelix/plugins/tpl/common
branches/1.0.x/build/manifests/jelix-lib.mn

r829 r992

393 393 cd lib/jelix/plugins/db/oci
394 394 oci.daobuilder.php
395 oci.dbtools.php
395 396
396 397 cd lib/jelix/plugins/tpl/common
branches/1.0.x/build/manifests/jelix-lib.mn

r829 r992

393 393 cd lib/jelix/plugins/db/oci
394 394 oci.daobuilder.php
395 oci.dbtools.php
395 396
396 397 cd lib/jelix/plugins/tpl/common

branches/1.0.x/lib/jelix-scripts/commands/createdao.cmd.php

r923	r992
4	4	* @author Jouanneau Laurent
5	5	* @contributor Nicolas Jeudy (patch ticket #99)
	6	* @contributor Gwendal Jouannic (patch ticket #615)
6	7	* @copyright 2005-2007 Jouanneau laurent
	8	* @copyright 2007 Nicolas Jeudy, 2008 Gwendal Jouannic
7	9	* @link http://www.jelix.org
8	10	* @licence GNU General Public Licence see LICENCE file or http://www.gnu.org/licenses/gpl.html
…	…
74	76	switch($prop->type){
75	77
	78	case 'clob':
76	79	case 'text':
77	80	case 'mediumtext':
…	…
80	83	$type='text';
81	84	break;
	85	case 'varchar2':
82	86	case 'varchar':
83	87	case 'char':
…	…
87	91	$type='string';
88	92	break;
	93	case 'number':
89	94	case 'tinyint':
90	95	case 'int':
…	…
149	154	$properties.=' maxlength="'.$prop->length.'"';
150	155	}
	156	if ($prop->sequence) {
	157	$properties.=' sequence="'.$prop->sequence.'"';
	158	}
151	159	$properties.='/>';
152	160	}

branches/1.0.x/lib/jelix-scripts/commands/createdao.cmd.php

r923	r992
4	4	* @author Jouanneau Laurent
5	5	* @contributor Nicolas Jeudy (patch ticket #99)
	6	* @contributor Gwendal Jouannic (patch ticket #615)
6	7	* @copyright 2005-2007 Jouanneau laurent
	8	* @copyright 2007 Nicolas Jeudy, 2008 Gwendal Jouannic
7	9	* @link http://www.jelix.org
8	10	* @licence GNU General Public Licence see LICENCE file or http://www.gnu.org/licenses/gpl.html
…	…
74	76	switch($prop->type){
75	77
	78	case 'clob':
76	79	case 'text':
77	80	case 'mediumtext':
…	…
80	83	$type='text';
81	84	break;
	85	case 'varchar2':
82	86	case 'varchar':
83	87	case 'char':
…	…
87	91	$type='string';
88	92	break;
	93	case 'number':
89	94	case 'tinyint':
90	95	case 'int':
…	…
149	154	$properties.=' maxlength="'.$prop->length.'"';
150	155	}
	156	if ($prop->sequence) {
	157	$properties.=' sequence="'.$prop->sequence.'"';
	158	}
151	159	$properties.='/>';
152	160	}

branches/1.0.x/lib/jelix-scripts/commands/createdao.cmd.php

r923	r992
4	4	* @author Jouanneau Laurent
5	5	* @contributor Nicolas Jeudy (patch ticket #99)
	6	* @contributor Gwendal Jouannic (patch ticket #615)
6	7	* @copyright 2005-2007 Jouanneau laurent
	8	* @copyright 2007 Nicolas Jeudy, 2008 Gwendal Jouannic
7	9	* @link http://www.jelix.org
8	10	* @licence GNU General Public Licence see LICENCE file or http://www.gnu.org/licenses/gpl.html
…	…
74	76	switch($prop->type){
75	77
	78	case 'clob':
76	79	case 'text':
77	80	case 'mediumtext':
…	…
80	83	$type='text';
81	84	break;
	85	case 'varchar2':
82	86	case 'varchar':
83	87	case 'char':
…	…
87	91	$type='string';
88	92	break;
	93	case 'number':
89	94	case 'tinyint':
90	95	case 'int':
…	…
149	154	$properties.=' maxlength="'.$prop->length.'"';
150	155	}
	156	if ($prop->sequence) {
	157	$properties.=' sequence="'.$prop->sequence.'"';
	158	}
151	159	$properties.='/>';
152	160	}

branches/1.0.x/lib/jelix-scripts/commands/createdao.cmd.php

r923	r992
4	4	* @author Jouanneau Laurent
5	5	* @contributor Nicolas Jeudy (patch ticket #99)
	6	* @contributor Gwendal Jouannic (patch ticket #615)
6	7	* @copyright 2005-2007 Jouanneau laurent
	8	* @copyright 2007 Nicolas Jeudy, 2008 Gwendal Jouannic
7	9	* @link http://www.jelix.org
8	10	* @licence GNU General Public Licence see LICENCE file or http://www.gnu.org/licenses/gpl.html
…	…
74	76	switch($prop->type){
75	77
	78	case 'clob':
76	79	case 'text':
77	80	case 'mediumtext':
…	…
80	83	$type='text';
81	84	break;
	85	case 'varchar2':
82	86	case 'varchar':
83	87	case 'char':
…	…
87	91	$type='string';
88	92	break;
	93	case 'number':
89	94	case 'tinyint':
90	95	case 'int':
…	…
149	154	$properties.=' maxlength="'.$prop->length.'"';
150	155	}
	156	if ($prop->sequence) {
	157	$properties.=' sequence="'.$prop->sequence.'"';
	158	}
151	159	$properties.='/>';
152	160	}

branches/1.0.x/lib/jelix/CREDITS

r988	r992
88	88	- jResponseCss
89	89
	90	Gwendal Jouannic (aka obewan)
	91	- oracle support with PDO-OCI (#615)
	92
90	93	Nicolas Lassalle
91	94	- bug fix in jResponseBinary (#188)

branches/1.0.x/lib/jelix/CREDITS

r988	r992
88	88	- jResponseCss
89	89
	90	Gwendal Jouannic (aka obewan)
	91	- oracle support with PDO-OCI (#615)
	92
90	93	Nicolas Lassalle
91	94	- bug fix in jResponseBinary (#188)

branches/1.0.x/lib/jelix/CREDITS

r988	r992
88	88	- jResponseCss
89	89
	90	Gwendal Jouannic (aka obewan)
	91	- oracle support with PDO-OCI (#615)
	92
90	93	Nicolas Lassalle
91	94	- bug fix in jResponseBinary (#188)

branches/1.0.x/lib/jelix/CREDITS

r988	r992
88	88	- jResponseCss
89	89
	90	Gwendal Jouannic (aka obewan)
	91	- oracle support with PDO-OCI (#615)
	92
90	93	Nicolas Lassalle
91	94	- bug fix in jResponseBinary (#188)

branches/1.0.x/lib/jelix/db/jDbPDOConnection.class.php

r721	r992
4	4	* @subpackage db
5	5	* @author Laurent Jouanneau
6		* @contributor
	6	* @contributor Gwendal Jouannic
7	7	* @copyright 2005-2006 Laurent Jouanneau
	8	* @copyright 2008 Gwendal Jouannic
8	9	* @link http://www.jelix.org
9	10	* @licence http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file
…	…
75	76	const JPDO_ERRMODE_EXCEPTION = 2; // PDO::ERRMODE_EXCEPTION
76	77	const JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY = 1000; // PDO::MYSQL_ATTR_USE_BUFFERED_QUERY
	78	const JPDO_ATTR_CASE = 8; // PDO::ATTR_CASE
	79	const JPDO_CASE_LOWER = 2; // PDO::CASE_LOWER
77	80
78	81	private $_mysqlCharsets =array( 'UTF-8'=>'utf8', 'ISO-8859-1'=>'latin1');
…	…
117	120	$this->setAttribute(self::JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY, true);
118	121
	122	// Oracle renvoie les noms de colonnes en majuscules, il faut donc forcer la casse en minuscules
	123	if ($this->dbms == 'oci')
	124	$this->setAttribute(self::JPDO_ATTR_CASE, self::JPDO_CASE_LOWER);
	125
119	126	if(isset($prof['force_encoding']) && $prof['force_encoding']==true){
120	127	if($this->dbms == 'mysql' && isset($this->_mysqlCharsets[$GLOBALS['gJConfig']->charset])){

branches/1.0.x/lib/jelix/db/jDbPDOConnection.class.php

r721	r992
4	4	* @subpackage db
5	5	* @author Laurent Jouanneau
6		* @contributor
	6	* @contributor Gwendal Jouannic
7	7	* @copyright 2005-2006 Laurent Jouanneau
	8	* @copyright 2008 Gwendal Jouannic
8	9	* @link http://www.jelix.org
9	10	* @licence http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file
…	…
75	76	const JPDO_ERRMODE_EXCEPTION = 2; // PDO::ERRMODE_EXCEPTION
76	77	const JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY = 1000; // PDO::MYSQL_ATTR_USE_BUFFERED_QUERY
	78	const JPDO_ATTR_CASE = 8; // PDO::ATTR_CASE
	79	const JPDO_CASE_LOWER = 2; // PDO::CASE_LOWER
77	80
78	81	private $_mysqlCharsets =array( 'UTF-8'=>'utf8', 'ISO-8859-1'=>'latin1');
…	…
117	120	$this->setAttribute(self::JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY, true);
118	121
	122	// Oracle renvoie les noms de colonnes en majuscules, il faut donc forcer la casse en minuscules
	123	if ($this->dbms == 'oci')
	124	$this->setAttribute(self::JPDO_ATTR_CASE, self::JPDO_CASE_LOWER);
	125
119	126	if(isset($prof['force_encoding']) && $prof['force_encoding']==true){
120	127	if($this->dbms == 'mysql' && isset($this->_mysqlCharsets[$GLOBALS['gJConfig']->charset])){

branches/1.0.x/lib/jelix/db/jDbPDOConnection.class.php

r721	r992
4	4	* @subpackage db
5	5	* @author Laurent Jouanneau
6		* @contributor
	6	* @contributor Gwendal Jouannic
7	7	* @copyright 2005-2006 Laurent Jouanneau
	8	* @copyright 2008 Gwendal Jouannic
8	9	* @link http://www.jelix.org
9	10	* @licence http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file
…	…
75	76	const JPDO_ERRMODE_EXCEPTION = 2; // PDO::ERRMODE_EXCEPTION
76	77	const JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY = 1000; // PDO::MYSQL_ATTR_USE_BUFFERED_QUERY
	78	const JPDO_ATTR_CASE = 8; // PDO::ATTR_CASE
	79	const JPDO_CASE_LOWER = 2; // PDO::CASE_LOWER
77	80
78	81	private $_mysqlCharsets =array( 'UTF-8'=>'utf8', 'ISO-8859-1'=>'latin1');
…	…
117	120	$this->setAttribute(self::JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY, true);
118	121
	122	// Oracle renvoie les noms de colonnes en majuscules, il faut donc forcer la casse en minuscules
	123	if ($this->dbms == 'oci')
	124	$this->setAttribute(self::JPDO_ATTR_CASE, self::JPDO_CASE_LOWER);
	125
119	126	if(isset($prof['force_encoding']) && $prof['force_encoding']==true){
120	127	if($this->dbms == 'mysql' && isset($this->_mysqlCharsets[$GLOBALS['gJConfig']->charset])){

branches/1.0.x/lib/jelix/db/jDbPDOConnection.class.php

r721	r992
4	4	* @subpackage db
5	5	* @author Laurent Jouanneau
6		* @contributor
	6	* @contributor Gwendal Jouannic
7	7	* @copyright 2005-2006 Laurent Jouanneau
	8	* @copyright 2008 Gwendal Jouannic
8	9	* @link http://www.jelix.org
9	10	* @licence http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file
…	…
75	76	const JPDO_ERRMODE_EXCEPTION = 2; // PDO::ERRMODE_EXCEPTION
76	77	const JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY = 1000; // PDO::MYSQL_ATTR_USE_BUFFERED_QUERY
	78	const JPDO_ATTR_CASE = 8; // PDO::ATTR_CASE
	79	const JPDO_CASE_LOWER = 2; // PDO::CASE_LOWER
77	80
78	81	private $_mysqlCharsets =array( 'UTF-8'=>'utf8', 'ISO-8859-1'=>'latin1');
…	…
117	120	$this->setAttribute(self::JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY, true);
118	121
	122	// Oracle renvoie les noms de colonnes en majuscules, il faut donc forcer la casse en minuscules
	123	if ($this->dbms == 'oci')
	124	$this->setAttribute(self::JPDO_ATTR_CASE, self::JPDO_CASE_LOWER);
	125
119	126	if(isset($prof['force_encoding']) && $prof['force_encoding']==true){
120	127	if($this->dbms == 'mysql' && isset($this->_mysqlCharsets[$GLOBALS['gJConfig']->charset])){

branches/1.0.x/lib/jelix/db/jDbTools.class.php

r699	r992
4	4	* @subpackage db
5	5	* @author Croes Gérald, Laurent Jouanneau
6		* @contributor Laurent Jouanneau
	6	* @contributor Laurent Jouanneau, Gwendal Jouannic
7	7	* @copyright 2001-2005 CopixTeam, 2005-2006 Laurent Jouanneau
	8	* @copyright 2008 Gwendal Jouannic
8	9	*
9	10	* This class was get originally from the Copix project (CopixDbTools, CopixDbConnection, Copix 2.3dev20050901, http://www.copix.org)
…	…
65	66
66	67	public $length = 0;
	68
	69	/**
	70	* if there is a sequence
	71	* @var string
	72	*/
	73	public $sequence = false;
67	74	}
68	75

branches/1.0.x/lib/jelix/db/jDbTools.class.php

r699	r992
4	4	* @subpackage db
5	5	* @author Croes Gérald, Laurent Jouanneau
6		* @contributor Laurent Jouanneau
	6	* @contributor Laurent Jouanneau, Gwendal Jouannic
7	7	* @copyright 2001-2005 CopixTeam, 2005-2006 Laurent Jouanneau
	8	* @copyright 2008 Gwendal Jouannic
8	9	*
9	10	* This class was get originally from the Copix project (CopixDbTools, CopixDbConnection, Copix 2.3dev20050901, http://www.copix.org)
…	…
65	66
66	67	public $length = 0;
	68
	69	/**
	70	* if there is a sequence
	71	* @var string
	72	*/
	73	public $sequence = false;
67	74	}
68	75

branches/1.0.x/lib/jelix/db/jDbTools.class.php

r699	r992
4	4	* @subpackage db
5	5	* @author Croes Gérald, Laurent Jouanneau
6		* @contributor Laurent Jouanneau
	6	* @contributor Laurent Jouanneau, Gwendal Jouannic
7	7	* @copyright 2001-2005 CopixTeam, 2005-2006 Laurent Jouanneau
	8	* @copyright 2008 Gwendal Jouannic
8	9	*
9	10	* This class was get originally from the Copix project (CopixDbTools, CopixDbConnection, Copix 2.3dev20050901, http://www.copix.org)
…	…
65	66
66	67	public $length = 0;
	68
	69	/**
	70	* if there is a sequence
	71	* @var string
	72	*/
	73	public $sequence = false;
67	74	}
68	75

branches/1.0.x/lib/jelix/db/jDbTools.class.php

r699	r992
4	4	* @subpackage db
5	5	* @author Croes Gérald, Laurent Jouanneau
6		* @contributor Laurent Jouanneau
	6	* @contributor Laurent Jouanneau, Gwendal Jouannic
7	7	* @copyright 2001-2005 CopixTeam, 2005-2006 Laurent Jouanneau
	8	* @copyright 2008 Gwendal Jouannic
8	9	*
9	10	* This class was get originally from the Copix project (CopixDbTools, CopixDbConnection, Copix 2.3dev20050901, http://www.copix.org)
…	…
65	66
66	67	public $length = 0;
	68
	69	/**
	70	* if there is a sequence
	71	* @var string
	72	*/
	73	public $sequence = false;
67	74	}
68	75

branches/1.0.x/lib/jelix/plugins/db/oci/oci.daobuilder.php

r631	r992
4	4	* @subpackage db_driver
5	5	* @author Laurent Jouanneau
6		* @contributor
	6	* @contributor Gwendal Jouannic
7	7	* @copyright 2007 Laurent Jouanneau
8	8	* @link http://www.jelix.org
…	…
63	63	return $field;
64	64	}
	65
	66	/*
	67	* Remplace le lastInsertId qui ne marche pas avec oci
	68	*/
	69	protected function genUpdateAutoIncrementPK($pkai, $pTableRealName) {
	70	return ' $record->'.$pkai->name.'= $this->_conn->query(\'SELECT '.$pkai->sequenceName.'.currval as '.$pkai->name.' from dual\')->fetch()->'.$pkai->name.';';
	71	}
	72
65	73
66	74	}

branches/1.0.x/lib/jelix/plugins/db/oci/oci.daobuilder.php

r631	r992
4	4	* @subpackage db_driver
5	5	* @author Laurent Jouanneau
6		* @contributor
	6	* @contributor Gwendal Jouannic
7	7	* @copyright 2007 Laurent Jouanneau
8	8	* @link http://www.jelix.org
…	…
63	63	return $field;
64	64	}
	65
	66	/*
	67	* Remplace le lastInsertId qui ne marche pas avec oci
	68	*/
	69	protected function genUpdateAutoIncrementPK($pkai, $pTableRealName) {
	70	return ' $record->'.$pkai->name.'= $this->_conn->query(\'SELECT '.$pkai->sequenceName.'.currval as '.$pkai->name.' from dual\')->fetch()->'.$pkai->name.';';
	71	}
	72
65	73
66	74	}

branches/1.0.x/lib/jelix/plugins/db/oci/oci.daobuilder.php

r631	r992
4	4	* @subpackage db_driver
5	5	* @author Laurent Jouanneau
6		* @contributor
	6	* @contributor Gwendal Jouannic
7	7	* @copyright 2007 Laurent Jouanneau
8	8	* @link http://www.jelix.org
…	…
63	63	return $field;
64	64	}
	65
	66	/*
	67	* Remplace le lastInsertId qui ne marche pas avec oci
	68	*/
	69	protected function genUpdateAutoIncrementPK($pkai, $pTableRealName) {
	70	return ' $record->'.$pkai->name.'= $this->_conn->query(\'SELECT '.$pkai->sequenceName.'.currval as '.$pkai->name.' from dual\')->fetch()->'.$pkai->name.';';
	71	}
	72
65	73
66	74	}

branches/1.0.x/lib/jelix/plugins/db/oci/oci.daobuilder.php

r631	r992
4	4	* @subpackage db_driver
5	5	* @author Laurent Jouanneau
6		* @contributor
	6	* @contributor Gwendal Jouannic
7	7	* @copyright 2007 Laurent Jouanneau
8	8	* @link http://www.jelix.org
…	…
63	63	return $field;
64	64	}
	65
	66	/*
	67	* Remplace le lastInsertId qui ne marche pas avec oci
	68	*/
	69	protected function genUpdateAutoIncrementPK($pkai, $pTableRealName) {
	70	return ' $record->'.$pkai->name.'= $this->_conn->query(\'SELECT '.$pkai->sequenceName.'.currval as '.$pkai->name.' from dual\')->fetch()->'.$pkai->name.';';
	71	}
	72
65	73
66	74	}

Download in other formats: Unified Diff Zip Archive

r829	r992
393	393	cd lib/jelix/plugins/db/oci
394	394	oci.daobuilder.php
	395	oci.dbtools.php
395	396
396	397	cd lib/jelix/plugins/tpl/common

Developers' Corner

Changeset 992

Legend: