$expectedTokens */
public static function assertEqualsTokens(array $expectedTokens, Cursor $cursor): void
{
@@ -171,7 +1703,7 @@ public static function tokenizeLongConcatData(): Generator
$expectedTokens[] = new Token(Token::TOKEN_TYPE_WHITESPACE, ' ');
$expectedTokens[] = new Token(Token::TOKEN_TYPE_RESERVED, 'as');
$expectedTokens[] = new Token(Token::TOKEN_TYPE_WHITESPACE, ' ');
- $expectedTokens[] = new Token(Token::TOKEN_TYPE_WORD, 'blob');
+ $expectedTokens[] = new Token(Token::TOKEN_TYPE_RESERVED, 'blob');
$expectedTokens[] = new Token(Token::TOKEN_TYPE_BOUNDARY, ')');
}
diff --git a/tests/clihighlight.txt b/tests/clihighlight.txt
index 4d4386c..32e74cb 100644
--- a/tests/clihighlight.txt
+++ b/tests/clihighlight.txt
@@ -46,30 +46,30 @@
[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`id_address`[0m [37mint[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mauto_increment[0m,[0m
+ [35;1m`id_country`[0m [37mint[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m
+ [35;1m`id_state`[0m [37mint[0m([32;1m10[0m) [37munsigned[0m [37mdefault[0m [37mNULL[0m,[0m
+ [35;1m`id_customer`[0m [37mint[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m
+ [35;1m`id_manufacturer`[0m [37mint[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m
+ [35;1m`id_supplier`[0m [37mint[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m
+ [35;1m`id_warehouse`[0m [37mint[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m
+ [35;1m`alias`[0m [37mvarchar[0m([32;1m32[0m) [37mNOT[0m [37mNULL[0m,[0m
+ [35;1m`company`[0m [37mvarchar[0m([32;1m64[0m) [37mdefault[0m [37mNULL[0m,[0m
+ [35;1m`lastname`[0m [37mvarchar[0m([32;1m32[0m) [37mNOT[0m [37mNULL[0m,[0m
+ [35;1m`firstname`[0m [37mvarchar[0m([32;1m32[0m) [37mNOT[0m [37mNULL[0m,[0m
+ [35;1m`address1`[0m [37mvarchar[0m([32;1m128[0m) [37mNOT[0m [37mNULL[0m,[0m
+ [35;1m`address2`[0m [37mvarchar[0m([32;1m128[0m) [37mdefault[0m [37mNULL[0m,[0m
+ [35;1m`postcode`[0m [37mvarchar[0m([32;1m12[0m) [37mdefault[0m [37mNULL[0m,[0m
+ [35;1m`city`[0m [37mvarchar[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`phone`[0m [37mvarchar[0m([32;1m16[0m) [37mdefault[0m [37mNULL[0m,[0m
+ [35;1m`phone_mobile`[0m [37mvarchar[0m([32;1m16[0m) [37mdefault[0m [37mNULL[0m,[0m
+ [35;1m`vat_number`[0m [37mvarchar[0m([32;1m32[0m) [37mdefault[0m [37mNULL[0m,[0m
+ [35;1m`dni`[0m [37mvarchar[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
+ [35;1m`active`[0m [37mtinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'1'[0m,[0m
+ [35;1m`deleted`[0m [37mtinyint[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
@@ -80,51 +80,51 @@
) [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
+ [35;1m`id_alias`[0m [37mint[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mauto_increment[0m,[0m
+ [35;1m`alias`[0m [37mvarchar[0m([32;1m255[0m) [37mNOT[0m [37mNULL[0m,[0m
+ [35;1m`search`[0m [37mvarchar[0m([32;1m255[0m) [37mNOT[0m [37mNULL[0m,[0m
+ [35;1m`active`[0m [37mtinyint[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 =[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
+ [35;1m`id_carrier`[0m [37mint[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mAUTO_INCREMENT[0m,[0m
+ [35;1m`id_reference`[0m [37mint[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m
+ [35;1m`id_tax_rules_group`[0m [37mint[0m([32;1m10[0m) [37munsigned[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m
+ [35;1m`name`[0m [37mvarchar[0m([32;1m64[0m) [37mNOT[0m [37mNULL[0m,[0m
+ [35;1m`url`[0m [37mvarchar[0m([32;1m255[0m) [37mDEFAULT[0m [37mNULL[0m,[0m
+ [35;1m`active`[0m [37mtinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m
+ [35;1m`deleted`[0m [37mtinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m
+ [35;1m`shipping_handling`[0m [37mtinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'1'[0m,[0m
+ [35;1m`range_behavior`[0m [37mtinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m
+ [35;1m`is_module`[0m [37mtinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m
+ [35;1m`is_free`[0m [37mtinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m
+ [35;1m`shipping_external`[0m [37mtinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m
+ [35;1m`need_range`[0m [37mtinyint[0m([32;1m1[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m
+ [35;1m`external_module_name`[0m [37mvarchar[0m([32;1m64[0m) [37mDEFAULT[0m [37mNULL[0m,[0m
+ [35;1m`shipping_method`[0m [37mint[0m([32;1m2[0m) [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'0'[0m,[0m
+ [35;1m`position`[0m [37mint[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mdefault[0m [34;1m'0'[0m,[0m
+ [35;1m`max_width`[0m [37mint[0m([32;1m10[0m) [37mDEFAULT[0m [32;1m0[0m,[0m
+ [35;1m`max_height`[0m [37mint[0m([32;1m10[0m) [37mDEFAULT[0m [32;1m0[0m,[0m
+ [35;1m`max_depth`[0m [37mint[0m([32;1m10[0m) [37mDEFAULT[0m [32;1m0[0m,[0m
+ [35;1m`max_weight`[0m [37mint[0m([32;1m10[0m) [37mDEFAULT[0m [32;1m0[0m,[0m
+ [35;1m`grade`[0m [37mint[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 =[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`id_specific_price_rule`[0m [37mint[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mAUTO_INCREMENT[0m,[0m
+ [35;1m`name`[0m [37mVARCHAR[0m([32;1m255[0m) [37mNOT[0m [37mNULL[0m,[0m
+ [35;1m`id_shop`[0m [37mint[0m([32;1m11[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m [37mDEFAULT[0m [34;1m'1'[0m,[0m
+ [35;1m`id_currency`[0m [37mint[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m
+ [35;1m`id_country`[0m [37mint[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m
+ [35;1m`id_group`[0m [37mint[0m([32;1m10[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m
+ [35;1m`from_quantity`[0m [37mmediumint[0m([32;1m8[0m) [37munsigned[0m [37mNOT[0m [37mNULL[0m,[0m
+ [35;1m`price`[0m [37mDECIMAL[0m([32;1m20[0m,[0m [32;1m6[0m),[0m
+ [35;1m`reduction`[0m [37mdecimal[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
@@ -456,7 +456,7 @@
[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
+ [35;1m`bo_color`[0m [37mvarchar[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
@@ -490,7 +490,7 @@
[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
+ [35;1m`customer_service`[0m [37mtinyint[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
@@ -787,12 +787,12 @@
[37mALTER TABLE[0m
[35;1m`test_modify`[0m
[37mMODIFY[0m
- [35;1m`id`[0m INT[0m([32;1m11[0m) [37mUNSIGNED[0m [37mNOT[0m [37mNULL[0m;[0m
+ [35;1m`id`[0m [37mINT[0m([32;1m11[0m) [37mUNSIGNED[0m [37mNOT[0m [37mNULL[0m;[0m
---
[37mALTER TABLE[0m
[35;1m`test_change`[0m
[37mCHANGE[0m
- [35;1m`id`[0m [35;1m`_id`[0m BIGINT[0m([32;1m20[0m) [37mUNSIGNED[0m [37mNULL[0m;[0m
+ [35;1m`id`[0m [35;1m`_id`[0m [37mBIGINT[0m([32;1m20[0m) [37mUNSIGNED[0m [37mNULL[0m;[0m
---
[37mSELECT[0m
*[0m
@@ -952,7 +952,7 @@
a[0m
) [37mAS[0m filtered[0m,[0m
[37mCONVERT[0m(
- VARCHAR[0m([32;1m20[0m),[0m
+ [37mVARCHAR[0m([32;1m20[0m),[0m
[37mAVG[0m(SalesYTD[0m) [37mOVER[0m (
[37mPARTITION BY[0m
TerritoryID[0m
diff --git a/tests/format-highlight.html b/tests/format-highlight.html
index 7c9b1d9..358b86b 100644
--- a/tests/format-highlight.html
+++ b/tests/format-highlight.html
@@ -46,30 +46,30 @@
NAMES 'utf8';
---
CREATE TABLE `PREFIX_address` (
- `id_address` int(10) unsigned NOT NULL auto_increment,
- `id_country` int(10) unsigned NOT NULL,
- `id_state` int(10) unsigned default NULL,
- `id_customer` int(10) unsigned NOT NULL default '0',
- `id_manufacturer` int(10) unsigned NOT NULL default '0',
- `id_supplier` int(10) unsigned NOT NULL default '0',
- `id_warehouse` int(10) unsigned NOT NULL default '0',
- `alias` varchar(32) NOT NULL,
- `company` varchar(64) default NULL,
- `lastname` varchar(32) NOT NULL,
- `firstname` varchar(32) NOT NULL,
- `address1` varchar(128) NOT NULL,
- `address2` varchar(128) default NULL,
- `postcode` varchar(12) default NULL,
- `city` varchar(64) NOT NULL,
+ `id_address` int(10) unsigned NOT NULL auto_increment,
+ `id_country` int(10) unsigned NOT NULL,
+ `id_state` int(10) unsigned default NULL,
+ `id_customer` int(10) unsigned NOT NULL default '0',
+ `id_manufacturer` int(10) unsigned NOT NULL default '0',
+ `id_supplier` int(10) unsigned NOT NULL default '0',
+ `id_warehouse` int(10) unsigned NOT NULL default '0',
+ `alias` varchar(32) NOT NULL,
+ `company` varchar(64) default NULL,
+ `lastname` varchar(32) NOT NULL,
+ `firstname` varchar(32) NOT NULL,
+ `address1` varchar(128) NOT NULL,
+ `address2` varchar(128) default NULL,
+ `postcode` varchar(12) default NULL,
+ `city` varchar(64) NOT NULL,
`other` text,
- `phone` varchar(16) default NULL,
- `phone_mobile` varchar(16) default NULL,
- `vat_number` varchar(32) default NULL,
- `dni` varchar(16) DEFAULT NULL,
+ `phone` varchar(16) default NULL,
+ `phone_mobile` varchar(16) default NULL,
+ `vat_number` varchar(32) default NULL,
+ `dni` varchar(16) DEFAULT NULL,
`date_add` datetime NOT NULL,
`date_upd` datetime NOT NULL,
- `active` tinyint(1) unsigned NOT NULL default '1',
- `deleted` tinyint(1) unsigned NOT NULL default '0',
+ `active` tinyint(1) unsigned NOT NULL default '1',
+ `deleted` tinyint(1) unsigned NOT NULL default '0',
PRIMARY KEY (`id_address`),
KEY `address_customer` (`id_customer`),
KEY `id_country` (`id_country`),
@@ -80,51 +80,51 @@
) ENGINE = ENGINE_TYPE DEFAULT CHARSET = utf8
---
CREATE TABLE `PREFIX_alias` (
- `id_alias` int(10) unsigned NOT NULL auto_increment,
- `alias` varchar(255) NOT NULL,
- `search` varchar(255) NOT NULL,
- `active` tinyint(1) NOT NULL default '1',
+ `id_alias` int(10) unsigned NOT NULL auto_increment,
+ `alias` varchar(255) NOT NULL,
+ `search` varchar(255) NOT NULL,
+ `active` tinyint(1) NOT NULL default '1',
PRIMARY KEY (`id_alias`),
UNIQUE KEY `alias` (`alias`)
) ENGINE = ENGINE_TYPE DEFAULT CHARSET = utf8
---
CREATE TABLE `PREFIX_carrier` (
- `id_carrier` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `id_reference` int(10) unsigned NOT NULL,
- `id_tax_rules_group` int(10) unsigned DEFAULT '0',
- `name` varchar(64) NOT NULL,
- `url` varchar(255) DEFAULT NULL,
- `active` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `shipping_handling` tinyint(1) unsigned NOT NULL DEFAULT '1',
- `range_behavior` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `is_module` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `is_free` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `shipping_external` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `need_range` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `external_module_name` varchar(64) DEFAULT NULL,
- `shipping_method` int(2) NOT NULL DEFAULT '0',
- `position` int(10) unsigned NOT NULL default '0',
- `max_width` int(10) DEFAULT 0,
- `max_height` int(10) DEFAULT 0,
- `max_depth` int(10) DEFAULT 0,
- `max_weight` int(10) DEFAULT 0,
- `grade` int(10) DEFAULT 0,
+ `id_carrier` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `id_reference` int(10) unsigned NOT NULL,
+ `id_tax_rules_group` int(10) unsigned DEFAULT '0',
+ `name` varchar(64) NOT NULL,
+ `url` varchar(255) DEFAULT NULL,
+ `active` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `shipping_handling` tinyint(1) unsigned NOT NULL DEFAULT '1',
+ `range_behavior` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `is_module` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `is_free` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `shipping_external` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `need_range` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `external_module_name` varchar(64) DEFAULT NULL,
+ `shipping_method` int(2) NOT NULL DEFAULT '0',
+ `position` int(10) unsigned NOT NULL default '0',
+ `max_width` int(10) DEFAULT 0,
+ `max_height` int(10) DEFAULT 0,
+ `max_depth` int(10) DEFAULT 0,
+ `max_weight` int(10) DEFAULT 0,
+ `grade` int(10) DEFAULT 0,
PRIMARY KEY (`id_carrier`),
KEY `deleted` (`deleted`, `active`),
KEY `id_tax_rules_group` (`id_tax_rules_group`)
) ENGINE = ENGINE_TYPE DEFAULT CHARSET = utf8
---
CREATE TABLE IF NOT EXISTS `PREFIX_specific_price_rule` (
- `id_specific_price_rule` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `name` VARCHAR(255) NOT NULL,
- `id_shop` int(11) unsigned NOT NULL DEFAULT '1',
- `id_currency` int(10) unsigned NOT NULL,
- `id_country` int(10) unsigned NOT NULL,
- `id_group` int(10) unsigned NOT NULL,
- `from_quantity` mediumint(8) unsigned NOT NULL,
- `price` DECIMAL(20, 6),
- `reduction` decimal(20, 6) NOT NULL,
+ `id_specific_price_rule` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `name` VARCHAR(255) NOT NULL,
+ `id_shop` int(11) unsigned NOT NULL DEFAULT '1',
+ `id_currency` int(10) unsigned NOT NULL,
+ `id_country` int(10) unsigned NOT NULL,
+ `id_group` int(10) unsigned NOT NULL,
+ `from_quantity` mediumint(8) unsigned NOT NULL,
+ `price` DECIMAL(20, 6),
+ `reduction` decimal(20, 6) NOT NULL,
`reduction_type` enum('amount', 'percentage') NOT NULL,
`from` datetime NOT NULL,
`to` datetime NOT NULL,
@@ -456,7 +456,7 @@
ALTER TABLE
`PREFIX_employee`
ADD
- `bo_color` varchar(32) default NULL AFTER `stats_date_to`
+ `bo_color` varchar(32) default NULL AFTER `stats_date_to`
---
INSERT INTO `PREFIX_cms_category_lang`
VALUES
@@ -490,7 +490,7 @@
ALTER TABLE
`PREFIX_contact`
ADD
- `customer_service` tinyint(1) NOT NULL DEFAULT 0 AFTER `email`
+ `customer_service` tinyint(1) NOT NULL DEFAULT 0 AFTER `email`
---
INSERT INTO `PREFIX_specific_price` (
`id_product`, `id_shop`, `id_currency`,
@@ -787,12 +787,12 @@
ALTER TABLE
`test_modify`
MODIFY
- `id` INT(11) UNSIGNED NOT NULL;
+ `id` INT(11) UNSIGNED NOT NULL;
---
ALTER TABLE
`test_change`
CHANGE
- `id` `_id` BIGINT(20) UNSIGNED NULL;
+ `id` `_id` BIGINT(20) UNSIGNED NULL;
---
SELECT
*
@@ -952,7 +952,7 @@
a
) AS filtered,
CONVERT(
- VARCHAR(20),
+ VARCHAR(20),
AVG(SalesYTD) OVER (
PARTITION BY
TerritoryID
diff --git a/tests/highlight.html b/tests/highlight.html
index 6337210..b57624c 100644
--- a/tests/highlight.html
+++ b/tests/highlight.html
@@ -19,30 +19,30 @@
SET NAMES 'utf8';
---
CREATE TABLE `PREFIX_address` (
- `id_address` int(10) unsigned NOT NULL auto_increment,
- `id_country` int(10) unsigned NOT NULL,
- `id_state` int(10) unsigned default NULL,
- `id_customer` int(10) unsigned NOT NULL default '0',
- `id_manufacturer` int(10) unsigned NOT NULL default '0',
- `id_supplier` int(10) unsigned NOT NULL default '0',
- `id_warehouse` int(10) unsigned NOT NULL default '0',
- `alias` varchar(32) NOT NULL,
- `company` varchar(64) default NULL,
- `lastname` varchar(32) NOT NULL,
- `firstname` varchar(32) NOT NULL,
- `address1` varchar(128) NOT NULL,
- `address2` varchar(128) default NULL,
- `postcode` varchar(12) default NULL,
- `city` varchar(64) NOT NULL,
+ `id_address` int(10) unsigned NOT NULL auto_increment,
+ `id_country` int(10) unsigned NOT NULL,
+ `id_state` int(10) unsigned default NULL,
+ `id_customer` int(10) unsigned NOT NULL default '0',
+ `id_manufacturer` int(10) unsigned NOT NULL default '0',
+ `id_supplier` int(10) unsigned NOT NULL default '0',
+ `id_warehouse` int(10) unsigned NOT NULL default '0',
+ `alias` varchar(32) NOT NULL,
+ `company` varchar(64) default NULL,
+ `lastname` varchar(32) NOT NULL,
+ `firstname` varchar(32) NOT NULL,
+ `address1` varchar(128) NOT NULL,
+ `address2` varchar(128) default NULL,
+ `postcode` varchar(12) default NULL,
+ `city` varchar(64) NOT NULL,
`other` text,
- `phone` varchar(16) default NULL,
- `phone_mobile` varchar(16) default NULL,
- `vat_number` varchar(32) default NULL,
- `dni` varchar(16) DEFAULT NULL,
+ `phone` varchar(16) default NULL,
+ `phone_mobile` varchar(16) default NULL,
+ `vat_number` varchar(32) default NULL,
+ `dni` varchar(16) DEFAULT NULL,
`date_add` datetime NOT NULL,
`date_upd` datetime NOT NULL,
- `active` tinyint(1) unsigned NOT NULL default '1',
- `deleted` tinyint(1) unsigned NOT NULL default '0',
+ `active` tinyint(1) unsigned NOT NULL default '1',
+ `deleted` tinyint(1) unsigned NOT NULL default '0',
PRIMARY KEY (`id_address`),
KEY `address_customer` (`id_customer`),
KEY `id_country` (`id_country`),
@@ -53,51 +53,51 @@
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8
---
CREATE TABLE `PREFIX_alias` (
- `id_alias` int(10) unsigned NOT NULL auto_increment,
- `alias` varchar(255) NOT NULL,
- `search` varchar(255) NOT NULL,
- `active` tinyint(1) NOT NULL default '1',
+ `id_alias` int(10) unsigned NOT NULL auto_increment,
+ `alias` varchar(255) NOT NULL,
+ `search` varchar(255) NOT NULL,
+ `active` tinyint(1) NOT NULL default '1',
PRIMARY KEY (`id_alias`),
UNIQUE KEY `alias` (`alias`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8
---
CREATE TABLE `PREFIX_carrier` (
- `id_carrier` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `id_reference` int(10) unsigned NOT NULL,
- `id_tax_rules_group` int(10) unsigned DEFAULT '0',
- `name` varchar(64) NOT NULL,
- `url` varchar(255) DEFAULT NULL,
- `active` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `shipping_handling` tinyint(1) unsigned NOT NULL DEFAULT '1',
- `range_behavior` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `is_module` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `is_free` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `shipping_external` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `need_range` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `external_module_name` varchar(64) DEFAULT NULL,
- `shipping_method` int(2) NOT NULL DEFAULT '0',
- `position` int(10) unsigned NOT NULL default '0',
- `max_width` int(10) DEFAULT 0,
- `max_height` int(10) DEFAULT 0,
- `max_depth` int(10) DEFAULT 0,
- `max_weight` int(10) DEFAULT 0,
- `grade` int(10) DEFAULT 0,
+ `id_carrier` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `id_reference` int(10) unsigned NOT NULL,
+ `id_tax_rules_group` int(10) unsigned DEFAULT '0',
+ `name` varchar(64) NOT NULL,
+ `url` varchar(255) DEFAULT NULL,
+ `active` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `shipping_handling` tinyint(1) unsigned NOT NULL DEFAULT '1',
+ `range_behavior` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `is_module` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `is_free` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `shipping_external` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `need_range` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `external_module_name` varchar(64) DEFAULT NULL,
+ `shipping_method` int(2) NOT NULL DEFAULT '0',
+ `position` int(10) unsigned NOT NULL default '0',
+ `max_width` int(10) DEFAULT 0,
+ `max_height` int(10) DEFAULT 0,
+ `max_depth` int(10) DEFAULT 0,
+ `max_weight` int(10) DEFAULT 0,
+ `grade` int(10) DEFAULT 0,
PRIMARY KEY (`id_carrier`),
KEY `deleted` (`deleted`,`active`),
KEY `id_tax_rules_group` (`id_tax_rules_group`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8
---
CREATE TABLE IF NOT EXISTS `PREFIX_specific_price_rule` (
- `id_specific_price_rule` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `name` VARCHAR(255) NOT NULL,
- `id_shop` int(11) unsigned NOT NULL DEFAULT '1',
- `id_currency` int(10) unsigned NOT NULL,
- `id_country` int(10) unsigned NOT NULL,
- `id_group` int(10) unsigned NOT NULL,
- `from_quantity` mediumint(8) unsigned NOT NULL,
- `price` DECIMAL(20,6),
- `reduction` decimal(20,6) NOT NULL,
+ `id_specific_price_rule` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `name` VARCHAR(255) NOT NULL,
+ `id_shop` int(11) unsigned NOT NULL DEFAULT '1',
+ `id_currency` int(10) unsigned NOT NULL,
+ `id_country` int(10) unsigned NOT NULL,
+ `id_group` int(10) unsigned NOT NULL,
+ `from_quantity` mediumint(8) unsigned NOT NULL,
+ `price` DECIMAL(20,6),
+ `reduction` decimal(20,6) NOT NULL,
`reduction_type` enum('amount','percentage') NOT NULL,
`from` datetime NOT NULL,
`to` datetime NOT NULL,
@@ -147,7 +147,7 @@
OR
id_hook = (SELECT id_hook FROM `PREFIX_hook` WHERE name = 'displayFooter') AND id_module = (SELECT id_module FROM `PREFIX_module` WHERE name = 'blockreinsurance')
---
-ALTER TABLE `PREFIX_employee` ADD `bo_color` varchar(32) default NULL AFTER `stats_date_to`
+ALTER TABLE `PREFIX_employee` ADD `bo_color` varchar(32) default NULL AFTER `stats_date_to`
---
INSERT INTO `PREFIX_cms_category_lang` VALUES(1, 3, 'Inicio', '', 'home', NULL, NULL, NULL)
---
@@ -157,7 +157,7 @@
---
ALTER TABLE `PREFIX_customer` ADD `note` text AFTER `secure_key`
---
-ALTER TABLE `PREFIX_contact` ADD `customer_service` tinyint(1) NOT NULL DEFAULT 0 AFTER `email`
+ALTER TABLE `PREFIX_contact` ADD `customer_service` tinyint(1) NOT NULL DEFAULT 0 AFTER `email`
---
INSERT INTO `PREFIX_specific_price` (`id_product`, `id_shop`, `id_currency`, `id_country`, `id_group`, `priority`, `price`, `from_quantity`, `reduction`, `reduction_type`, `from`, `to`)
( SELECT dq.`id_product`, 1, 1, 0, 1, 0, 0.00, dq.`quantity`, IF(dq.`id_discount_type` = 2, dq.`value`, dq.`value` / 100), IF (dq.`id_discount_type` = 2, 'amount', 'percentage'), '0000-00-00 00:00:00', '0000-00-00 00:00:00'
@@ -247,9 +247,9 @@
(
MyColumn = 1 )) AND ((( SomeOtherColumn = 2);
---
-ALTER TABLE `test_modify` MODIFY `id` INT(11) UNSIGNED NOT NULL;
+ALTER TABLE `test_modify` MODIFY `id` INT(11) UNSIGNED NOT NULL;
---
-ALTER TABLE `test_change` CHANGE `id` `_id` BIGINT(20) UNSIGNED NULL;
+ALTER TABLE `test_change` CHANGE `id` `_id` BIGINT(20) UNSIGNED NULL;
---
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;
---
@@ -295,7 +295,7 @@
GROUP_CONCAT(b, '.') OVER (ORDER BY c GROUPS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW EXCLUDE GROUP) AS grp,
GROUP_CONCAT(b, '.') OVER (ORDER BY c GROUPS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW EXCLUDE TIES) AS tie,
GROUP_CONCAT(b, '.') FILTER (WHERE c != 'two') OVER (ORDER BY a) AS filtered,
- CONVERT(VARCHAR(20), AVG(SalesYTD) OVER (PARTITION BY TerritoryID ORDER BY DATEPART(yy, ModifiedDate)), 1) AS MovingAvg,
+ CONVERT(VARCHAR(20), AVG(SalesYTD) OVER (PARTITION BY TerritoryID ORDER BY DATEPART(yy, ModifiedDate)), 1) AS MovingAvg,
AVG(starting_salary) OVER w2 AVG,
MIN(starting_salary) OVER w2 MIN_STARTING_SALARY,
MAX(starting_salary) OVER (w1 ORDER BY hire_date),