-
Notifications
You must be signed in to change notification settings - Fork 441
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#8284 Patch ADODB for error handling in newer PHPs
- Loading branch information
Showing
2 changed files
with
35 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
--- adodb-xmlschema.inc.php 2022-09-22 17:02:09.997038474 -0700 | ||
+++ adodb-xmlschema.inc.php 2022-09-22 17:30:42.099756162 -0700 | ||
@@ -480,8 +480,14 @@ | ||
function create( &$xmls ) { | ||
$sql = array(); | ||
|
||
+ $tableExists = in_array($this->name, $xmls->dict->MetaTables()); | ||
// drop any existing indexes | ||
- if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) { | ||
+ if ($tableExists) { | ||
+ $legacy_indexes = $xmls->dict->MetaIndexes($this->name); | ||
+ } else { | ||
+ $legacy_indexes = false; | ||
+ } | ||
+ if( is_array( $legacy_indexes ) ) { | ||
foreach( $legacy_indexes as $index => $index_details ) { | ||
$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name ); | ||
} | ||
@@ -492,8 +498,13 @@ | ||
unset( $this->fields[$field] ); | ||
} | ||
|
||
+ if ($tableExists) { | ||
+ $legacy_fields = $xmls->dict->MetaColumns($this->name); | ||
+ } else { | ||
+ $legacy_fields = false; | ||
+ } | ||
// if table exists | ||
- if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) { | ||
+ if( is_array( $legacy_fields ) ) { | ||
// drop table | ||
if( $this->drop_table ) { | ||
$sql[] = $xmls->dict->DropTableSQL( $this->name ); |