diff options
| author | Mark Newnham <mark@newnhams.com> | 2025-10-11 17:20:58 -0600 |
|---|---|---|
| committer | Mark Newnham <mark@newnhams.com> | 2025-10-11 17:20:58 -0600 |
| commit | 0dd4b63b4f9166b0e9e213787501c24c6e2a4e08 (patch) | |
| tree | ac8bfc7591079806c6a42a75152f3c80455cb7cf | |
| parent | 15529e7c7f7d3941e718471901e1f63c53b7d9da (diff) | |
| download | adodb-0dd4b63b4f9166b0e9e213787501c24c6e2a4e08.tar.gz adodb-0dd4b63b4f9166b0e9e213787501c24c6e2a4e08.tar.bz2 adodb-0dd4b63b4f9166b0e9e213787501c24c6e2a4e08.zip | |
revert incorrectly pulled changes
| -rw-r--r-- | adodb-xmlschema03.inc.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/adodb-xmlschema03.inc.php b/adodb-xmlschema03.inc.php index bdbc38d3..51d1ae31 100644 --- a/adodb-xmlschema03.inc.php +++ b/adodb-xmlschema03.inc.php @@ -550,8 +550,7 @@ class dbTable extends dbObject { if (is_array($tableExists) && count($tableExists) > 0 && $tableExists[0] == $this->name) { if( is_array( $legacy_indexes = $xmls->dict->metaIndexes( $this->name ) ) ) { foreach( $legacy_indexes as $index => $index_details ) { - $dropSql = $xmls->dict->dropIndexSQL( $index, $this->name ); - $sql = array_merge($sql,$dropSql); + $sql[] = $xmls->dict->dropIndexSQL( $index, $this->name ); } } @@ -572,8 +571,7 @@ class dbTable extends dbObject { // drop any existing fields not in schema foreach( $legacy_fields as $field_id => $field ) { if( !isset( $this->fields[$field_id] ) ) { - $dropSql = $xmls->dict->dropColumnSQL( $this->name, $field->name ); - $sql = array_merge($sql,$dropSql); + $sql[] = $xmls->dict->dropColumnSQL( $this->name, $field->name ); } } // if table doesn't exist @@ -631,9 +629,8 @@ class dbTable extends dbObject { // Use ChangeTableSQL case 'ALTER': - $changeSql = $xmls->dict->changeTableSQL( $this->name, $fldarray, $this->opts ); - $sql = array_merge($sql,$changeSql); - + $sql[] = $xmls->dict->changeTableSQL( $this->name, $fldarray, $this->opts ); + $xmls->logMsg($sql, 'Generated changeTableSQL (ALTERing table)', false, $this ); break; case 'REPLACE': |