2
0
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:
azammitdcarf
2010-01-14 07:45:37 +00:00
parent 18dbb16138
commit d1b139d315
1884 changed files with 555891 additions and 364768 deletions

View File

@@ -137,7 +137,7 @@ class dbObject {
* NOP
*/
function dbObject( &$parent, $attributes = NULL ) {
$this->parent =& $parent;
$this->parent = $parent;
}
/**
@@ -274,7 +274,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']);
}
@@ -399,9 +399,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];
}
@@ -411,9 +411,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;
}
@@ -504,11 +504,12 @@ class dbTable extends dbObject {
* @return array Options
*/
function addTableOpt( $opt ) {
if( $this->currentPlatform ) {
$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
@@ -683,7 +684,7 @@ class dbIndex extends dbObject {
* @internal
*/
function dbIndex( &$parent, $attributes = NULL ) {
$this->parent =& $parent;
$this->parent = $parent;
$this->name = $this->prefix ($attributes['NAME']);
}
@@ -828,7 +829,7 @@ class dbData extends dbObject {
* @internal
*/
function dbData( &$parent, $attributes = NULL ) {
$this->parent =& $parent;
$this->parent = $parent;
}
/**
@@ -1084,7 +1085,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'] ) ) {
@@ -1409,7 +1410,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();
@@ -1497,7 +1498,7 @@ class adoSchema {
$mode = XMLS_MODE_INSERT;
break;
default:
$mode = XMLS_EXISITNG_DATA;
$mode = XMLS_EXISTING_DATA;
break;
}
$this->existingData = $mode;
@@ -1785,7 +1786,7 @@ class adoSchema {
*
* @access private
*/
function &create_parser() {
function create_parser() {
// Create the parser
$xmlParser = xml_parser_create();
xml_set_object( $xmlParser, $this );