summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/examples.php9
-rw-r--r--lib/SqlFormatter.php138
-rw-r--r--tests/format-highlight.html204
-rw-r--r--tests/format.html186
-rw-r--r--tests/highlight.html26
5 files changed, 197 insertions, 366 deletions
diff --git a/examples/examples.php b/examples/examples.php
index 41e7f5e..0d3c641 100644
--- a/examples/examples.php
+++ b/examples/examples.php
@@ -35,6 +35,15 @@ require_once(__DIR__.'/../lib/SqlFormatter.php');
// Example statements for formatting and highlighting
$statements = array(
+ "SELECT DATE_FORMAT(b.t_create, '%Y-%c-%d') dateID, b.title memo
+ FROM (SELECT id FROM orc_scheme_detail d WHERE d.business=208
+ AND d.type IN (29,30,31,321,33,34,3542,361,327,38,39,40,41,42,431,4422,415,4546,47,48,'a',
+ 29,30,31,321,33,34,3542,361,327,38,39,40,41,42,431,4422,415,4546,47,48,'a')
+ AND d.title IS NOT NULL AND t_create >=
+ DATE_FORMAT((DATE_SUB(NOW(),INTERVAL 1 DAY)),'%Y-%c-%d') AND t_create
+ < DATE_FORMAT(NOW(), '%Y-%c-%d') ORDER BY d.id LIMIT 2,10) a,
+ orc_scheme_detail b WHERE a.id = b.id",
+
"SELECT * FROM MyTable WHERE id = 46",
"SELECT count(*),`Column1`,`Testing`, `Testing Three` FROM `Table1`
diff --git a/lib/SqlFormatter.php b/lib/SqlFormatter.php
index 7b94920..6f589a5 100644
--- a/lib/SqlFormatter.php
+++ b/lib/SqlFormatter.php
@@ -9,7 +9,7 @@
* @copyright 2013 Jeremy Dorn
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link http://github.com/jdorn/sql-formatter
- * @version 1.2.7
+ * @version 1.2.8
*/
class SqlFormatter
{
@@ -41,11 +41,11 @@ class SqlFormatter
'DO', 'DUMPFILE', 'DUPLICATE', 'DYNAMIC', 'ELSE', 'ENCLOSED', 'END', 'ENGINE', 'ENGINE_TYPE', 'ENGINES', 'ESCAPE', 'ESCAPED', 'EVENTS', 'EXECUTE',
'EXISTS', 'EXPLAIN', 'EXTENDED', 'FAST', 'FIELDS', 'FILE', 'FIRST', 'FIXED', 'FLUSH', 'FOR', 'FORCE', 'FOREIGN', 'FULL', 'FULLTEXT',
'FUNCTION', 'GLOBAL', 'GRANT', 'GRANTS', 'GROUP_CONCAT', 'HEAP', 'HIGH_PRIORITY', 'HOSTS', 'HOUR', 'HOUR_MINUTE',
- 'HOUR_SECOND', 'IDENTIFIED', 'IF', 'IGNORE', 'IN', 'INDEX', 'INDEXES', 'INFILE', 'INSERT', 'INSERT_ID', 'INSERT_METHOD', 'INTERVAL',
+ 'HOUR_SECOND', 'IDENTIFIED', 'IF', 'IFNULL', 'IGNORE', 'IN', 'INDEX', 'INDEXES', 'INFILE', 'INSERT', 'INSERT_ID', 'INSERT_METHOD', 'INTERVAL',
'INTO', 'INVOKER', 'IS', 'ISOLATION', 'KEY', 'KEYS', 'KILL', 'LAST_INSERT_ID', 'LEADING', 'LEVEL', 'LIKE', 'LINEAR',
'LINES', 'LOAD', 'LOCAL', 'LOCK', 'LOCKS', 'LOGS', 'LOW_PRIORITY', 'MARIA', 'MASTER', 'MASTER_CONNECT_RETRY', 'MASTER_HOST', 'MASTER_LOG_FILE',
'MATCH', 'MEDIUM', 'MERGE', 'MINUTE', 'MINUTE_SECOND', 'MIN_ROWS', 'MODE', 'MODIFY',
- 'MONTH', 'MRG_MYISAM', 'MYISAM', 'NAMES', 'NATURAL', 'NOT', 'NOW', 'NULL', 'OFFSET', 'ON', 'OPEN', 'OPTIMIZE', 'OPTION', 'OPTIONALLY',
+ 'MONTH', 'MRG_MYISAM', 'MYISAM', 'NAMES', 'NATURAL', 'NOT', 'NOW()', 'NULL', 'OFFSET', 'ON', 'OPEN', 'OPTIMIZE', 'OPTION', 'OPTIONALLY',
'ON UPDATE', 'ON DELETE', 'OUTFILE', 'PACK_KEYS', 'PAGE', 'PARTIAL', 'PARTITION', 'PARTITIONS', 'PASSWORD', 'PRIMARY', 'PRIVILEGES', 'PROCEDURE',
'PROCESS', 'PROCESSLIST', 'PURGE', 'QUICK', 'RANGE', 'READ', 'READ_ONLY',
'READ_WRITE', 'REFERENCES', 'REGEXP', 'RELOAD', 'RENAME', 'REPAIR', 'REPEATABLE', 'REPLACE', 'REPLICATION', 'RESET', 'RESTORE', 'RESTRICT',
@@ -358,17 +358,23 @@ class SqlFormatter
$increase_block_indent = false;
$indent_types = array();
$added_newline = false;
-
+ $inline_count = 0;
+ $inline_indented = false;
+
// Tokenize String
- $tokens = self::tokenize($string);
+ $original_tokens = self::tokenize($string);
+
+ // Remove existing whitespace
+ $tokens = array();
+ foreach ($original_tokens as $i=>$token) {
+ if ($token[self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {
+ $token['i'] = $i;
+ $tokens[] = $token;
+ }
+ }
// Format token by token
- foreach ($tokens as $i=>$token) {
- // Don't process whitespace
- if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_WHITESPACE) {
- continue;
- }
-
+ foreach ($tokens as $i=>$token) {
// Get highlighted token if doing syntax highlighting
if ($highlight) {
$highlighted = self::highlightToken($token);
@@ -388,7 +394,7 @@ class SqlFormatter
$increase_block_indent = false;
array_unshift($indent_types,'block');
}
-
+
// Display comments directly where they appear in the source
if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {
if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) {
@@ -409,27 +415,51 @@ class SqlFormatter
else {
$added_newline = false;
}
+
+ if($inline_parentheses) {
+ // End of inline parentheses
+ if($token[self::TOKEN_VALUE] === ')') {
+ $return = rtrim($return,' ');
+
+ if($inline_indented) {
+ array_shift($indent_types);
+ $indent_level --;
+ $return .= "\n" . str_repeat($tab, $indent_level);
+ }
+
+ $inline_parentheses = false;
+
+ $return .= $highlighted . ' ';
+ continue;
+ }
+
+ if($token[self::TOKEN_VALUE] === ',') {
+ if($inline_count >= 30) {
+ $inline_count = 0;
+ $newline = true;
+ }
+ }
+
+ $inline_count += strlen($token[self::TOKEN_VALUE]);
+ }
// Opening parentheses increase the block indent level and start a new line
if ($token[self::TOKEN_VALUE] === '(') {
// First check if this should be an inline parentheses block
// Examples are "NOW()", "COUNT(*)", "int(10)", key(`somecolumn`), DECIMAL(7,2)
// Allow up to 3 non-whitespace tokens inside inline parentheses
- $nonwhitespace = 0;
- for($j=1;$j<=8;$j++) {
+ $length = 0;
+ for($j=1;$j<=250;$j++) {
// Reached end of string
if(!isset($tokens[$i+$j])) break;
$next = $tokens[$i+$j];
-
- // Ignore whitespace
- if($next[self::TOKEN_TYPE]===self::TOKEN_TYPE_WHITESPACE) {
- continue;
- }
- // Reached closing parentheses
+ // Reached closing parentheses, able to inline it
if($next[self::TOKEN_VALUE] === ')') {
$inline_parentheses = true;
+ $inline_count = 0;
+ $inline_indented = false;
break;
}
@@ -443,16 +473,17 @@ class SqlFormatter
break;
}
- // Too many tokens for inline parentheses
- if ($nonwhitespace >= 3) {
- break;
- }
-
- $nonwhitespace++;
+ $length += strlen($next[self::TOKEN_VALUE]);
+ }
+
+ if($inline_parentheses && $length > 30) {
+ $increase_block_indent = true;
+ $inline_indented = true;
+ $newline = true;
}
// Take out the preceding space unless there was whitespace there in the original query
- if (isset($tokens[$i-1]) && $tokens[$i-1][self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {
+ if (isset($original_tokens[$token['i']-1]) && $original_tokens[$token['i']-1][self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {
$return = rtrim($return,' ');
}
@@ -468,40 +499,33 @@ class SqlFormatter
elseif ($token[self::TOKEN_VALUE] === ')') {
// Remove whitespace before the closing parentheses
$return = rtrim($return,' ');
-
- // If we are in an inline parentheses section
- if($inline_parentheses) {
- $inline_parentheses = false;
- }
- else {
- $indent_level--;
-
- // Reset indent level
- while($j=array_shift($indent_types)) {
- if($j==='special') {
- $indent_level--;
- }
- else {
- break;
- }
+
+ $indent_level--;
+
+ // Reset indent level
+ while($j=array_shift($indent_types)) {
+ if($j==='special') {
+ $indent_level--;
}
-
- if($indent_level < 0) {
- // This is an error
- $indent_level = 0;
-
- if ($highlight) {
- $return .= "\n".self::highlightError($token[self::TOKEN_VALUE]);
- continue;
- }
+ else {
+ break;
}
+ }
+
+ if($indent_level < 0) {
+ // This is an error
+ $indent_level = 0;
- // Add a newline before the closing parentheses (if not already added)
- if(!$added_newline) {
- $return .= "\n" . str_repeat($tab, $indent_level);
+ if ($highlight) {
+ $return .= "\n".self::highlightError($token[self::TOKEN_VALUE]);
+ continue;
}
}
+ // Add a newline before the closing parentheses (if not already added)
+ if(!$added_newline) {
+ $return .= "\n" . str_repeat($tab, $indent_level);
+ }
}
// Commas start a new line (unless within inline parentheses)
@@ -553,7 +577,9 @@ class SqlFormatter
// Multiple boundary characters in a row should not have spaces between them (not including parentheses)
elseif($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BOUNDARY) {
if($tokens[$i-1][self::TOKEN_TYPE] === self::TOKEN_TYPE_BOUNDARY) {
- $return = rtrim($return, ' ');
+ if (isset($original_tokens[$token['i']-1]) && $original_tokens[$token['i']-1][self::TOKEN_TYPE] !== self::TOKEN_TYPE_WHITESPACE) {
+ $return = rtrim($return,' ');
+ }
}
}
diff --git a/tests/format-highlight.html b/tests/format-highlight.html
index 38fc4da..c6d0a98 100644
--- a/tests/format-highlight.html
+++ b/tests/format-highlight.html
@@ -128,12 +128,8 @@
<span style="color: purple;">`to`</span> <span style="color: #333;">datetime</span> <span style="font-weight:bold;">NOT</span> <span style="font-weight:bold;">NULL</span><span >,</span>
<span style="font-weight:bold;">PRIMARY</span> <span style="font-weight:bold;">KEY</span> (<span style="color: purple;">`id_specific_price_rule`</span>)<span >,</span>
<span style="font-weight:bold;">KEY</span> <span style="color: purple;">`id_product`</span> (
- <span style="color: purple;">`id_shop`</span><span >,</span>
- <span style="color: purple;">`id_currency`</span><span >,</span>
- <span style="color: purple;">`id_country`</span><span >,</span>
- <span style="color: purple;">`id_group`</span><span >,</span>
- <span style="color: purple;">`from_quantity`</span><span >,</span>
- <span style="color: purple;">`from`</span><span >,</span>
+ <span style="color: purple;">`id_shop`</span><span >,</span> <span style="color: purple;">`id_currency`</span><span >,</span> <span style="color: purple;">`id_country`</span><span >,</span>
+ <span style="color: purple;">`id_group`</span><span >,</span> <span style="color: purple;">`from_quantity`</span><span >,</span> <span style="color: purple;">`from`</span><span >,</span>
<span style="color: purple;">`to`</span>
)
) <span style="font-weight:bold;">ENGINE</span> <span >=</span> <span style="font-weight:bold;">ENGINE_TYPE</span> <span style="font-weight:bold;">DEFAULT</span> <span style="font-weight:bold;">CHARSET</span> <span >=</span> <span style="color: #333;">utf8</span></pre>
@@ -465,27 +461,13 @@
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_cms_category_lang`</span>
<span style="font-weight:bold;">VALUES</span>
(
- <span style="color: green;">1</span><span >,</span>
- <span style="color: green;">3</span><span >,</span>
- <span style="color: blue;">'Inicio'</span><span >,</span>
- <span style="color: blue;">''</span><span >,</span>
- <span style="color: blue;">'home'</span><span >,</span>
- <span style="font-weight:bold;">NULL</span><span >,</span>
- <span style="font-weight:bold;">NULL</span><span >,</span>
+ <span style="color: green;">1</span><span >,</span> <span style="color: green;">3</span><span >,</span> <span style="color: blue;">'Inicio'</span><span >,</span> <span style="color: blue;">''</span><span >,</span> <span style="color: blue;">'home'</span><span >,</span> <span style="font-weight:bold;">NULL</span><span >,</span> <span style="font-weight:bold;">NULL</span><span >,</span>
<span style="font-weight:bold;">NULL</span>
)</pre>
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_cms_category`</span>
<span style="font-weight:bold;">VALUES</span>
- (
- <span style="color: green;">1</span><span >,</span>
- <span style="color: green;">0</span><span >,</span>
- <span style="color: green;">0</span><span >,</span>
- <span style="color: green;">1</span><span >,</span>
- <span style="font-weight:bold;">NOW</span>()<span >,</span>
- <span style="font-weight:bold;">NOW</span>()<span >,</span>
- <span style="color: green;">0</span>
- )</pre>
+ (<span style="color: green;">1</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="color: green;">0</span>)</pre>
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">UPDATE</span>
<span style="color: purple;">`PREFIX_cms_category`</span>
@@ -507,18 +489,10 @@
<span style="color: purple;">`email`</span></pre>
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_specific_price`</span> (
- <span style="color: purple;">`id_product`</span><span >,</span>
- <span style="color: purple;">`id_shop`</span><span >,</span>
- <span style="color: purple;">`id_currency`</span><span >,</span>
- <span style="color: purple;">`id_country`</span><span >,</span>
- <span style="color: purple;">`id_group`</span><span >,</span>
- <span style="color: purple;">`priority`</span><span >,</span>
- <span style="color: purple;">`price`</span><span >,</span>
- <span style="color: purple;">`from_quantity`</span><span >,</span>
- <span style="color: purple;">`reduction`</span><span >,</span>
- <span style="color: purple;">`reduction_type`</span><span >,</span>
- <span style="color: purple;">`from`</span><span >,</span>
- <span style="color: purple;">`to`</span>
+ <span style="color: purple;">`id_product`</span><span >,</span> <span style="color: purple;">`id_shop`</span><span >,</span> <span style="color: purple;">`id_currency`</span><span >,</span>
+ <span style="color: purple;">`id_country`</span><span >,</span> <span style="color: purple;">`id_group`</span><span >,</span> <span style="color: purple;">`priority`</span><span >,</span>
+ <span style="color: purple;">`price`</span><span >,</span> <span style="color: purple;">`from_quantity`</span><span >,</span> <span style="color: purple;">`reduction`</span><span >,</span>
+ <span style="color: purple;">`reduction_type`</span><span >,</span> <span style="color: purple;">`from`</span><span >,</span> <span style="color: purple;">`to`</span>
) (
<span style="font-weight:bold;">SELECT</span>
<span style="color: #333;">dq</span><span >.</span><span style="color: purple;">`id_product`</span><span >,</span>
@@ -530,40 +504,28 @@
<span style="color: green;">0.00</span><span >,</span>
<span style="color: #333;">dq</span><span >.</span><span style="color: purple;">`quantity`</span><span >,</span>
<span style="font-weight:bold;">IF</span>(
- <span style="color: #333;">dq</span><span >.</span><span style="color: purple;">`id_discount_type`</span> <span >=</span> <span style="color: green;">2</span><span >,</span>
- <span style="color: #333;">dq</span><span >.</span><span style="color: purple;">`value`</span><span >,</span>
+ <span style="color: #333;">dq</span><span >.</span><span style="color: purple;">`id_discount_type`</span> <span >=</span> <span style="color: green;">2</span><span >,</span> <span style="color: #333;">dq</span><span >.</span><span style="color: purple;">`value`</span><span >,</span>
<span style="color: #333;">dq</span><span >.</span><span style="color: purple;">`value`</span> <span >/</span> <span style="color: green;">100</span>
)<span >,</span>
<span style="font-weight:bold;">IF</span> (
- <span style="color: #333;">dq</span><span >.</span><span style="color: purple;">`id_discount_type`</span> <span >=</span> <span style="color: green;">2</span><span >,</span>
- <span style="color: blue;">'amount'</span><span >,</span>
+ <span style="color: #333;">dq</span><span >.</span><span style="color: purple;">`id_discount_type`</span> <span >=</span> <span style="color: green;">2</span><span >,</span> <span style="color: blue;">'amount'</span><span >,</span>
<span style="color: blue;">'percentage'</span>
)<span >,</span>
<span style="color: blue;">'0000-00-00 00:00:00'</span><span >,</span>
<span style="color: blue;">'0000-00-00 00:00:00'</span>
<span style="font-weight:bold;">FROM</span>
<span style="color: purple;">`PREFIX_discount_quantity`</span> <span style="color: #333;">dq</span>
- <span style="font-weight:bold;">INNER JOIN</span> <span style="color: purple;">`PREFIX_product`</span> <span style="color: #333;">p</span> <span style="font-weight:bold;">ON</span> (
- <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`id_product`</span> <span >=</span> <span style="color: #333;">dq</span><span >.</span><span style="color: purple;">`id_product`</span>
- )
+ <span style="font-weight:bold;">INNER JOIN</span> <span style="color: purple;">`PREFIX_product`</span> <span style="color: #333;">p</span> <span style="font-weight:bold;">ON</span> (<span style="color: #333;">p</span><span >.</span><span style="color: purple;">`id_product`</span> <span >=</span> <span style="color: #333;">dq</span><span >.</span><span style="color: purple;">`id_product`</span>)
)</pre>
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">DROP</span>
<span style="font-weight:bold;">TABLE</span> <span style="color: purple;">`PREFIX_discount_quantity`</span></pre>
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_specific_price`</span> (
- <span style="color: purple;">`id_product`</span><span >,</span>
- <span style="color: purple;">`id_shop`</span><span >,</span>
- <span style="color: purple;">`id_currency`</span><span >,</span>
- <span style="color: purple;">`id_country`</span><span >,</span>
- <span style="color: purple;">`id_group`</span><span >,</span>
- <span style="color: purple;">`priority`</span><span >,</span>
- <span style="color: purple;">`price`</span><span >,</span>
- <span style="color: purple;">`from_quantity`</span><span >,</span>
- <span style="color: purple;">`reduction`</span><span >,</span>
- <span style="color: purple;">`reduction_type`</span><span >,</span>
- <span style="color: purple;">`from`</span><span >,</span>
- <span style="color: purple;">`to`</span>
+ <span style="color: purple;">`id_product`</span><span >,</span> <span style="color: purple;">`id_shop`</span><span >,</span> <span style="color: purple;">`id_currency`</span><span >,</span>
+ <span style="color: purple;">`id_country`</span><span >,</span> <span style="color: purple;">`id_group`</span><span >,</span> <span style="color: purple;">`priority`</span><span >,</span>
+ <span style="color: purple;">`price`</span><span >,</span> <span style="color: purple;">`from_quantity`</span><span >,</span> <span style="color: purple;">`reduction`</span><span >,</span>
+ <span style="color: purple;">`reduction_type`</span><span >,</span> <span style="color: purple;">`from`</span><span >,</span> <span style="color: purple;">`to`</span>
) (
<span style="font-weight:bold;">SELECT</span>
<span style="color: #333;">p</span><span >.</span><span style="color: purple;">`id_product`</span><span >,</span>
@@ -575,24 +537,20 @@
<span style="color: green;">0.00</span><span >,</span>
<span style="color: green;">1</span><span >,</span>
<span style="font-weight:bold;">IF</span>(
- <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_price`</span> <span >&gt;</span> <span style="color: green;">0</span><span >,</span>
- <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_price`</span><span >,</span>
+ <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_price`</span> <span >&gt;</span> <span style="color: green;">0</span><span >,</span> <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_price`</span><span >,</span>
<span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_percent`</span> <span >/</span> <span style="color: green;">100</span>
)<span >,</span>
<span style="font-weight:bold;">IF</span>(
- <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_price`</span> <span >&gt;</span> <span style="color: green;">0</span><span >,</span>
- <span style="color: blue;">'amount'</span><span >,</span>
+ <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_price`</span> <span >&gt;</span> <span style="color: green;">0</span><span >,</span> <span style="color: blue;">'amount'</span><span >,</span>
<span style="color: blue;">'percentage'</span>
)<span >,</span>
<span style="font-weight:bold;">IF</span> (
<span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_from`</span> <span >=</span> <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_to`</span><span >,</span>
- <span style="color: blue;">'0000-00-00 00:00:00'</span><span >,</span>
- <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_from`</span>
+ <span style="color: blue;">'0000-00-00 00:00:00'</span><span >,</span> <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_from`</span>
)<span >,</span>
<span style="font-weight:bold;">IF</span> (
<span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_from`</span> <span >=</span> <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_to`</span><span >,</span>
- <span style="color: blue;">'0000-00-00 00:00:00'</span><span >,</span>
- <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_to`</span>
+ <span style="color: blue;">'0000-00-00 00:00:00'</span><span >,</span> <span style="color: #333;">p</span><span >.</span><span style="color: purple;">`reduction_to`</span>
)
<span style="font-weight:bold;">FROM</span>
<span style="color: purple;">`PREFIX_product`</span> <span style="color: #333;">p</span>
@@ -613,83 +571,54 @@
<span style="color: purple;">`reduction_to`</span></pre>
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_configuration`</span> (
- <span style="color: purple;">`name`</span><span >,</span>
- <span style="color: purple;">`value`</span><span >,</span>
- <span style="color: purple;">`date_add`</span><span >,</span>
- <span style="color: purple;">`date_upd`</span>
+ <span style="color: purple;">`name`</span><span >,</span> <span style="color: purple;">`value`</span><span >,</span> <span style="color: purple;">`date_add`</span><span >,</span> <span style="color: purple;">`date_upd`</span>
)
<span style="font-weight:bold;">VALUES</span>
(
<span style="color: blue;">'PS_SPECIFIC_PRICE_PRIORITIES'</span><span >,</span>
<span style="color: blue;">'id_shop;id_currency;id_country;id_group'</span><span >,</span>
- <span style="font-weight:bold;">NOW</span>()<span >,</span>
- <span style="font-weight:bold;">NOW</span>()
- )<span >,</span>
- (
- <span style="color: blue;">'PS_TAX_DISPLAY'</span><span >,</span>
- <span style="color: green;">0</span><span >,</span>
- <span style="font-weight:bold;">NOW</span>()<span >,</span>
- <span style="font-weight:bold;">NOW</span>()
+ <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>
)<span >,</span>
+ (<span style="color: blue;">'PS_TAX_DISPLAY'</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>)<span >,</span>
(
- <span style="color: blue;">'PS_SMARTY_FORCE_COMPILE'</span><span >,</span>
- <span style="color: green;">1</span><span >,</span>
- <span style="font-weight:bold;">NOW</span>()<span >,</span>
- <span style="font-weight:bold;">NOW</span>()
+ <span style="color: blue;">'PS_SMARTY_FORCE_COMPILE'</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span>
+ <span style="font-weight:bold;">NOW()</span>
)<span >,</span>
(
- <span style="color: blue;">'PS_DISTANCE_UNIT'</span><span >,</span>
- <span style="color: blue;">'km'</span><span >,</span>
- <span style="font-weight:bold;">NOW</span>()<span >,</span>
- <span style="font-weight:bold;">NOW</span>()
+ <span style="color: blue;">'PS_DISTANCE_UNIT'</span><span >,</span> <span style="color: blue;">'km'</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>
)<span >,</span>
(
- <span style="color: blue;">'PS_STORES_DISPLAY_CMS'</span><span >,</span>
- <span style="color: green;">0</span><span >,</span>
- <span style="font-weight:bold;">NOW</span>()<span >,</span>
- <span style="font-weight:bold;">NOW</span>()
+ <span style="color: blue;">'PS_STORES_DISPLAY_CMS'</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span>
+ <span style="font-weight:bold;">NOW()</span>
)<span >,</span>
(
- <span style="color: blue;">'PS_STORES_DISPLAY_FOOTER'</span><span >,</span>
- <span style="color: green;">0</span><span >,</span>
- <span style="font-weight:bold;">NOW</span>()<span >,</span>
- <span style="font-weight:bold;">NOW</span>()
+ <span style="color: blue;">'PS_STORES_DISPLAY_FOOTER'</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span>
+ <span style="font-weight:bold;">NOW()</span>
)<span >,</span>
(
- <span style="color: blue;">'PS_STORES_SIMPLIFIED'</span><span >,</span>
- <span style="color: green;">0</span><span >,</span>
- <span style="font-weight:bold;">NOW</span>()<span >,</span>
- <span style="font-weight:bold;">NOW</span>()
+ <span style="color: blue;">'PS_STORES_SIMPLIFIED'</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span>
+ <span style="font-weight:bold;">NOW()</span>
)<span >,</span>
(
<span style="color: blue;">'PS_STATSDATA_CUSTOMER_PAGESVIEWS'</span><span >,</span>
- <span style="color: green;">1</span><span >,</span>
- <span style="font-weight:bold;">NOW</span>()<span >,</span>
- <span style="font-weight:bold;">NOW</span>()
+ <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>
)<span >,</span>
(
- <span style="color: blue;">'PS_STATSDATA_PAGESVIEWS'</span><span >,</span>
- <span style="color: green;">1</span><span >,</span>
- <span style="font-weight:bold;">NOW</span>()<span >,</span>
- <span style="font-weight:bold;">NOW</span>()
+ <span style="color: blue;">'PS_STATSDATA_PAGESVIEWS'</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span>
+ <span style="font-weight:bold;">NOW()</span>
)<span >,</span>
(
- <span style="color: blue;">'PS_STATSDATA_PLUGINS'</span><span >,</span>
- <span style="color: green;">1</span><span >,</span>
- <span style="font-weight:bold;">NOW</span>()<span >,</span>
- <span style="font-weight:bold;">NOW</span>()
+ <span style="color: blue;">'PS_STATSDATA_PLUGINS'</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span>
+ <span style="font-weight:bold;">NOW()</span>
)</pre>
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_configuration`</span> (
- <span style="color: purple;">`name`</span><span >,</span>
- <span style="color: purple;">`value`</span><span >,</span>
- <span style="color: purple;">`date_add`</span><span >,</span>
- <span style="color: purple;">`date_upd`</span>
+ <span style="color: purple;">`name`</span><span >,</span> <span style="color: purple;">`value`</span><span >,</span> <span style="color: purple;">`date_add`</span><span >,</span> <span style="color: purple;">`date_upd`</span>
)
<span style="font-weight:bold;">VALUES</span>
(
<span style="color: blue;">'PS_CONDITIONS_CMS_ID'</span><span >,</span>
- <span style="color: #333;">IFNULL</span>(
+ <span style="font-weight:bold;">IFNULL</span>(
(
<span style="font-weight:bold;">SELECT</span>
<span style="color: purple;">`id_cms`</span>
@@ -700,8 +629,8 @@
)<span >,</span>
<span style="color: green;">0</span>
)<span >,</span>
- <span style="font-weight:bold;">NOW</span>()<span >,</span>
- <span style="font-weight:bold;">NOW</span>()
+ <span style="font-weight:bold;">NOW()</span><span >,</span>
+ <span style="font-weight:bold;">NOW()</span>
)</pre>
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">CREATE</span> <span style="font-weight:bold;">TEMPORARY</span> <span style="font-weight:bold;">TABLE</span> <span style="color: purple;">`PREFIX_configuration_tmp`</span> (<span style="color: purple;">`value`</span> <span style="color: #333;">text</span>)</pre>
@@ -729,61 +658,30 @@
)</pre>
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_hook`</span> (
- <span style="color: purple;">`name`</span><span >,</span>
- <span style="color: purple;">`title`</span><span >,</span>
- <span style="color: purple;">`description`</span><span >,</span>
- <span style="color: purple;">`position`</span>
+ <span style="color: purple;">`name`</span><span >,</span> <span style="color: purple;">`title`</span><span >,</span> <span style="color: purple;">`description`</span><span >,</span> <span style="color: purple;">`position`</span>
)
<span style="font-weight:bold;">VALUES</span>
(
- <span style="color: blue;">'processCarrier'</span><span >,</span>
- <span style="color: blue;">'Carrier Process'</span><span >,</span>
- <span style="font-weight:bold;">NULL</span><span >,</span>
- <span style="color: green;">0</span>
+ <span style="color: blue;">'processCarrier'</span><span >,</span> <span style="color: blue;">'Carrier Process'</span><span >,</span>
+ <span style="font-weight:bold;">NULL</span><span >,</span> <span style="color: green;">0</span>
)</pre>
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_stock_mvt_reason_lang`</span> (
- <span style="color: purple;">`id_stock_mvt_reason`</span><span >,</span>
- <span style="color: purple;">`id_lang`</span><span >,</span>
+ <span style="color: purple;">`id_stock_mvt_reason`</span><span >,</span> <span style="color: purple;">`id_lang`</span><span >,</span>
<span style="color: purple;">`name`</span>
)
<span style="font-weight:bold;">VALUES</span>
+ (<span style="color: green;">1</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="color: blue;">'Order'</span>)<span >,</span>
+ (<span style="color: green;">1</span><span >,</span> <span style="color: green;">2</span><span >,</span> <span style="color: blue;">'Commande'</span>)<span >,</span>
+ (<span style="color: green;">2</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="color: blue;">'Missing Stock Movement'</span>)<span >,</span>
(
- <span style="color: green;">1</span><span >,</span>
- <span style="color: green;">1</span><span >,</span>
- <span style="color: blue;">'Order'</span>
- )<span >,</span>
- (
- <span style="color: green;">1</span><span >,</span>
- <span style="color: green;">2</span><span >,</span>
- <span style="color: blue;">'Commande'</span>
- )<span >,</span>
- (
- <span style="color: green;">2</span><span >,</span>
- <span style="color: green;">1</span><span >,</span>
- <span style="color: blue;">'Missing Stock Movement'</span>
- )<span >,</span>
- (
- <span style="color: green;">2</span><span >,</span>
- <span style="color: green;">2</span><span >,</span>
- <span style="color: blue;">'Mouvement de stock manquant'</span>
- )<span >,</span>
- (
- <span style="color: green;">3</span><span >,</span>
- <span style="color: green;">1</span><span >,</span>
- <span style="color: blue;">'Restocking'</span>
+ <span style="color: green;">2</span><span >,</span> <span style="color: green;">2</span><span >,</span> <span style="color: blue;">'Mouvement de stock manquant'</span>
)<span >,</span>
- (
- <span style="color: green;">3</span><span >,</span>
- <span style="color: green;">2</span><span >,</span>
- <span style="color: blue;">'R&Atilde;&copy;assort'</span>
- )</pre>
+ (<span style="color: green;">3</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="color: blue;">'Restocking'</span>)<span >,</span>
+ (<span style="color: green;">3</span><span >,</span> <span style="color: green;">2</span><span >,</span> <span style="color: blue;">'R&Atilde;&copy;assort'</span>)</pre>
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_meta_lang`</span> (
- <span style="color: purple;">`id_lang`</span><span >,</span>
- <span style="color: purple;">`id_meta`</span><span >,</span>
- <span style="color: purple;">`title`</span><span >,</span>
- <span style="color: purple;">`url_rewrite`</span>
+ <span style="color: purple;">`id_lang`</span><span >,</span> <span style="color: purple;">`id_meta`</span><span >,</span> <span style="color: purple;">`title`</span><span >,</span> <span style="color: purple;">`url_rewrite`</span>
)
<span style="font-weight:bold;">VALUES</span>
(
diff --git a/tests/format.html b/tests/format.html
index db1f95a..1b35c61 100644
--- a/tests/format.html
+++ b/tests/format.html
@@ -128,12 +128,8 @@ CREATE TABLE IF NOT EXISTS `PREFIX_specific_price_rule` (
`to` datetime NOT NULL,
PRIMARY KEY (`id_specific_price_rule`),
KEY `id_product` (
- `id_shop`,
- `id_currency`,
- `id_country`,
- `id_group`,
- `from_quantity`,
- `from`,
+ `id_shop`, `id_currency`, `id_country`,
+ `id_group`, `from_quantity`, `from`,
`to`
)
) ENGINE = ENGINE_TYPE DEFAULT CHARSET = utf8
@@ -465,27 +461,13 @@ AFTER
INSERT INTO `PREFIX_cms_category_lang`
VALUES
(
- 1,
- 3,
- 'Inicio',
- '',
- 'home',
- NULL,
- NULL,
+ 1, 3, 'Inicio', '', 'home', NULL, NULL,
NULL
)
INSERT INTO `PREFIX_cms_category`
VALUES
- (
- 1,
- 0,
- 0,
- 1,
- NOW(),
- NOW(),
- 0
- )
+ (1, 0, 0, 1, NOW(), NOW(), 0)
UPDATE
`PREFIX_cms_category`
@@ -507,18 +489,10 @@ 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`
+ `id_product`, `id_shop`, `id_currency`,
+ `id_country`, `id_group`, `priority`,
+ `price`, `from_quantity`, `reduction`,
+ `reduction_type`, `from`, `to`
) (
SELECT
dq.`id_product`,
@@ -530,40 +504,28 @@ INSERT INTO `PREFIX_specific_price` (
0.00,
dq.`quantity`,
IF(
- dq.`id_discount_type` = 2,
- dq.`value`,
+ dq.`id_discount_type` = 2, dq.`value`,
dq.`value` / 100
),
IF (
- dq.`id_discount_type` = 2,
- 'amount',
+ dq.`id_discount_type` = 2, 'amount',
'percentage'
),
'0000-00-00 00:00:00',
'0000-00-00 00:00:00'
FROM
`PREFIX_discount_quantity` dq
- INNER JOIN `PREFIX_product` p ON (
- p.`id_product` = dq.`id_product`
- )
+ INNER JOIN `PREFIX_product` p ON (p.`id_product` = dq.`id_product`)
)
DROP
TABLE `PREFIX_discount_quantity`
INSERT INTO `PREFIX_specific_price` (
- `id_product`,
- `id_shop`,
- `id_currency`,
- `id_country`,
- `id_group`,
- `priority`,
- `price`,
- `from_quantity`,
- `reduction`,
- `reduction_type`,
- `from`,
- `to`
+ `id_product`, `id_shop`, `id_currency`,
+ `id_country`, `id_group`, `priority`,
+ `price`, `from_quantity`, `reduction`,
+ `reduction_type`, `from`, `to`
) (
SELECT
p.`id_product`,
@@ -575,24 +537,20 @@ INSERT INTO `PREFIX_specific_price` (
0.00,
1,
IF(
- p.`reduction_price` > 0,
- p.`reduction_price`,
+ p.`reduction_price` > 0, p.`reduction_price`,
p.`reduction_percent` / 100
),
IF(
- p.`reduction_price` > 0,
- 'amount',
+ p.`reduction_price` > 0, 'amount',
'percentage'
),
IF (
p.`reduction_from` = p.`reduction_to`,
- '0000-00-00 00:00:00',
- p.`reduction_from`
+ '0000-00-00 00:00:00', p.`reduction_from`
),
IF (
p.`reduction_from` = p.`reduction_to`,
- '0000-00-00 00:00:00',
- p.`reduction_to`
+ '0000-00-00 00:00:00', p.`reduction_to`
)
FROM
`PREFIX_product` p
@@ -613,78 +571,49 @@ DROP
`reduction_to`
INSERT INTO `PREFIX_configuration` (
- `name`,
- `value`,
- `date_add`,
- `date_upd`
+ `name`, `value`, `date_add`, `date_upd`
)
VALUES
(
'PS_SPECIFIC_PRICE_PRIORITIES',
'id_shop;id_currency;id_country;id_group',
- NOW(),
- NOW()
- ),
- (
- 'PS_TAX_DISPLAY',
- 0,
- NOW(),
- NOW()
+ NOW(), NOW()
),
+ ('PS_TAX_DISPLAY', 0, NOW(), NOW()),
(
- 'PS_SMARTY_FORCE_COMPILE',
- 1,
- NOW(),
+ 'PS_SMARTY_FORCE_COMPILE', 1, NOW(),
NOW()
),
(
- 'PS_DISTANCE_UNIT',
- 'km',
- NOW(),
- NOW()
+ 'PS_DISTANCE_UNIT', 'km', NOW(), NOW()
),
(
- 'PS_STORES_DISPLAY_CMS',
- 0,
- NOW(),
+ 'PS_STORES_DISPLAY_CMS', 0, NOW(),
NOW()
),
(
- 'PS_STORES_DISPLAY_FOOTER',
- 0,
- NOW(),
+ 'PS_STORES_DISPLAY_FOOTER', 0, NOW(),
NOW()
),
(
- 'PS_STORES_SIMPLIFIED',
- 0,
- NOW(),
+ 'PS_STORES_SIMPLIFIED', 0, NOW(),
NOW()
),
(
'PS_STATSDATA_CUSTOMER_PAGESVIEWS',
- 1,
- NOW(),
- NOW()
+ 1, NOW(), NOW()
),
(
- 'PS_STATSDATA_PAGESVIEWS',
- 1,
- NOW(),
+ 'PS_STATSDATA_PAGESVIEWS', 1, NOW(),
NOW()
),
(
- 'PS_STATSDATA_PLUGINS',
- 1,
- NOW(),
+ 'PS_STATSDATA_PLUGINS', 1, NOW(),
NOW()
)
INSERT INTO `PREFIX_configuration` (
- `name`,
- `value`,
- `date_add`,
- `date_upd`
+ `name`, `value`, `date_add`, `date_upd`
)
VALUES
(
@@ -729,61 +658,30 @@ WHERE
)
INSERT INTO `PREFIX_hook` (
- `name`,
- `title`,
- `description`,
- `position`
+ `name`, `title`, `description`, `position`
)
VALUES
(
- 'processCarrier',
- 'Carrier Process',
- NULL,
- 0
+ 'processCarrier', 'Carrier Process',
+ NULL, 0
)
INSERT INTO `PREFIX_stock_mvt_reason_lang` (
- `id_stock_mvt_reason`,
- `id_lang`,
+ `id_stock_mvt_reason`, `id_lang`,
`name`
)
VALUES
+ (1, 1, 'Order'),
+ (1, 2, 'Commande'),
+ (2, 1, 'Missing Stock Movement'),
(
- 1,
- 1,
- 'Order'
- ),
- (
- 1,
- 2,
- 'Commande'
- ),
- (
- 2,
- 1,
- 'Missing Stock Movement'
- ),
- (
- 2,
- 2,
- 'Mouvement de stock manquant'
- ),
- (
- 3,
- 1,
- 'Restocking'
+ 2, 2, 'Mouvement de stock manquant'
),
- (
- 3,
- 2,
- 'Réassort'
- )
+ (3, 1, 'Restocking'),
+ (3, 2, 'Réassort')
INSERT INTO `PREFIX_meta_lang` (
- `id_lang`,
- `id_meta`,
- `title`,
- `url_rewrite`
+ `id_lang`, `id_meta`, `title`, `url_rewrite`
)
VALUES
(
diff --git a/tests/highlight.html b/tests/highlight.html
index f5b3ea9..5db651d 100644
--- a/tests/highlight.html
+++ b/tests/highlight.html
@@ -149,7 +149,7 @@
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_cms_category_lang`</span> <span style="font-weight:bold;">VALUES</span>(<span style="color: green;">1</span><span >,</span> <span style="color: green;">3</span><span >,</span> <span style="color: blue;">'Inicio'</span><span >,</span> <span style="color: blue;">''</span><span >,</span> <span style="color: blue;">'home'</span><span >,</span> <span style="font-weight:bold;">NULL</span><span >,</span> <span style="font-weight:bold;">NULL</span><span >,</span> <span style="font-weight:bold;">NULL</span>)</pre>
-<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_cms_category`</span> <span style="font-weight:bold;">VALUES</span>(<span style="color: green;">1</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW</span>()<span >,</span> <span style="font-weight:bold;">NOW</span>()<span >,</span><span style="color: green;">0</span>)</pre>
+<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_cms_category`</span> <span style="font-weight:bold;">VALUES</span>(<span style="color: green;">1</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span><span style="color: green;">0</span>)</pre>
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">UPDATE</span> <span style="color: purple;">`PREFIX_cms_category`</span> <span style="font-weight:bold;">SET</span> <span style="color: purple;">`position`</span> <span >=</span> <span style="color: green;">0</span></pre>
@@ -190,18 +190,18 @@
<span style="font-weight:bold;">DROP</span> <span style="color: purple;">`reduction_to`</span></pre>
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_configuration`</span> (<span style="color: purple;">`name`</span><span >,</span> <span style="color: purple;">`value`</span><span >,</span> <span style="color: purple;">`date_add`</span><span >,</span> <span style="color: purple;">`date_upd`</span>) <span style="font-weight:bold;">VALUES</span>
-(<span style="color: blue;">'PS_SPECIFIC_PRICE_PRIORITIES'</span><span >,</span> <span style="color: blue;">'id_shop;id_currency;id_country;id_group'</span><span >,</span> <span style="font-weight:bold;">NOW</span>()<span >,</span> <span style="font-weight:bold;">NOW</span>())<span >,</span>
-(<span style="color: blue;">'PS_TAX_DISPLAY'</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="font-weight:bold;">NOW</span>()<span >,</span> <span style="font-weight:bold;">NOW</span>())<span >,</span>
-(<span style="color: blue;">'PS_SMARTY_FORCE_COMPILE'</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW</span>()<span >,</span> <span style="font-weight:bold;">NOW</span>())<span >,</span>
-(<span style="color: blue;">'PS_DISTANCE_UNIT'</span><span >,</span> <span style="color: blue;">'km'</span><span >,</span> <span style="font-weight:bold;">NOW</span>()<span >,</span> <span style="font-weight:bold;">NOW</span>())<span >,</span>
-(<span style="color: blue;">'PS_STORES_DISPLAY_CMS'</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="font-weight:bold;">NOW</span>()<span >,</span> <span style="font-weight:bold;">NOW</span>())<span >,</span>
-(<span style="color: blue;">'PS_STORES_DISPLAY_FOOTER'</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="font-weight:bold;">NOW</span>()<span >,</span> <span style="font-weight:bold;">NOW</span>())<span >,</span>
-(<span style="color: blue;">'PS_STORES_SIMPLIFIED'</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="font-weight:bold;">NOW</span>()<span >,</span> <span style="font-weight:bold;">NOW</span>())<span >,</span>
-(<span style="color: blue;">'PS_STATSDATA_CUSTOMER_PAGESVIEWS'</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW</span>()<span >,</span> <span style="font-weight:bold;">NOW</span>())<span >,</span>
-(<span style="color: blue;">'PS_STATSDATA_PAGESVIEWS'</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW</span>()<span >,</span> <span style="font-weight:bold;">NOW</span>())<span >,</span>
-(<span style="color: blue;">'PS_STATSDATA_PLUGINS'</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW</span>()<span >,</span> <span style="font-weight:bold;">NOW</span>())</pre>
-
-<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_configuration`</span> (<span style="color: purple;">`name`</span><span >,</span> <span style="color: purple;">`value`</span><span >,</span> <span style="color: purple;">`date_add`</span><span >,</span> <span style="color: purple;">`date_upd`</span>) <span style="font-weight:bold;">VALUES</span> (<span style="color: blue;">'PS_CONDITIONS_CMS_ID'</span><span >,</span> <span style="color: #333;">IFNULL</span>((<span style="font-weight:bold;">SELECT</span> <span style="color: purple;">`id_cms`</span> <span style="font-weight:bold;">FROM</span> <span style="color: purple;">`PREFIX_cms`</span> <span style="font-weight:bold;">WHERE</span> <span style="color: purple;">`id_cms`</span> <span >=</span> <span style="color: green;">3</span>)<span >,</span> <span style="color: green;">0</span>)<span >,</span> <span style="font-weight:bold;">NOW</span>()<span >,</span> <span style="font-weight:bold;">NOW</span>())</pre>
+(<span style="color: blue;">'PS_SPECIFIC_PRICE_PRIORITIES'</span><span >,</span> <span style="color: blue;">'id_shop;id_currency;id_country;id_group'</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>)<span >,</span>
+(<span style="color: blue;">'PS_TAX_DISPLAY'</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>)<span >,</span>
+(<span style="color: blue;">'PS_SMARTY_FORCE_COMPILE'</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>)<span >,</span>
+(<span style="color: blue;">'PS_DISTANCE_UNIT'</span><span >,</span> <span style="color: blue;">'km'</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>)<span >,</span>
+(<span style="color: blue;">'PS_STORES_DISPLAY_CMS'</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>)<span >,</span>
+(<span style="color: blue;">'PS_STORES_DISPLAY_FOOTER'</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>)<span >,</span>
+(<span style="color: blue;">'PS_STORES_SIMPLIFIED'</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>)<span >,</span>
+(<span style="color: blue;">'PS_STATSDATA_CUSTOMER_PAGESVIEWS'</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>)<span >,</span>
+(<span style="color: blue;">'PS_STATSDATA_PAGESVIEWS'</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>)<span >,</span>
+(<span style="color: blue;">'PS_STATSDATA_PLUGINS'</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>)</pre>
+
+<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_configuration`</span> (<span style="color: purple;">`name`</span><span >,</span> <span style="color: purple;">`value`</span><span >,</span> <span style="color: purple;">`date_add`</span><span >,</span> <span style="color: purple;">`date_upd`</span>) <span style="font-weight:bold;">VALUES</span> (<span style="color: blue;">'PS_CONDITIONS_CMS_ID'</span><span >,</span> <span style="font-weight:bold;">IFNULL</span>((<span style="font-weight:bold;">SELECT</span> <span style="color: purple;">`id_cms`</span> <span style="font-weight:bold;">FROM</span> <span style="color: purple;">`PREFIX_cms`</span> <span style="font-weight:bold;">WHERE</span> <span style="color: purple;">`id_cms`</span> <span >=</span> <span style="color: green;">3</span>)<span >,</span> <span style="color: green;">0</span>)<span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>)</pre>
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">CREATE</span> <span style="font-weight:bold;">TEMPORARY</span> <span style="font-weight:bold;">TABLE</span> <span style="color: purple;">`PREFIX_configuration_tmp`</span> (
<span style="color: purple;">`value`</span> <span style="color: #333;">text</span>