Commit 18f4d5e

committed

fixed error on setup module with db transaction

1 parent 0e472f5 commit 18f4d5eCopy full SHA for 18f4d5e

File tree

+19

-3

lines changed

+19

-3

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`Version 1.5.x -`
`2`	`2`	`----------------------------`
	`3`	`+- Bug: fixed error on setup module with db transaction`
`3`	`4`
`4`	`5`
`5`	`6`	`Version 1.4.1 - 30 Jan, 2021`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@`
`17`	`17`	`// Framework`
`18`	`18`	`use \A,`
`19`	`19`	`\CModel,`
`20`		`- \CDatabase;`
	`20`	`+ \CDatabase,`
	`21`	`+ \CConfig;`
`21`	`22`
`22`	`23`
`23`	`24`	`class Setup extends CModel`
`@@ -64,6 +65,10 @@ public function doCommit()`
`64`	`65`	`*/`
`65`	`66`	`public function install($sqlDump = '', $transaction = true, $ignoreErrors = false)`
`66`	`67`	`{`
	`68`	`+ if ($transaction) {`
	`69`	`+ $transaction = CConfig::get('db.transaction', false);`
	`70`	`+ }`
	`71`	`+`
`67`	`72`	`if (empty($sqlDump)) {`
`68`	`73`	`$this->_error = true;`
`69`	`74`	`$this->_errorMessage = A::t('setup', 'No SQL statements found! Please check your data file.');`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@`
`17`	`17`	`// Framework`
`18`	`18`	`use \A,`
`19`	`19`	`\CModel,`
`20`		`- \CDatabase;`
	`20`	`+ \CDatabase,`
	`21`	`+ \CConfig;`
`21`	`22`
`22`	`23`
`23`	`24`	`class Setup extends CModel`
`@@ -64,6 +65,10 @@ public function doCommit()`
`64`	`65`	`*/`
`65`	`66`	`public function install($sqlDump = '', $transaction = true, $ignoreErrors = false)`
`66`	`67`	`{`
	`68`	`+ if ($transaction) {`
	`69`	`+ $transaction = CConfig::get('db.transaction', false);`
	`70`	`+ }`
	`71`	`+`
`67`	`72`	`if (empty($sqlDump)) {`
`68`	`73`	`$this->_error = true;`
`69`	`74`	`$this->_errorMessage = A::t('setup', 'No SQL statements found! Please check your data file.');`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@`
`17`	`17`	`// Framework`
`18`	`18`	`use \A,`
`19`	`19`	`\CModel,`
`20`		`- \CDatabase;`
	`20`	`+ \CDatabase,`
	`21`	`+ \CConfig;`
`21`	`22`
`22`	`23`
`23`	`24`	`class Setup extends CModel`
`@@ -64,6 +65,10 @@ public function doCommit()`
`64`	`65`	`*/`
`65`	`66`	`public function install($sqlDump = '', $transaction = true, $ignoreErrors = false)`
`66`	`67`	`{`
	`68`	`+ if ($transaction) {`
	`69`	`+ $transaction = CConfig::get('db.transaction', false);`
	`70`	`+ }`
	`71`	`+`
`67`	`72`	`if (empty($sqlDump)) {`
`68`	`73`	`$this->_error = true;`
`69`	`74`	`$this->_errorMessage = A::t('setup', 'No SQL statements found! Please check your data file.');`

Comments

(0)