summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradityagoyal <ang.adityagoyal@yahoo.com>2013-06-30 07:07:05 +0530
committeradityagoyal <ang.adityagoyal@yahoo.com>2013-06-30 07:07:05 +0530
commit33d79737c077ba9d5606bcfa398e8926dc56f1cf (patch)
tree8a24bf20dbb2015cf4784cbddf892a938d621078
parentfdaa5692efd1049d244d0c0aba403978ab02d428 (diff)
downloadsql-formatter-33d79737c077ba9d5606bcfa398e8926dc56f1cf.zip
sql-formatter-33d79737c077ba9d5606bcfa398e8926dc56f1cf.tar.gz
sql-formatter-33d79737c077ba9d5606bcfa398e8926dc56f1cf.tar.bz2
removed extra parenthesis and indented code by replacing tab with spaces.
removed extra parenthesis and indented code by replacing tab with spaces.
-rw-r--r--lib/SqlFormatter.php32
1 files changed, 16 insertions, 16 deletions
diff --git a/lib/SqlFormatter.php b/lib/SqlFormatter.php
index 3dd1655..0395209 100644
--- a/lib/SqlFormatter.php
+++ b/lib/SqlFormatter.php
@@ -45,16 +45,16 @@ class SqlFormatter
'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','MAX_CONNECTIONS_PER_HOUR', 'MAX_QUERIES_PER_HOUR', 'MAX_ROWS', 'MAX_UPDATES_PER_HOUR', 'MAX_USER_CONNECTIONS',
- 'MEDIUM', 'MERGE', 'MINUTE', 'MINUTE_SECOND', 'MIN_ROWS', 'MODE', 'MODIFY',
+ 'MEDIUM', 'MERGE', 'MINUTE', 'MINUTE_SECOND', 'MIN_ROWS', 'MODE', 'MODIFY',
'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', 'RAID0', 'RAID_CHUNKS', 'RAID_CHUNKSIZE','RAID_TYPE', 'READ', 'READ_ONLY',
'READ_WRITE', 'REFERENCES', 'REGEXP', 'RELOAD', 'RENAME', 'REPAIR', 'REPEATABLE', 'REPLACE', 'REPLICATION', 'RESET', 'RESTORE', 'RESTRICT',
'RETURN', 'RETURNS', 'REVOKE', 'RLIKE', 'ROLLBACK', 'ROW', 'ROWS', 'ROW_FORMAT', 'SECOND', 'SECURITY', 'SEPARATOR',
'SERIALIZABLE', 'SESSION', 'SHARE', 'SHOW', 'SHUTDOWN', 'SLAVE', 'SONAME', 'SOUNDS', 'SQL', 'SQL_AUTO_IS_NULL', 'SQL_BIG_RESULT',
- 'SQL_BIG_SELECTS', 'SQL_BIG_TABLES', 'SQL_BUFFER_RESULT', 'SQL_CALC_FOUND_ROWS', 'SQL_LOG_BIN', 'SQL_LOG_OFF', 'SQL_LOG_UPDATE',
- 'SQL_LOW_PRIORITY_UPDATES', 'SQL_MAX_JOIN_SIZE', 'SQL_QUOTE_SHOW_CREATE', 'SQL_SAFE_UPDATES', 'SQL_SELECT_LIMIT', 'SQL_SLAVE_SKIP_COUNTER',
- 'SQL_SMALL_RESULT', 'SQL_WARNINGS', 'SQL_CACHE', 'SQL_NO_CACHE', 'START', 'STARTING', 'STATUS', 'STOP', 'STORAGE',
+ 'SQL_BIG_SELECTS', 'SQL_BIG_TABLES', 'SQL_BUFFER_RESULT', 'SQL_CALC_FOUND_ROWS', 'SQL_LOG_BIN', 'SQL_LOG_OFF', 'SQL_LOG_UPDATE',
+ 'SQL_LOW_PRIORITY_UPDATES', 'SQL_MAX_JOIN_SIZE', 'SQL_QUOTE_SHOW_CREATE', 'SQL_SAFE_UPDATES', 'SQL_SELECT_LIMIT', 'SQL_SLAVE_SKIP_COUNTER',
+ 'SQL_SMALL_RESULT', 'SQL_WARNINGS', 'SQL_CACHE', 'SQL_NO_CACHE', 'START', 'STARTING', 'STATUS', 'STOP', 'STORAGE',
'STRAIGHT_JOIN', 'STRING', 'STRIPED', 'SUPER', 'TABLE', 'TABLES', 'TEMPORARY', 'TERMINATED', 'THEN', 'TO', 'TRAILING', 'TRANSACTIONAL', 'TRUE',
'TRUNCATE', 'TYPE', 'TYPES', 'UNCOMMITTED', 'UNIQUE', 'UNLOCK', 'UNSIGNED', 'USAGE', 'USE', 'USING', 'VARIABLES',
'VIEW', 'WHEN', 'WITH', 'WORK', 'WRITE', 'XOR', 'YEAR_MONTH'
@@ -699,7 +699,7 @@ class SqlFormatter
$result .= $token[self::TOKEN_VALUE];
}
- $result = self::remove_blank_lines($result);
+ $result = self::remove_blank_lines($result);
return $result;
}
@@ -981,15 +981,15 @@ class SqlFormatter
if(isset(self::$cli)) return self::$cli;
else return php_sapi_name() === 'cli';
}
-
- /**
- *@param String $sql from which blank lines need to be removed
- *
- * @return String sql without blank lines
- */
- private static function remove_blank_lines($sql)
- {
- return preg_replace('/^\n+|^[\t\s]*\n+/m','',$sql);
- }
-}
+
+ /**
+ * Removes blank line between and before sql statements.
+ *@param String $sql from which blank lines need to be removed
+ *
+ * @return String sql without blank lines
+ */
+ private static function remove_blank_lines($sql)
+ {
+ return preg_replace('/^\n+|^[\t\s]*\n+/m','',$sql);
+ }
}