diff options
| author | Jeremy Dorn <jeremy@jeremydorn.com> | 2013-09-18 07:43:47 -0700 |
|---|---|---|
| committer | Jeremy Dorn <jeremy@jeremydorn.com> | 2013-09-18 07:43:47 -0700 |
| commit | 51a660e97b59f91b814eeee6e0a38e3cd726dd30 (patch) | |
| tree | d52beba30da35bdd2f801f9ad5dd0911659b447a | |
| parent | c3691fe2e20326e2022ec339ca1942b84cd38b77 (diff) | |
| download | sql-formatter-51a660e97b59f91b814eeee6e0a38e3cd726dd30.zip sql-formatter-51a660e97b59f91b814eeee6e0a38e3cd726dd30.tar.gz sql-formatter-51a660e97b59f91b814eeee6e0a38e3cd726dd30.tar.bz2 | |
Increase PhpUnit code coverage.
Fix undefined variable $clause_limit notice.
A couple PSR fixes.
Bump version number.
| -rw-r--r-- | lib/SqlFormatter.php | 13 | ||||
| -rw-r--r-- | tests/SqlFormatterTest.php | 4 | ||||
| -rw-r--r-- | tests/clihighlight.html | 991 | ||||
| -rw-r--r-- | tests/compress.html | 8 | ||||
| -rw-r--r-- | tests/format-highlight.html | 30 | ||||
| -rw-r--r-- | tests/format.html | 29 | ||||
| -rw-r--r-- | tests/highlight.html | 9 | ||||
| -rw-r--r-- | tests/sql.sql | 6 |
8 files changed, 853 insertions, 237 deletions
diff --git a/lib/SqlFormatter.php b/lib/SqlFormatter.php index db0fe9a..0efd8db 100644 --- a/lib/SqlFormatter.php +++ b/lib/SqlFormatter.php @@ -9,7 +9,7 @@ * @copyright 2013 Jeremy Dorn * @license http://opensource.org/licenses/MIT * @link http://github.com/jdorn/sql-formatter - * @version 1.2.13 + * @version 1.2.14 */ class SqlFormatter { @@ -442,6 +442,7 @@ class SqlFormatter $added_newline = false; $inline_count = 0; $inline_indented = false; + $clause_limit = false; // Tokenize String $original_tokens = self::tokenize($string); @@ -641,10 +642,10 @@ class SqlFormatter $clause_limit = true; } } - + // Checks if we are out of the limit clause elseif ($clause_limit && $token[self::TOKEN_VALUE] !== "," && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_NUMBER && $token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) { - $clause_limit = false; + $clause_limit = false; } // Commas start a new line (unless within inline parentheses or SQL 'LIMIT' clause) @@ -652,12 +653,12 @@ class SqlFormatter //If the previous TOKEN_VALUE is 'LIMIT', resets new line if ($clause_limit === true) { $newline = false; - $clause_limit = false; + $clause_limit = false; } - // All other cases of commas + // All other cases of commas else { $newline = true; - } + } } // Newline reserved words start a new line diff --git a/tests/SqlFormatterTest.php b/tests/SqlFormatterTest.php index 333483c..ca535cf 100644 --- a/tests/SqlFormatterTest.php +++ b/tests/SqlFormatterTest.php @@ -30,7 +30,7 @@ class SqlFormatterTest extends PHPUnit_Framework_TestCase { */ function testCliHighlight($sql, $html) { SqlFormatter::$cli = true; - $this->assertEquals(trim($html), trim(SqlFormatter::highlight($sql))); + $this->assertEquals(trim($html), trim(SqlFormatter::format($sql))); SqlFormatter::$cli = false; } /** @@ -180,7 +180,7 @@ class SqlFormatterTest extends PHPUnit_Framework_TestCase { $compress[] = trim(SqlFormatter::compress($sql)); SqlFormatter::$cli = true; - $clihighlight[] = trim(SqlFormatter::highlight($sql)); + $clihighlight[] = trim(SqlFormatter::format($sql)); SqlFormatter::$cli = false; } diff --git a/tests/clihighlight.html b/tests/clihighlight.html index 657f324..a5d4510 100644 --- a/tests/clihighlight.html +++ b/tests/clihighlight.html @@ -1,245 +1,786 @@ -[37mSELECT[0m customer_id[0m,[0m customer_name[0m,[0m [37mCOUNT[0m(order_id[0m) [37mas[0m total[0m -[37mFROM[0m customers[0m [37mINNER JOIN[0m orders[0m [37mON[0m customers[0m.[0mcustomer_id[0m =[0m orders[0m.[0mcustomer_id[0m -[37mGROUP BY[0m customer_id[0m,[0m customer_name[0m -[37mHAVING[0m [37mCOUNT[0m(order_id[0m) >[0m [32;1m5[0m -[37mORDER BY[0m [37mCOUNT[0m(order_id[0m) [37mDESC[0m;[0m - -[37mUPDATE[0m customers[0m - [37mSET[0m totalorders[0m =[0m ordersummary[0m.[0mtotal[0m - [37mFROM[0m ([37mSELECT[0m customer_id[0m,[0m [37mcount[0m(order_id[0m) [37mAs[0m total[0m -[37mFROM[0m orders[0m [37mGROUP BY[0m customer_id[0m) [37mAs[0m ordersummary[0m - [37mWHERE[0m customers[0m.[0mcustomer_id[0m =[0m ordersummary[0m.[0mcustomer_id[0m - -[37mSELECT[0m *[0m [37mFROM[0m sometable[0m -[37mUNION ALL[0m -[37mSELECT[0m *[0m [37mFROM[0m someothertable[0m;[0m - -[37mSET[0m [37mNAMES[0m [34;1m'utf8'[0m;[0m +[37mSELECT[0m + customer_id[0m,[0m + customer_name[0m,[0m + [37mCOUNT[0m(order_id[0m) [37mas[0m total[0m +[37mFROM[0m + customers[0m + [37mINNER JOIN[0m orders[0m [37mON[0m customers[0m.[0mcustomer_id[0m =[0m orders[0m.[0mcustomer_id[0m +[37mGROUP BY[0m + customer_id[0m,[0m + customer_name[0m +[37mHAVING[0m + [37mCOUNT[0m(order_id[0m) >[0m [32;1m5[0m +[37mORDER BY[0m + [37mCOUNT[0m(order_id[0m) [37mDESC[0m;[0m + +[37mUPDATE[0m + customers[0m +[37mSET[0m + totalorders[0m =[0m ordersummary[0m.[0mtotal[0m +[37mFROM[0m + ( + [37mSELECT[0m + customer_id[0m,[0m + [37mcount[0m(order_id[0m) [37mAs[0m total[0m + [37mFROM[0m + orders[0m + [37mGROUP BY[0m + customer_id[0m + ) [37mAs[0m ordersummary[0m +[37mWHERE[0m + customers[0m.[0mcustomer_id[0m =[0m ordersummary[0m.[0mcustomer_id[0m + +[37mSELECT[0m + *[0m +[37mFROM[0m + sometable[0m +[37mUNION ALL[0m +[37mSELECT[0m + *[0m +[37mFROM[0m + someothertable[0m;[0m + +[37mSET[0m + [37mNAMES[0m [34;1m'utf8'[0m;[0m [37mCREATE[0m [37mTABLE[0m [35;1m`PREFIX_address`[0m ( - [35;1m`id_address`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mauto_increment[0m,[0m - [35;1m`id_country`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m - [35;1m`id_state`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mdefault[0m [37mNULL[0m,[0m - [35;1m`id_customer`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m - [35;1m`id_manufacturer`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m - [35;1m`id_supplier`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m - [35;1m`id_warehouse`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m - [35;1m`alias`[0m varchar[0m([32;1m32[0m) [37mNOT[0m [37mNULL[0m,[0m - [35;1m`company`[0m varchar[0m([32;1m64[0m) [37mdefault[0m [37mNULL[0m,[0m - [35;1m`lastname`[0m varchar[0m([32;1m32[0m) [37mNOT[0m [37mNULL[0m,[0m - [35;1m`firstname`[0m varchar[0m([32;1m32[0m) [37mNOT[0m [37mNULL[0m,[0m - [35;1m`address1`[0m varchar[0m([32;1m128[0m) [37mNOT[0m [37mNULL[0m,[0m - [35;1m`address2`[0m varchar[0m([32;1m128[0m) [37mdefault[0m [37mNULL[0m,[0m - [35;1m`postcode`[0m varchar[0m([32;1m12[0m) [37mdefault[0m [37mNULL[0m,[0m - [35;1m`city`[0m varchar[0m([32;1m64[0m) [37mNOT[0m [37mNULL[0m,[0m - [35;1m`other`[0m text[0m,[0m - [35;1m`phone`[0m varchar[0m([32;1m16[0m) [37mdefault[0m [37mNULL[0m,[0m - [35;1m`phone_mobile`[0m varchar[0m([32;1m16[0m) [37mdefault[0m [37mNULL[0m,[0m - [35;1m`vat_number`[0m varchar[0m([32;1m32[0m) [37mdefault[0m [37mNULL[0m,[0m - [35;1m`dni`[0m varchar[0m([32;1m16[0m) [37mDEFAULT[0m [37mNULL[0m,[0m - [35;1m`date_add`[0m datetime[0m [37mNOT[0m [37mNULL[0m,[0m - [35;1m`date_upd`[0m datetime[0m [37mNOT[0m [37mNULL[0m,[0m - [35;1m`active`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'1'[0m,[0m - [35;1m`deleted`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m - [37mPRIMARY[0m [37mKEY[0m ([35;1m`id_address`[0m),[0m - [37mKEY[0m [35;1m`address_customer`[0m ([35;1m`id_customer`[0m),[0m - [37mKEY[0m [35;1m`id_country`[0m ([35;1m`id_country`[0m),[0m - [37mKEY[0m [35;1m`id_state`[0m ([35;1m`id_state`[0m),[0m - [37mKEY[0m [35;1m`id_manufacturer`[0m ([35;1m`id_manufacturer`[0m),[0m - [37mKEY[0m [35;1m`id_supplier`[0m ([35;1m`id_supplier`[0m),[0m + [35;1m`id_address`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mauto_increment[0m,[0m + [35;1m`id_country`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m + [35;1m`id_state`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mdefault[0m [37mNULL[0m,[0m + [35;1m`id_customer`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m + [35;1m`id_manufacturer`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m + [35;1m`id_supplier`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m + [35;1m`id_warehouse`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m + [35;1m`alias`[0m varchar[0m([32;1m32[0m) [37mNOT[0m [37mNULL[0m,[0m + [35;1m`company`[0m varchar[0m([32;1m64[0m) [37mdefault[0m [37mNULL[0m,[0m + [35;1m`lastname`[0m varchar[0m([32;1m32[0m) [37mNOT[0m [37mNULL[0m,[0m + [35;1m`firstname`[0m varchar[0m([32;1m32[0m) [37mNOT[0m [37mNULL[0m,[0m + [35;1m`address1`[0m varchar[0m([32;1m128[0m) [37mNOT[0m [37mNULL[0m,[0m + [35;1m`address2`[0m varchar[0m([32;1m128[0m) [37mdefault[0m [37mNULL[0m,[0m + [35;1m`postcode`[0m varchar[0m([32;1m12[0m) [37mdefault[0m [37mNULL[0m,[0m + [35;1m`city`[0m varchar[0m([32;1m64[0m) [37mNOT[0m [37mNULL[0m,[0m + [35;1m`other`[0m text[0m,[0m + [35;1m`phone`[0m varchar[0m([32;1m16[0m) [37mdefault[0m [37mNULL[0m,[0m + [35;1m`phone_mobile`[0m varchar[0m([32;1m16[0m) [37mdefault[0m [37mNULL[0m,[0m + [35;1m`vat_number`[0m varchar[0m([32;1m32[0m) [37mdefault[0m [37mNULL[0m,[0m + [35;1m`dni`[0m varchar[0m([32;1m16[0m) [37mDEFAULT[0m [37mNULL[0m,[0m + [35;1m`date_add`[0m datetime[0m [37mNOT[0m [37mNULL[0m,[0m + [35;1m`date_upd`[0m datetime[0m [37mNOT[0m [37mNULL[0m,[0m + [35;1m`active`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'1'[0m,[0m + [35;1m`deleted`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m + [37mPRIMARY[0m [37mKEY[0m ([35;1m`id_address`[0m),[0m + [37mKEY[0m [35;1m`address_customer`[0m ([35;1m`id_customer`[0m),[0m + [37mKEY[0m [35;1m`id_country`[0m ([35;1m`id_country`[0m),[0m + [37mKEY[0m [35;1m`id_state`[0m ([35;1m`id_state`[0m),[0m + [37mKEY[0m [35;1m`id_manufacturer`[0m ([35;1m`id_manufacturer`[0m),[0m + [37mKEY[0m [35;1m`id_supplier`[0m ([35;1m`id_supplier`[0m),[0m [37mKEY[0m [35;1m`id_warehouse`[0m ([35;1m`id_warehouse`[0m) -) [37mENGINE[0m=[0m[37mENGINE_TYPE[0m [37mDEFAULT[0m [37mCHARSET[0m=[0mutf8[0m +) [37mENGINE[0m =[0m [37mENGINE_TYPE[0m [37mDEFAULT[0m [37mCHARSET[0m =[0m utf8[0m [37mCREATE[0m [37mTABLE[0m [35;1m`PREFIX_alias`[0m ( - [35;1m`id_alias`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mauto_increment[0m,[0m - [35;1m`alias`[0m varchar[0m([32;1m255[0m) [37mNOT[0m [37mNULL[0m,[0m - [35;1m`search`[0m varchar[0m([32;1m255[0m) [37mNOT[0m [37mNULL[0m,[0m - [35;1m`active`[0m tinyint[0m([32;1m1[0m) [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'1'[0m,[0m - [37mPRIMARY[0m [37mKEY[0m ([35;1m`id_alias`[0m),[0m + [35;1m`id_alias`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mauto_increment[0m,[0m + [35;1m`alias`[0m varchar[0m([32;1m255[0m) [37mNOT[0m [37mNULL[0m,[0m + [35;1m`search`[0m varchar[0m([32;1m255[0m) [37mNOT[0m [37mNULL[0m,[0m + [35;1m`active`[0m tinyint[0m([32;1m1[0m) [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'1'[0m,[0m + [37mPRIMARY[0m [37mKEY[0m ([35;1m`id_alias`[0m),[0m [37mUNIQUE[0m [37mKEY[0m [35;1m`alias`[0m ([35;1m`alias`[0m) -) [37mENGINE[0m=[0m[37mENGINE_TYPE[0m [37mDEFAULT[0m [37mCHARSET[0m=[0mutf8[0m +) [37mENGINE[0m =[0m [37mENGINE_TYPE[0m [37mDEFAULT[0m [37mCHARSET[0m =[0m utf8[0m [37mCREATE[0m [37mTABLE[0m [35;1m`PREFIX_carrier`[0m ( - [35;1m`id_carrier`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mAUTO_INCREMENT[0m,[0m - [35;1m`id_reference`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m - [35;1m`id_tax_rules_group`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m - [35;1m`name`[0m varchar[0m([32;1m64[0m) [37mNOT[0m [37mNULL[0m,[0m - [35;1m`url`[0m varchar[0m([32;1m255[0m) [37mDEFAULT[0m [37mNULL[0m,[0m - [35;1m`active`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m - [35;1m`deleted`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m - [35;1m`shipping_handling`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'1'[0m,[0m - [35;1m`range_behavior`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m - [35;1m`is_module`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m - [35;1m`is_free`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m - [35;1m`shipping_external`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m - [35;1m`need_range`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m - [35;1m`external_module_name`[0m varchar[0m([32;1m64[0m) [37mDEFAULT[0m [37mNULL[0m,[0m - [35;1m`shipping_method`[0m int[0m([32;1m2[0m) [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m - [35;1m`position`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m - [35;1m`max_width`[0m int[0m([32;1m10[0m) [37mDEFAULT[0m [32;1m0[0m,[0m - [35;1m`max_height`[0m int[0m([32;1m10[0m) [37mDEFAULT[0m [32;1m0[0m,[0m - [35;1m`max_depth`[0m int[0m([32;1m10[0m) [37mDEFAULT[0m [32;1m0[0m,[0m - [35;1m`max_weight`[0m int[0m([32;1m10[0m) [37mDEFAULT[0m [32;1m0[0m,[0m - [35;1m`grade`[0m int[0m([32;1m10[0m) [37mDEFAULT[0m [32;1m0[0m,[0m - [37mPRIMARY[0m [37mKEY[0m ([35;1m`id_carrier`[0m),[0m - [37mKEY[0m [35;1m`deleted`[0m ([35;1m`deleted`[0m,[0m[35;1m`active`[0m),[0m + [35;1m`id_carrier`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mAUTO_INCREMENT[0m,[0m + [35;1m`id_reference`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m + [35;1m`id_tax_rules_group`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m + [35;1m`name`[0m varchar[0m([32;1m64[0m) [37mNOT[0m [37mNULL[0m,[0m + [35;1m`url`[0m varchar[0m([32;1m255[0m) [37mDEFAULT[0m [37mNULL[0m,[0m + [35;1m`active`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m + [35;1m`deleted`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m + [35;1m`shipping_handling`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'1'[0m,[0m + [35;1m`range_behavior`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m + [35;1m`is_module`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m + [35;1m`is_free`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m + [35;1m`shipping_external`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m + [35;1m`need_range`[0m tinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m + [35;1m`external_module_name`[0m varchar[0m([32;1m64[0m) [37mDEFAULT[0m [37mNULL[0m,[0m + [35;1m`shipping_method`[0m int[0m([32;1m2[0m) [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m + [35;1m`position`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m + [35;1m`max_width`[0m int[0m([32;1m10[0m) [37mDEFAULT[0m [32;1m0[0m,[0m + [35;1m`max_height`[0m int[0m([32;1m10[0m) [37mDEFAULT[0m [32;1m0[0m,[0m + [35;1m`max_depth`[0m int[0m([32;1m10[0m) [37mDEFAULT[0m [32;1m0[0m,[0m + [35;1m`max_weight`[0m int[0m([32;1m10[0m) [37mDEFAULT[0m [32;1m0[0m,[0m + [35;1m`grade`[0m int[0m([32;1m10[0m) [37mDEFAULT[0m [32;1m0[0m,[0m + [37mPRIMARY[0m [37mKEY[0m ([35;1m`id_carrier`[0m),[0m + [37mKEY[0m [35;1m`deleted`[0m ([35;1m`deleted`[0m,[0m [35;1m`active`[0m),[0m [37mKEY[0m [35;1m`id_tax_rules_group`[0m ([35;1m`id_tax_rules_group`[0m) -) [37mENGINE[0m=[0m[37mENGINE_TYPE[0m [37mDEFAULT[0m [37mCHARSET[0m=[0mutf8[0m +) [37mENGINE[0m =[0m [37mENGINE_TYPE[0m [37mDEFAULT[0m [37mCHARSET[0m =[0m utf8[0m [37mCREATE[0m [37mTABLE[0m [37mIF[0m [37mNOT[0m [37mEXISTS[0m [35;1m`PREFIX_specific_price_rule`[0m ( - [35;1m`id_specific_price_rule`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mAUTO_INCREMENT[0m,[0m - [35;1m`name`[0m VARCHAR[0m([32;1m255[0m) [37mNOT[0m [37mNULL[0m,[0m - [35;1m`id_shop`[0m int[0m([32;1m11[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'1'[0m,[0m - [35;1m`id_currency`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m - [35;1m`id_country`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m - [35;1m`id_group`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m - [35;1m`from_quantity`[0m mediumint[0m([32;1m8[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m - [35;1m`price`[0m DECIMAL[0m([32;1m20[0m,[0m[32;1m6[0m),[0m - [35;1m`reduction`[0m decimal[0m([32;1m20[0m,[0m[32;1m6[0m) [37mNOT[0m [37mNULL[0m,[0m - [35;1m`reduction_type`[0m enum[0m([34;1m'amount'[0m,[0m[34;1m'percentage'[0m) [37mNOT[0m [37mNULL[0m,[0m - [35;1m`from`[0m datetime[0m [37mNOT[0m [37mNULL[0m,[0m - [35;1m`to`[0m datetime[0m [37mNOT[0m [37mNULL[0m,[0m - [37mPRIMARY[0m [37mKEY[0m ([35;1m`id_specific_price_rule`[0m),[0m - [37mKEY[0m [35;1m`id_product`[0m ([35;1m`id_shop`[0m,[0m[35;1m`id_currency`[0m,[0m[35;1m`id_country`[0m,[0m[35;1m`id_group`[0m,[0m[35;1m`from_quantity`[0m,[0m[35;1m`from`[0m,[0m[35;1m`to`[0m) -) [37mENGINE[0m=[0m[37mENGINE_TYPE[0m [37mDEFAULT[0m [37mCHARSET[0m=[0mutf8[0m - -[37mUPDATE[0m [35;1m`PREFIX_configuration`[0m [37mSET[0m value[0m =[0m [34;1m'6'[0m [37mWHERE[0m name[0m =[0m [34;1m'PS_SEARCH_WEIGHT_PNAME'[0m - -[37mUPDATE[0m [35;1m`PREFIX_hook_module`[0m [37mSET[0m position[0m =[0m [32;1m1[0m -[37mWHERE[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'displayPayment'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'cheque'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'displayPaymentReturn'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'cheque'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'displayHome'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'homeslider'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'actionAuthentication'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'statsdata'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'actionShopDataDuplication'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'homeslider'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'displayTop'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'blocklanguages'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'actionCustomerAccountAdd'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'statsdata'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'displayCustomerAccount'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'favoriteproducts'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'displayAdminStatsModules'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'statsvisits'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'displayAdminStatsGraphEngine'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'graphvisifire'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'displayAdminStatsGridEngine'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'gridhtml'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'displayLeftColumnProduct'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'blocksharefb'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'actionSearch'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'statssearch'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'actionCategoryAdd'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'blockcategories'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'actionCategoryUpdate'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'blockcategories'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'actionCategoryDelete'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'blockcategories'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'actionAdminMetaSave'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'blockcategories'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'displayMyAccountBlock'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'favoriteproducts'[0m) - [37mOR[0m - id_hook[0m =[0m ([37mSELECT[0m id_hook[0m [37mFROM[0m [35;1m`PREFIX_hook`[0m [37mWHERE[0m name[0m =[0m [34;1m'displayFooter'[0m) [37mAND[0m id_module[0m =[0m ([37mSELECT[0m id_module[0m [37mFROM[0m [35;1m`PREFIX_module`[0m [37mWHERE[0m name[0m =[0m [34;1m'blockreinsurance'[0m) - -[37mALTER TABLE[0m [35;1m`PREFIX_employee`[0m [37mADD[0m [35;1m`bo_color`[0m varchar[0m([32;1m32[0m) [37mdefault[0m [37mNULL[0m [37mAFTER[0m [35;1m`stats_date_to`[0m - -[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_cms_category_lang`[0m [37mVALUES[0m([32;1m1[0m,[0m [32;1m3[0m,[0m [34;1m'Inicio'[0m,[0m [34;1m''[0m,[0m [34;1m'home'[0m,[0m [37mNULL[0m,[0m [37mNULL[0m,[0m [37mNULL[0m) - -[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_cms_category`[0m [37mVALUES[0m([32;1m1[0m,[0m [32;1m0[0m,[0m [32;1m0[0m,[0m [32;1m1[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m,[0m[32;1m0[0m) - -[37mUPDATE[0m [35;1m`PREFIX_cms_category`[0m [37mSET[0m [35;1m`position`[0m =[0m [32;1m0[0m - -[37mALTER TABLE[0m [35;1m`PREFIX_customer`[0m [37mADD[0m [35;1m`note`[0m text[0m [37mAFTER[0m [35;1m`secure_key`[0m - -[37mALTER TABLE[0m [35;1m`PREFIX_contact`[0m [37mADD[0m [35;1m`customer_service`[0m tinyint[0m([32;1m1[0m) [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [32;1m0[0m [37mAFTER[0m [35;1m`email`[0m - -[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_specific_price`[0m ([35;1m`id_product`[0m,[0m [35;1m`id_shop`[0m,[0m [35;1m`id_currency`[0m,[0m [35;1m`id_country`[0m,[0m [35;1m`id_group`[0m,[0m [35;1m`priority`[0m,[0m [35;1m`price`[0m,[0m [35;1m`from_quantity`[0m,[0m [35;1m`reduction`[0m,[0m [35;1m`reduction_type`[0m,[0m [35;1m`from`[0m,[0m [35;1m`to`[0m) - ( [37mSELECT[0m dq[0m.[0m[35;1m`id_product`[0m,[0m [32;1m1[0m,[0m [32;1m1[0m,[0m [32;1m0[0m,[0m [32;1m1[0m,[0m [32;1m0[0m,[0m [32;1m0.00[0m,[0m dq[0m.[0m[35;1m`quantity`[0m,[0m [37mIF[0m(dq[0m.[0m[35;1m`id_discount_type`[0m =[0m [32;1m2[0m,[0m dq[0m.[0m[35;1m`value`[0m,[0m dq[0m.[0m[35;1m`value`[0m /[0m [32;1m100[0m),[0m [37mIF[0m (dq[0m.[0m[35;1m`id_discount_type`[0m =[0m [32;1m2[0m,[0m [34;1m'amount'[0m,[0m [34;1m'percentage'[0m),[0m [34;1m'0000-00-00 00:00:00'[0m,[0m [34;1m'0000-00-00 00:00:00'[0m - [37mFROM[0m [35;1m`PREFIX_discount_quantity`[0m dq[0m - [37mINNER JOIN[0m [35;1m`PREFIX_product`[0m p[0m [37mON[0m (p[0m.[0m[35;1m`id_product`[0m =[0m dq[0m.[0m[35;1m`id_product`[0m) - ) - -[37mDROP[0m [37mTABLE[0m [35;1m`PREFIX_discount_quantity`[0m - -[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_specific_price`[0m ([35;1m`id_product`[0m,[0m [35;1m`id_shop`[0m,[0m [35;1m`id_currency`[0m,[0m [35;1m`id_country`[0m,[0m [35;1m`id_group`[0m,[0m [35;1m`priority`[0m,[0m [35;1m`price`[0m,[0m [35;1m`from_quantity`[0m,[0m [35;1m`reduction`[0m,[0m [35;1m`reduction_type`[0m,[0m [35;1m`from`[0m,[0m [35;1m`to`[0m) ( - [37mSELECT[0m - p[0m.[0m[35;1m`id_product`[0m,[0m - [32;1m1[0m,[0m - [32;1m0[0m,[0m - [32;1m0[0m,[0m - [32;1m0[0m,[0m - [32;1m0[0m,[0m - [32;1m0.00[0m,[0m - [32;1m1[0m,[0m - [37mIF[0m(p[0m.[0m[35;1m`reduction_price`[0m >[0m [32;1m0[0m,[0m p[0m.[0m[35;1m`reduction_price`[0m,[0m p[0m.[0m[35;1m`reduction_percent`[0m /[0m [32;1m100[0m),[0m - [37mIF[0m(p[0m.[0m[35;1m`reduction_price`[0m >[0m [32;1m0[0m,[0m [34;1m'amount'[0m,[0m [34;1m'percentage'[0m),[0m - [37mIF[0m (p[0m.[0m[35;1m`reduction_from`[0m =[0m p[0m.[0m[35;1m`reduction_to`[0m,[0m [34;1m'0000-00-00 00:00:00'[0m,[0m p[0m.[0m[35;1m`reduction_from`[0m),[0m - [37mIF[0m (p[0m.[0m[35;1m`reduction_from`[0m =[0m p[0m.[0m[35;1m`reduction_to`[0m,[0m [34;1m'0000-00-00 00:00:00'[0m,[0m p[0m.[0m[35;1m`reduction_to`[0m) - [37mFROM[0m [35;1m`PREFIX_product`[0m p[0m - [37mWHERE[0m p[0m.[0m[35;1m`reduction_price`[0m [37mOR[0m p[0m.[0m[35;1m`reduction_percent`[0m + [35;1m`id_specific_price_rule`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mAUTO_INCREMENT[0m,[0m + [35;1m`name`[0m VARCHAR[0m([32;1m255[0m) [37mNOT[0m [37mNULL[0m,[0m + [35;1m`id_shop`[0m int[0m([32;1m11[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'1'[0m,[0m + [35;1m`id_currency`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m + [35;1m`id_country`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m + [35;1m`id_group`[0m int[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m + [35;1m`from_quantity`[0m mediumint[0m([32;1m8[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m + [35;1m`price`[0m DECIMAL[0m([32;1m20[0m,[0m [32;1m6[0m),[0m + [35;1m`reduction`[0m decimal[0m([32;1m20[0m,[0m [32;1m6[0m) [37mNOT[0m [37mNULL[0m,[0m + [35;1m`reduction_type`[0m enum[0m([34;1m'amount'[0m,[0m [34;1m'percentage'[0m) [37mNOT[0m [37mNULL[0m,[0m + [35;1m`from`[0m datetime[0m [37mNOT[0m [37mNULL[0m,[0m + [35;1m`to`[0m datetime[0m [37mNOT[0m [37mNULL[0m,[0m + [37mPRIMARY[0m [37mKEY[0m ([35;1m`id_specific_price_rule`[0m),[0m + [37mKEY[0m [35;1m`id_product`[0m ( + [35;1m`id_shop`[0m,[0m [35;1m`id_currency`[0m,[0m [35;1m`id_country`[0m,[0m + [35;1m`id_group`[0m,[0m [35;1m`from_quantity`[0m,[0m [35;1m`from`[0m,[0m + [35;1m`to`[0m + ) +) [37mENGINE[0m =[0m [37mENGINE_TYPE[0m [37mDEFAULT[0m [37mCHARSET[0m =[0m utf8[0m + +[37mUPDATE[0m + [35;1m`PREFIX_configuration`[0m +[37mSET[0m + value[0m =[0m [34;1m'6'[0m +[37mWHERE[0m + name[0m =[0m [34;1m'PS_SEARCH_WEIGHT_PNAME'[0m + +[37mUPDATE[0m + [35;1m`PREFIX_hook_module`[0m +[37mSET[0m + position[0m =[0m [32;1m1[0m +[37mWHERE[0m + id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'displayPayment'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'cheque'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'displayPaymentReturn'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'cheque'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'displayHome'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'homeslider'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'actionAuthentication'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'statsdata'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'actionShopDataDuplication'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'homeslider'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'displayTop'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'blocklanguages'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'actionCustomerAccountAdd'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'statsdata'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'displayCustomerAccount'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'favoriteproducts'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'displayAdminStatsModules'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'statsvisits'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'displayAdminStatsGraphEngine'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'graphvisifire'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'displayAdminStatsGridEngine'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'gridhtml'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'displayLeftColumnProduct'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'blocksharefb'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'actionSearch'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'statssearch'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'actionCategoryAdd'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'blockcategories'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'actionCategoryUpdate'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'blockcategories'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'actionCategoryDelete'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'blockcategories'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'actionAdminMetaSave'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'blockcategories'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'displayMyAccountBlock'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'favoriteproducts'[0m + ) + [37mOR[0m id_hook[0m =[0m ( + [37mSELECT[0m + id_hook[0m + [37mFROM[0m + [35;1m`PREFIX_hook`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'displayFooter'[0m + ) + [37mAND[0m id_module[0m =[0m ( + [37mSELECT[0m + id_module[0m + [37mFROM[0m + [35;1m`PREFIX_module`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'blockreinsurance'[0m + ) + +[37mALTER TABLE[0m + [35;1m`PREFIX_employee`[0m +[37mADD[0m + [35;1m`bo_color`[0m varchar[0m([32;1m32[0m) [37mdefault[0m [37mNULL[0m +[37mAFTER[0m + [35;1m`stats_date_to`[0m + +[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_cms_category_lang`[0m +[37mVALUES[0m + ( + [32;1m1[0m,[0m [32;1m3[0m,[0m [34;1m'Inicio'[0m,[0m [34;1m''[0m,[0m [34;1m'home'[0m,[0m [37mNULL[0m,[0m [37mNULL[0m,[0m + [37mNULL[0m + ) + +[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_cms_category`[0m +[37mVALUES[0m + ([32;1m1[0m,[0m [32;1m0[0m,[0m [32;1m0[0m,[0m [32;1m1[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m,[0m [32;1m0[0m) + +[37mUPDATE[0m + [35;1m`PREFIX_cms_category`[0m +[37mSET[0m + [35;1m`position`[0m =[0m [32;1m0[0m + +[37mALTER TABLE[0m + [35;1m`PREFIX_customer`[0m +[37mADD[0m + [35;1m`note`[0m text[0m +[37mAFTER[0m + [35;1m`secure_key`[0m + +[37mALTER TABLE[0m + [35;1m`PREFIX_contact`[0m +[37mADD[0m + [35;1m`customer_service`[0m tinyint[0m([32;1m1[0m) [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [32;1m0[0m +[37mAFTER[0m + [35;1m`email`[0m + +[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_specific_price`[0m ( + [35;1m`id_product`[0m,[0m [35;1m`id_shop`[0m,[0m [35;1m`id_currency`[0m,[0m + [35;1m`id_country`[0m,[0m [35;1m`id_group`[0m,[0m [35;1m`priority`[0m,[0m + [35;1m`price`[0m,[0m [35;1m`from_quantity`[0m,[0m [35;1m`reduction`[0m,[0m + [35;1m`reduction_type`[0m,[0m [35;1m`from`[0m,[0m [35;1m`to`[0m +) ( + [37mSELECT[0m + dq[0m.[0m[35;1m`id_product`[0m,[0m + [32;1m1[0m,[0m + [32;1m1[0m,[0m + [32;1m0[0m,[0m + [32;1m1[0m,[0m + [32;1m0[0m,[0m + [32;1m0.00[0m,[0m + dq[0m.[0m[35;1m`quantity`[0m,[0m + [37mIF[0m( + dq[0m.[0m[35;1m`id_discount_type`[0m =[0m [32;1m2[0m,[0m dq[0m.[0m[35;1m`value`[0m,[0m + dq[0m.[0m[35;1m`value`[0m /[0m [32;1m100[0m + ),[0m + [37mIF[0m ( + dq[0m.[0m[35;1m`id_discount_type`[0m =[0m [32;1m2[0m,[0m [34;1m'amount'[0m,[0m + [34;1m'percentage'[0m + ),[0m + [34;1m'0000-00-00 00:00:00'[0m,[0m + [34;1m'0000-00-00 00:00:00'[0m + [37mFROM[0m + [35;1m`PREFIX_discount_quantity`[0m dq[0m + [37mINNER JOIN[0m [35;1m`PREFIX_product`[0m p[0m [37mON[0m (p[0m.[0m[35;1m`id_product`[0m =[0m dq[0m.[0m[35;1m`id_product`[0m) ) -[37mALTER TABLE[0m [35;1m`PREFIX_product`[0m - [37mDROP[0m [35;1m`reduction_price`[0m,[0m - [37mDROP[0m [35;1m`reduction_percent`[0m,[0m - [37mDROP[0m [35;1m`reduction_from`[0m,[0m - [37mDROP[0m [35;1m`reduction_to`[0m - -[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_configuration`[0m ([35;1m`name`[0m,[0m [35;1m`value`[0m,[0m [35;1m`date_add`[0m,[0m [35;1m`date_upd`[0m) [37mVALUES[0m -([34;1m'PS_SPECIFIC_PRICE_PRIORITIES'[0m,[0m [34;1m'id_shop;id_currency;id_country;id_group'[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m),[0m -([34;1m'PS_TAX_DISPLAY'[0m,[0m [32;1m0[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m),[0m -([34;1m'PS_SMARTY_FORCE_COMPILE'[0m,[0m [32;1m1[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m),[0m -([34;1m'PS_DISTANCE_UNIT'[0m,[0m [34;1m'km'[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m),[0m -([34;1m'PS_STORES_DISPLAY_CMS'[0m,[0m [32;1m0[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m),[0m -([34;1m'PS_STORES_DISPLAY_FOOTER'[0m,[0m [32;1m0[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m),[0m -([34;1m'PS_STORES_SIMPLIFIED'[0m,[0m [32;1m0[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m),[0m -([34;1m'PS_STATSDATA_CUSTOMER_PAGESVIEWS'[0m,[0m [32;1m1[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m),[0m -([34;1m'PS_STATSDATA_PAGESVIEWS'[0m,[0m [32;1m1[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m),[0m -([34;1m'PS_STATSDATA_PLUGINS'[0m,[0m [32;1m1[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m) - -[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_configuration`[0m ([35;1m`name`[0m,[0m [35;1m`value`[0m,[0m [35;1m`date_add`[0m,[0m [35;1m`date_upd`[0m) [37mVALUES[0m ([34;1m'PS_CONDITIONS_CMS_ID'[0m,[0m [37mIFNULL[0m(([37mSELECT[0m [35;1m`id_cms`[0m [37mFROM[0m [35;1m`PREFIX_cms`[0m [37mWHERE[0m [35;1m`id_cms`[0m =[0m [32;1m3[0m),[0m [32;1m0[0m),[0m [37mNOW()[0m,[0m [37mNOW()[0m) - -[37mCREATE[0m [37mTEMPORARY[0m [37mTABLE[0m [35;1m`PREFIX_configuration_tmp`[0m ( - [35;1m`value`[0m text[0m +[37mDROP[0m + [37mTABLE[0m [35;1m`PREFIX_discount_quantity`[0m + +[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_specific_price`[0m ( + [35;1m`id_product`[0m,[0m [35;1m`id_shop`[0m,[0m [35;1m`id_currency`[0m,[0m + [35;1m`id_country`[0m,[0m [35;1m`id_group`[0m,[0m [35;1m`priority`[0m,[0m + [35;1m`price`[0m,[0m [35;1m`from_quantity`[0m,[0m [35;1m`reduction`[0m,[0m + [35;1m`reduction_type`[0m,[0m [35;1m`from`[0m,[0m [35;1m`to`[0m +) ( + [37mSELECT[0m + p[0m.[0m[35;1m`id_product`[0m,[0m + [32;1m1[0m,[0m + [32;1m0[0m,[0m + [32;1m0[0m,[0m + [32;1m0[0m,[0m + [32;1m0[0m,[0m + [32;1m0.00[0m,[0m + [32;1m1[0m,[0m + [37mIF[0m( + p[0m.[0m[35;1m`reduction_price`[0m >[0m [32;1m0[0m,[0m p[0m.[0m[35;1m`reduction_price`[0m,[0m + p[0m.[0m[35;1m`reduction_percent`[0m /[0m [32;1m100[0m + ),[0m + [37mIF[0m( + p[0m.[0m[35;1m`reduction_price`[0m >[0m [32;1m0[0m,[0m [34;1m'amount'[0m,[0m + [34;1m'percentage'[0m + ),[0m + [37mIF[0m ( + p[0m.[0m[35;1m`reduction_from`[0m =[0m p[0m.[0m[35;1m`reduction_to`[0m,[0m + [34;1m'0000-00-00 00:00:00'[0m,[0m p[0m.[0m[35;1m`reduction_from`[0m + ),[0m + [37mIF[0m ( + p[0m.[0m[35;1m`reduction_from`[0m =[0m p[0m.[0m[35;1m`reduction_to`[0m,[0m + [34;1m'0000-00-00 00:00:00'[0m,[0m p[0m.[0m[35;1m`reduction_to`[0m + ) + [37mFROM[0m + [35;1m`PREFIX_product`[0m p[0m + [37mWHERE[0m + p[0m.[0m[35;1m`reduction_price`[0m + [37mOR[0m p[0m.[0m[35;1m`reduction_percent`[0m ) -[37mSET[0m [36;1m@defaultOOS[0m =[0m ([37mSELECT[0m value[0m [37mFROM[0m [35;1m`PREFIX_configuration`[0m [37mWHERE[0m name[0m =[0m [34;1m'PS_ORDER_OUT_OF_STOCK'[0m) - -[37mUPDATE[0m [35;1m`PREFIX_product`[0m p[0m [37mSET[0m [35;1m`cache_default_attribute`[0m =[0m [32;1m0[0m [37mWHERE[0m [35;1m`id_product`[0m [37mNOT[0m [37mIN[0m ([37mSELECT[0m [35;1m`id_product`[0m [37mFROM[0m [35;1m`PREFIX_product_attribute`[0m) - -[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_hook`[0m ([35;1m`name`[0m,[0m [35;1m`title`[0m,[0m [35;1m`description`[0m,[0m [35;1m`position`[0m) [37mVALUES[0m ([34;1m'processCarrier'[0m,[0m [34;1m'Carrier Process'[0m,[0m [37mNULL[0m,[0m [32;1m0[0m) - -[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_stock_mvt_reason_lang`[0m ([35;1m`id_stock_mvt_reason`[0m,[0m [35;1m`id_lang`[0m,[0m [35;1m`name`[0m) [37mVALUES[0m -([32;1m1[0m,[0m [32;1m1[0m,[0m [34;1m'Order'[0m),[0m -([32;1m1[0m,[0m [32;1m2[0m,[0m [34;1m'Commande'[0m),[0m -([32;1m2[0m,[0m [32;1m1[0m,[0m [34;1m'Missing Stock Movement'[0m),[0m -([32;1m2[0m,[0m [32;1m2[0m,[0m [34;1m'Mouvement de stock manquant'[0m),[0m -([32;1m3[0m,[0m [32;1m1[0m,[0m [34;1m'Restocking'[0m),[0m -([32;1m3[0m,[0m [32;1m2[0m,[0m [34;1m'Réassort'[0m) - -[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_meta_lang`[0m ([35;1m`id_lang`[0m,[0m [35;1m`id_meta`[0m,[0m [35;1m`title`[0m,[0m [35;1m`url_rewrite`[0m) [37mVALUES[0m -([32;1m1[0m,[0m ([37mSELECT[0m [35;1m`id_meta`[0m [37mFROM[0m [35;1m`PREFIX_meta`[0m [37mWHERE[0m [35;1m`page`[0m =[0m [34;1m'authentication'[0m),[0m [34;1m'Authentication'[0m,[0m [34;1m'authentication'[0m),[0m -([32;1m2[0m,[0m ([37mSELECT[0m [35;1m`id_meta`[0m [37mFROM[0m [35;1m`PREFIX_meta`[0m [37mWHERE[0m [35;1m`page`[0m =[0m [34;1m'authentication'[0m),[0m [34;1m'Authentification'[0m,[0m [34;1m'authentification'[0m),[0m -([32;1m3[0m,[0m ([37mSELECT[0m [35;1m`id_meta`[0m [37mFROM[0m [35;1m`PREFIX_meta`[0m [37mWHERE[0m [35;1m`page`[0m =[0m [34;1m'authentication'[0m),[0m [34;1m'Autenticación'[0m,[0m [34;1m'autenticacion'[0m) +[37mALTER TABLE[0m + [35;1m`PREFIX_product`[0m +[37mDROP[0m + [35;1m`reduction_price`[0m,[0m +[37mDROP[0m + [35;1m`reduction_percent`[0m,[0m +[37mDROP[0m + [35;1m`reduction_from`[0m,[0m +[37mDROP[0m + [35;1m`reduction_to`[0m + +[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_configuration`[0m ( + [35;1m`name`[0m,[0m [35;1m`value`[0m,[0m [35;1m`date_add`[0m,[0m [35;1m`date_upd`[0m +) +[37mVALUES[0m + ( + [34;1m'PS_SPECIFIC_PRICE_PRIORITIES'[0m,[0m + [34;1m'id_shop;id_currency;id_country;id_group'[0m,[0m + [37mNOW()[0m,[0m [37mNOW()[0m + ),[0m + ([34;1m'PS_TAX_DISPLAY'[0m,[0m [32;1m0[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m),[0m + ( + [34;1m'PS_SMARTY_FORCE_COMPILE'[0m,[0m [32;1m1[0m,[0m [37mNOW()[0m,[0m + [37mNOW()[0m + ),[0m + ( + [34;1m'PS_DISTANCE_UNIT'[0m,[0m [34;1m'km'[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m + ),[0m + ( + [34;1m'PS_STORES_DISPLAY_CMS'[0m,[0m [32;1m0[0m,[0m [37mNOW()[0m,[0m + [37mNOW()[0m + ),[0m + ( + [34;1m'PS_STORES_DISPLAY_FOOTER'[0m,[0m [32;1m0[0m,[0m [37mNOW()[0m,[0m + [37mNOW()[0m + ),[0m + ( + [34;1m'PS_STORES_SIMPLIFIED'[0m,[0m [32;1m0[0m,[0m [37mNOW()[0m,[0m + [37mNOW()[0m + ),[0m + ( + [34;1m'PS_STATSDATA_CUSTOMER_PAGESVIEWS'[0m,[0m + [32;1m1[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m + ),[0m + ( + [34;1m'PS_STATSDATA_PAGESVIEWS'[0m,[0m [32;1m1[0m,[0m [37mNOW()[0m,[0m + [37mNOW()[0m + ),[0m + ( + [34;1m'PS_STATSDATA_PLUGINS'[0m,[0m [32;1m1[0m,[0m [37mNOW()[0m,[0m + [37mNOW()[0m + ) + +[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_configuration`[0m ( + [35;1m`name`[0m,[0m [35;1m`value`[0m,[0m [35;1m`date_add`[0m,[0m [35;1m`date_upd`[0m +) +[37mVALUES[0m + ( + [34;1m'PS_CONDITIONS_CMS_ID'[0m,[0m + [37mIFNULL[0m( + ( + [37mSELECT[0m + [35;1m`id_cms`[0m + [37mFROM[0m + [35;1m`PREFIX_cms`[0m + [37mWHERE[0m + [35;1m`id_cms`[0m =[0m [32;1m3[0m + ),[0m + [32;1m0[0m + ),[0m + [37mNOW()[0m,[0m + [37mNOW()[0m + ) + +[37mCREATE[0m [37mTEMPORARY[0m [37mTABLE[0m [35;1m`PREFIX_configuration_tmp`[0m ([35;1m`value`[0m text[0m) + +[37mSET[0m + [36;1m@defaultOOS[0m =[0m ( + [37mSELECT[0m + value[0m + [37mFROM[0m + [35;1m`PREFIX_configuration`[0m + [37mWHERE[0m + name[0m =[0m [34;1m'PS_ORDER_OUT_OF_STOCK'[0m + ) + +[37mUPDATE[0m + [35;1m`PREFIX_product`[0m p[0m +[37mSET[0m + [35;1m`cache_default_attribute`[0m =[0m [32;1m0[0m +[37mWHERE[0m + [35;1m`id_product`[0m [37mNOT[0m [37mIN[0m ( + [37mSELECT[0m + [35;1m`id_product`[0m + [37mFROM[0m + [35;1m`PREFIX_product_attribute`[0m + ) + +[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_hook`[0m ( + [35;1m`name`[0m,[0m [35;1m`title`[0m,[0m [35;1m`description`[0m,[0m [35;1m`position`[0m +) +[37mVALUES[0m + ( + [34;1m'processCarrier'[0m,[0m [34;1m'Carrier Process'[0m,[0m + [37mNULL[0m,[0m [32;1m0[0m + ) + +[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_stock_mvt_reason_lang`[0m ( + [35;1m`id_stock_mvt_reason`[0m,[0m [35;1m`id_lang`[0m,[0m + [35;1m`name`[0m +) +[37mVALUES[0m + ([32;1m1[0m,[0m [32;1m1[0m,[0m [34;1m'Order'[0m),[0m + ([32;1m1[0m,[0m [32;1m2[0m,[0m [34;1m'Commande'[0m),[0m + ([32;1m2[0m,[0m [32;1m1[0m,[0m [34;1m'Missing Stock Movement'[0m),[0m + ( + [32;1m2[0m,[0m [32;1m2[0m,[0m [34;1m'Mouvement de stock manquant'[0m + ),[0m + ([32;1m3[0m,[0m [32;1m1[0m,[0m [34;1m'Restocking'[0m),[0m + ([32;1m3[0m,[0m [32;1m2[0m,[0m [34;1m'Réassort'[0m) + +[37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_meta_lang`[0m ( + [35;1m`id_lang`[0m,[0m [35;1m`id_meta`[0m,[0m [35;1m`title`[0m,[0m [35;1m`url_rewrite`[0m +) +[37mVALUES[0m + ( + [32;1m1[0m,[0m + ( + [37mSELECT[0m + [35;1m`id_meta`[0m + [37mFROM[0m + [35;1m`PREFIX_meta`[0m + [37mWHERE[0m + [35;1m`page`[0m =[0m [34;1m'authentication'[0m + ),[0m + [34;1m'Authentication'[0m,[0m + [34;1m'authentication'[0m + ),[0m + ( + [32;1m2[0m,[0m + ( + [37mSELECT[0m + [35;1m`id_meta`[0m + [37mFROM[0m + [35;1m`PREFIX_meta`[0m + [37mWHERE[0m + [35;1m`page`[0m =[0m [34;1m'authentication'[0m + ),[0m + [34;1m'Authentification'[0m,[0m + [34;1m'authentification'[0m + ),[0m + ( + [32;1m3[0m,[0m + ( + [37mSELECT[0m + [35;1m`id_meta`[0m + [37mFROM[0m + [35;1m`PREFIX_meta`[0m + [37mWHERE[0m + [35;1m`page`[0m =[0m [34;1m'authentication'[0m + ),[0m + [34;1m'Autenticación'[0m,[0m + [34;1m'autenticacion'[0m + ) [37mLOCK[0m [37mTABLES[0m [35;1m`admin_assert`[0m [37mWRITE[0m [37mUNLOCK[0m [37mTABLES[0m -[37mDROP[0m [37mTABLE[0m [37mIF[0m [37mEXISTS[0m [35;1m`admin_role`[0m - -[37mSELECT[0m *[0m [37mFROM[0m -[30;1m-- This is another comment[0m -MyTable[0m [30;1m# One final comment[0m -[30;1m/* This is a block comment -*/[0m [37mWHERE[0m [32;1m1[0m =[0m [32;1m2[0m;[0m - -[37mSELECT[0m [30;1m-- This is a test[0m - -[37mSELECT[0m Test[0m [37mFROM[0m Test[0m [37mWHERE[0m -( - MyColumn[0m =[0m [32;1m1[0m )) [37mAND[0m ((( SomeOtherColumn[0m =[0m [32;1m2[0m);[0m
\ No newline at end of file +[37mDROP[0m + [37mTABLE[0m [37mIF[0m [37mEXISTS[0m [35;1m`admin_role`[0m + +[37mSELECT[0m + *[0m +[37mFROM[0m + [30;1m-- This is another comment[0m + MyTable[0m [30;1m# One final comment[0m + + [30;1m/* This is a block comment + */[0m +[37mWHERE[0m + [32;1m1[0m =[0m [32;1m2[0m;[0m + +[37mSELECT[0m + [30;1m-- This is a test[0m + +[37mSELECT[0m + Test[0m +[37mFROM[0m + Test[0m +[37mWHERE[0m + (MyColumn[0m =[0m [32;1m1[0m) +[31;1;7m)[0m +[37mAND[0m ( + ( + (SomeOtherColumn[0m =[0m [32;1m2[0m);[0m +[31;1;7mWARNING: unclosed parentheses or section[0m + +[37mSELECT[0m + *[0m +[37mLIMIT[0m + [32;1m1[0m;[0m +[37mSELECT[0m + a[0m,[0m + b[0m,[0m + c[0m,[0m + d[0m +[37mFROM[0m + e[0m +[37mLIMIT[0m + [32;1m1[0m,[0m [32;1m2[0m;[0m +[37mSELECT[0m + [32;1m1[0m,[0m + [32;1m2[0m,[0m + [32;1m3[0m +[37mWHERE[0m + a[0m [37min[0m ([32;1m1[0m,[0m [32;1m2[0m,[0m [32;1m3[0m,[0m [32;1m4[0m,[0m [32;1m5[0m) + [37mand[0m b[0m =[0m [32;1m5[0m;[0m + +[37mSELECT[0m + [36;1m@"weird variable name"[0m;[0m + +[37mSELECT[0m + [34;1m"no closing quote +[0m
\ No newline at end of file diff --git a/tests/compress.html b/tests/compress.html index 24fb38e..22d9a0f 100644 --- a/tests/compress.html +++ b/tests/compress.html @@ -64,4 +64,10 @@ SELECT * FROM MyTable WHERE 1 = 2; SELECT -SELECT Test FROM Test WHERE ( MyColumn = 1 )) AND ((( SomeOtherColumn = 2);
\ No newline at end of file +SELECT Test FROM Test WHERE ( MyColumn = 1 )) AND ((( SomeOtherColumn = 2); + +SELECT * LIMIT 1; SELECT a,b,c,d FROM e LIMIT 1, 2; SELECT 1,2,3 WHERE a in (1,2,3,4,5) and b=5; + +SELECT @"weird variable name"; + +SELECT "no closing quote
\ No newline at end of file diff --git a/tests/format-highlight.html b/tests/format-highlight.html index ee70147..62ddfe5 100644 --- a/tests/format-highlight.html +++ b/tests/format-highlight.html @@ -755,4 +755,32 @@ <span style="font-weight:bold;">AND</span> ( ( (<span style="color: #333;">SomeOtherColumn</span> <span >=</span> <span style="color: green;">2</span>)<span >;</span> -<span style="background-color: red;">WARNING: unclosed parentheses or section</span></pre>
\ No newline at end of file +<span style="background-color: red;">WARNING: unclosed parentheses or section</span></pre> + +<pre style="color: black; background-color: white;"><span style="font-weight:bold;">SELECT</span> + <span >*</span> +<span style="font-weight:bold;">LIMIT</span> + <span style="color: green;">1</span><span >;</span> +<span style="font-weight:bold;">SELECT</span> + <span style="color: #333;">a</span><span >,</span> + <span style="color: #333;">b</span><span >,</span> + <span style="color: #333;">c</span><span >,</span> + <span style="color: #333;">d</span> +<span style="font-weight:bold;">FROM</span> + <span style="color: #333;">e</span> +<span style="font-weight:bold;">LIMIT</span> + <span style="color: green;">1</span><span >,</span> <span style="color: green;">2</span><span >;</span> +<span style="font-weight:bold;">SELECT</span> + <span style="color: green;">1</span><span >,</span> + <span style="color: green;">2</span><span >,</span> + <span style="color: green;">3</span> +<span style="font-weight:bold;">WHERE</span> + <span style="color: #333;">a</span> <span style="font-weight:bold;">in</span> (<span style="color: green;">1</span><span >,</span> <span style="color: green;">2</span><span >,</span> <span style="color: green;">3</span><span >,</span> <span style="color: green;">4</span><span >,</span> <span style="color: green;">5</span>) + <span style="font-weight:bold;">and</span> <span style="color: #333;">b</span> <span >=</span> <span style="color: green;">5</span><span >;</span></pre> + +<pre style="color: black; background-color: white;"><span style="font-weight:bold;">SELECT</span> + <span style="color: orange;">@"weird variable name"</span><span >;</span></pre> + +<pre style="color: black; background-color: white;"><span style="font-weight:bold;">SELECT</span> + <span style="color: blue;">"no closing quote +</span></pre>
\ No newline at end of file diff --git a/tests/format.html b/tests/format.html index 6c88c75..8a00903 100644 --- a/tests/format.html +++ b/tests/format.html @@ -754,4 +754,31 @@ WHERE ) AND ( ( - (SomeOtherColumn = 2);
\ No newline at end of file + (SomeOtherColumn = 2); + +SELECT + * +LIMIT + 1; +SELECT + a, + b, + c, + d +FROM + e +LIMIT + 1, 2; +SELECT + 1, + 2, + 3 +WHERE + a in (1, 2, 3, 4, 5) + and b = 5; + +SELECT + @"weird variable name"; + +SELECT + "no closing quote
\ No newline at end of file diff --git a/tests/highlight.html b/tests/highlight.html index 9579569..eace684 100644 --- a/tests/highlight.html +++ b/tests/highlight.html @@ -242,4 +242,11 @@ <pre style="color: black; background-color: white;"><span style="font-weight:bold;">SELECT</span> <span style="color: #333;">Test</span> <span style="font-weight:bold;">FROM</span> <span style="color: #333;">Test</span> <span style="font-weight:bold;">WHERE</span> ( - <span style="color: #333;">MyColumn</span> <span >=</span> <span style="color: green;">1</span> )) <span style="font-weight:bold;">AND</span> ((( <span style="color: #333;">SomeOtherColumn</span> <span >=</span> <span style="color: green;">2</span>)<span >;</span></pre>
\ No newline at end of file + <span style="color: #333;">MyColumn</span> <span >=</span> <span style="color: green;">1</span> )) <span style="font-weight:bold;">AND</span> ((( <span style="color: #333;">SomeOtherColumn</span> <span >=</span> <span style="color: green;">2</span>)<span >;</span></pre> + +<pre style="color: black; background-color: white;"><span style="font-weight:bold;">SELECT</span> <span >*</span> <span style="font-weight:bold;">LIMIT</span> <span style="color: green;">1</span><span >;</span> <span style="font-weight:bold;">SELECT</span> <span style="color: #333;">a</span><span >,</span><span style="color: #333;">b</span><span >,</span><span style="color: #333;">c</span><span >,</span><span style="color: #333;">d</span> <span style="font-weight:bold;">FROM</span> <span style="color: #333;">e</span> <span style="font-weight:bold;">LIMIT</span> <span style="color: green;">1</span><span >,</span> <span style="color: green;">2</span><span >;</span> <span style="font-weight:bold;">SELECT</span> <span style="color: green;">1</span><span >,</span><span style="color: green;">2</span><span >,</span><span style="color: green;">3</span> <span style="font-weight:bold;">WHERE</span> <span style="color: #333;">a</span> <span style="font-weight:bold;">in</span> (<span style="color: green;">1</span><span >,</span><span style="color: green;">2</span><span >,</span><span style="color: green;">3</span><span >,</span><span style="color: green;">4</span><span >,</span><span style="color: green;">5</span>) <span style="font-weight:bold;">and</span> <span style="color: #333;">b</span><span >=</span><span style="color: green;">5</span><span >;</span></pre> + +<pre style="color: black; background-color: white;"><span style="font-weight:bold;">SELECT</span> <span style="color: orange;">@"weird variable name"</span><span >;</span></pre> + +<pre style="color: black; background-color: white;"><span style="font-weight:bold;">SELECT</span> <span style="color: blue;">"no closing quote +</span></pre>
\ No newline at end of file diff --git a/tests/sql.sql b/tests/sql.sql index f1b358f..c78282f 100644 --- a/tests/sql.sql +++ b/tests/sql.sql @@ -243,3 +243,9 @@ SELECT -- This is a test SELECT Test FROM Test WHERE ( MyColumn = 1 )) AND ((( SomeOtherColumn = 2); + +SELECT * LIMIT 1; SELECT a,b,c,d FROM e LIMIT 1, 2; SELECT 1,2,3 WHERE a in (1,2,3,4,5) and b=5; + +SELECT @"weird variable name"; + +SELECT "no closing quote |