mirror of
https://github.com/ACSPRI/queXS
synced 2024-04-02 12:12:16 +00:00
Merged from McMasterReports branch
This commit is contained in:
@@ -119,7 +119,7 @@ class dbObject {
|
||||
* NOP
|
||||
*/
|
||||
function dbObject( &$parent, $attributes = NULL ) {
|
||||
$this->parent =& $parent;
|
||||
$this->parent = $parent;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -249,7 +249,7 @@ class dbTable extends dbObject {
|
||||
* @param array $attributes Array of table attributes.
|
||||
*/
|
||||
function dbTable( &$parent, $attributes = NULL ) {
|
||||
$this->parent =& $parent;
|
||||
$this->parent = $parent;
|
||||
$this->name = $this->prefix($attributes['NAME']);
|
||||
}
|
||||
|
||||
@@ -362,9 +362,9 @@ class dbTable extends dbObject {
|
||||
* @param array $attributes Index attributes
|
||||
* @return object dbIndex object
|
||||
*/
|
||||
function &addIndex( $attributes ) {
|
||||
function addIndex( $attributes ) {
|
||||
$name = strtoupper( $attributes['NAME'] );
|
||||
$this->indexes[$name] =& new dbIndex( $this, $attributes );
|
||||
$this->indexes[$name] = new dbIndex( $this, $attributes );
|
||||
return $this->indexes[$name];
|
||||
}
|
||||
|
||||
@@ -374,9 +374,9 @@ class dbTable extends dbObject {
|
||||
* @param array $attributes Data attributes
|
||||
* @return object dbData object
|
||||
*/
|
||||
function &addData( $attributes ) {
|
||||
function addData( $attributes ) {
|
||||
if( !isset( $this->data ) ) {
|
||||
$this->data =& new dbData( $this, $attributes );
|
||||
$this->data = new dbData( $this, $attributes );
|
||||
}
|
||||
return $this->data;
|
||||
}
|
||||
@@ -463,10 +463,12 @@ class dbTable extends dbObject {
|
||||
* @return array Options
|
||||
*/
|
||||
function addTableOpt( $opt ) {
|
||||
$this->opts[] = $opt;
|
||||
|
||||
if(isset($this->currentPlatform)) {
|
||||
$this->opts[$this->parent->db->databaseType] = $opt;
|
||||
}
|
||||
return $this->opts;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Generates the SQL that will create the table in the database
|
||||
@@ -641,7 +643,7 @@ class dbIndex extends dbObject {
|
||||
* @internal
|
||||
*/
|
||||
function dbIndex( &$parent, $attributes = NULL ) {
|
||||
$this->parent =& $parent;
|
||||
$this->parent = $parent;
|
||||
|
||||
$this->name = $this->prefix ($attributes['NAME']);
|
||||
}
|
||||
@@ -785,7 +787,7 @@ class dbData extends dbObject {
|
||||
* @internal
|
||||
*/
|
||||
function dbData( &$parent, $attributes = NULL ) {
|
||||
$this->parent =& $parent;
|
||||
$this->parent = $parent;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -984,7 +986,7 @@ class dbQuerySet extends dbObject {
|
||||
* @param array $attributes Attributes
|
||||
*/
|
||||
function dbQuerySet( &$parent, $attributes = NULL ) {
|
||||
$this->parent =& $parent;
|
||||
$this->parent = $parent;
|
||||
|
||||
// Overrides the manual prefix key
|
||||
if( isset( $attributes['KEY'] ) ) {
|
||||
@@ -1304,7 +1306,7 @@ class adoSchema {
|
||||
$this->mgq = get_magic_quotes_runtime();
|
||||
set_magic_quotes_runtime(0);
|
||||
|
||||
$this->db =& $db;
|
||||
$this->db = $db;
|
||||
$this->debug = $this->db->debug;
|
||||
$this->dict = NewDataDictionary( $this->db );
|
||||
$this->sqlArray = array();
|
||||
@@ -1627,7 +1629,7 @@ class adoSchema {
|
||||
*
|
||||
* @access private
|
||||
*/
|
||||
function &create_parser() {
|
||||
function create_parser() {
|
||||
// Create the parser
|
||||
$xmlParser = xml_parser_create();
|
||||
xml_set_object( $xmlParser, $this );
|
||||
|
||||
Reference in New Issue
Block a user