diff --git a/data/txt/keywords.txt b/data/txt/keywords.txt index ec3e58c4a..2a89f9106 100644 --- a/data/txt/keywords.txt +++ b/data/txt/keywords.txt @@ -452,26 +452,13 @@ WRITEXOR YEAR_MONTH ZEROFILL -# PostgreSQL keywords (reference: https://www.postgresql.org/docs/9.3/sql-keywords-appendix.html) +# PostgreSQL|SQL:2016|SQL:2011 reserved words (reference: https://www.postgresql.org/docs/current/sql-keywords-appendix.html) -A -ABORT ABS -ABSENT -ABSOLUTE -ACCESS -ACCORDING -ACTION -ADA -ADD -ADMIN -AFTER -AGGREGATE +ACOS ALL ALLOCATE -ALSO ALTER -ALWAYS ANALYSE ANALYZE AND @@ -483,110 +470,61 @@ ARRAY_MAX_CARDINALITY AS ASC ASENSITIVE -ASSERTION -ASSIGNMENT +ASIN ASYMMETRIC AT +ATAN ATOMIC -ATTRIBUTE -ATTRIBUTES AUTHORIZATION AVG -BACKWARD -BASE64 -BEFORE BEGIN BEGIN_FRAME BEGIN_PARTITION -BERNOULLI BETWEEN BIGINT BINARY -BIT -BIT_LENGTH BLOB -BLOCKED -BOM BOOLEAN BOTH -BREADTH BY -C -CACHE CALL CALLED CARDINALITY -CASCADE CASCADED CASE CAST -CATALOG -CATALOG_NAME CEIL CEILING -CHAIN CHAR CHARACTER -CHARACTERISTICS -CHARACTERS CHARACTER_LENGTH -CHARACTER_SET_CATALOG -CHARACTER_SET_NAME -CHARACTER_SET_SCHEMA CHAR_LENGTH CHECK -CHECKPOINT -CLASS -CLASS_ORIGIN +CLASSIFIER CLOB CLOSE -CLUSTER COALESCE -COBOL COLLATE COLLATION -COLLATION_CATALOG -COLLATION_NAME -COLLATION_SCHEMA COLLECT COLUMN -COLUMNS -COLUMN_NAME -COMMAND_FUNCTION -COMMAND_FUNCTION_CODE -COMMENT -COMMENTS COMMIT -COMMITTED CONCURRENTLY CONDITION -CONDITION_NUMBER -CONFIGURATION CONNECT -CONNECTION -CONNECTION_NAME CONSTRAINT -CONSTRAINTS -CONSTRAINT_CATALOG -CONSTRAINT_NAME -CONSTRAINT_SCHEMA -CONSTRUCTOR CONTAINS -CONTENT -CONTINUE -CONTROL -CONVERSION CONVERT COPY CORR CORRESPONDING -COST +COS +COSH COUNT COVAR_POP COVAR_SAMP CREATE CROSS -CSV CUBE CUME_DIST CURRENT @@ -602,44 +540,25 @@ CURRENT_TIMESTAMP CURRENT_TRANSFORM_GROUP_FOR_TYPE CURRENT_USER CURSOR -CURSOR_NAME CYCLE -DATA -DATABASE DATALINK DATE -DATETIME_INTERVAL_CODE -DATETIME_INTERVAL_PRECISION DAY -DB DEALLOCATE DEC +DECFLOAT DECIMAL DECLARE DEFAULT -DEFAULTS DEFERRABLE -DEFERRED -DEFINED -DEFINER -DEGREE +DEFINE DELETE -DELIMITER -DELIMITERS DENSE_RANK -DEPTH DEREF -DERIVED DESC DESCRIBE -DESCRIPTOR DETERMINISTIC -DIAGNOSTICS -DICTIONARY -DISABLE -DISCARD DISCONNECT -DISPATCH DISTINCT DLNEWCOPY DLPREVIOUSCOPY @@ -653,313 +572,176 @@ DLURLSCHEME DLURLSERVER DLVALUE DO -DOCUMENT -DOMAIN DOUBLE DROP DYNAMIC -DYNAMIC_FUNCTION -DYNAMIC_FUNCTION_CODE EACH ELEMENT ELSE EMPTY -ENABLE -ENCODING -ENCRYPTED END END-EXEC END_FRAME END_PARTITION -ENFORCED -ENUM EQUALS ESCAPE -EVENT EVERY EXCEPT -EXCEPTION -EXCLUDE -EXCLUDING -EXCLUSIVE EXEC EXECUTE EXISTS EXP -EXPLAIN -EXPRESSION -EXTENSION EXTERNAL EXTRACT FALSE -FAMILY FETCH -FILE FILTER -FINAL -FIRST FIRST_VALUE -FLAG FLOAT FLOOR -FOLLOWING FOR -FORCE FOREIGN -FORTRAN -FORWARD -FOUND FRAME_ROW FREE FREEZE FROM -FS FULL FUNCTION -FUNCTIONS FUSION -G -GENERAL -GENERATED GET GLOBAL -GO -GOTO GRANT -GRANTED -GREATEST GROUP GROUPING GROUPS -HANDLER HAVING -HEADER -HEX -HIERARCHY HOLD HOUR -ID IDENTITY -IF -IGNORE ILIKE -IMMEDIATE -IMMEDIATELY -IMMUTABLE -IMPLEMENTATION -IMPLICIT IMPORT IN -INCLUDING -INCREMENT -INDENT -INDEX -INDEXES INDICATOR -INHERIT -INHERITS +INITIAL INITIALLY -INLINE INNER INOUT -INPUT INSENSITIVE INSERT -INSTANCE -INSTANTIABLE -INSTEAD INT INTEGER -INTEGRITY INTERSECT INTERSECTION INTERVAL INTO -INVOKER IS ISNULL -ISOLATION JOIN -K -KEY -KEY_MEMBER -KEY_TYPE -LABEL +JSON_ARRAY +JSON_ARRAYAGG +JSON_EXISTS +JSON_OBJECT +JSON_OBJECTAGG +JSON_QUERY +JSON_TABLE +JSON_TABLE_PRIMITIVE +JSON_VALUE LAG LANGUAGE LARGE -LAST LAST_VALUE LATERAL -LC_COLLATE -LC_CTYPE LEAD LEADING -LEAKPROOF -LEAST LEFT -LENGTH -LEVEL -LIBRARY LIKE LIKE_REGEX LIMIT -LINK -LISTEN +LISTAGG LN -LOAD LOCAL LOCALTIME LOCALTIMESTAMP -LOCATION -LOCATOR -LOCK +LOG +LOG10 LOWER -M -MAP -MAPPING MATCH -MATCHED -MATERIALIZED +MATCHES +MATCH_NUMBER +MATCH_RECOGNIZE MAX -MAXVALUE -MAX_CARDINALITY +MEASURES MEMBER MERGE -MESSAGE_LENGTH -MESSAGE_OCTET_LENGTH -MESSAGE_TEXT METHOD MIN MINUTE -MINVALUE MOD -MODE MODIFIES MODULE MONTH -MORE -MOVE MULTISET -MUMPS -NAME -NAMES -NAMESPACE NATIONAL NATURAL NCHAR NCLOB -NESTING NEW -NEXT -NFC -NFD -NFKC -NFKD -NIL NO NONE NORMALIZE -NORMALIZED NOT -NOTHING -NOTIFY NOTNULL -NOWAIT NTH_VALUE NTILE NULL -NULLABLE NULLIF -NULLS -NUMBER NUMERIC -OBJECT OCCURRENCES_REGEX -OCTETS OCTET_LENGTH OF -OFF OFFSET -OIDS OLD +OMIT ON +ONE ONLY OPEN -OPERATOR -OPTION -OPTIONS OR ORDER -ORDERING -ORDINALITY -OTHERS OUT OUTER -OUTPUT OVER OVERLAPS OVERLAY -OVERRIDING -OWNED -OWNER -P -PAD PARAMETER -PARAMETER_MODE -PARAMETER_NAME -PARAMETER_ORDINAL_POSITION -PARAMETER_SPECIFIC_CATALOG -PARAMETER_SPECIFIC_NAME -PARAMETER_SPECIFIC_SCHEMA -PARSER -PARTIAL PARTITION -PASCAL -PASSING -PASSTHROUGH -PASSWORD -PATH +PATTERN +PER PERCENT PERCENTILE_CONT PERCENTILE_DISC PERCENT_RANK PERIOD -PERMISSION +PERMUTE PLACING -PLANS -PLI PORTION POSITION POSITION_REGEX POWER PRECEDES -PRECEDING PRECISION PREPARE -PREPARED -PRESERVE PRIMARY -PRIOR -PRIVILEGES -PROCEDURAL PROCEDURE -PROGRAM -PUBLIC -QUOTE +PTF RANGE RANK -READ READS REAL -REASSIGN -RECHECK -RECOVERY RECURSIVE REF REFERENCES REFERENCING -REFRESH REGR_AVGX REGR_AVGY REGR_COUNT @@ -969,185 +751,87 @@ REGR_SLOPE REGR_SXX REGR_SXY REGR_SYY -REINDEX -RELATIVE RELEASE -RENAME -REPEATABLE -REPLACE -REPLICA -REQUIRING -RESET -RESPECT -RESTART -RESTORE -RESTRICT RESULT RETURN -RETURNED_CARDINALITY -RETURNED_LENGTH -RETURNED_OCTET_LENGTH -RETURNED_SQLSTATE RETURNING RETURNS REVOKE RIGHT -ROLE ROLLBACK ROLLUP -ROUTINE -ROUTINE_CATALOG -ROUTINE_NAME -ROUTINE_SCHEMA ROW ROWS -ROW_COUNT ROW_NUMBER -RULE +RUNNING SAVEPOINT -SCALE -SCHEMA -SCHEMA_NAME SCOPE -SCOPE_CATALOG -SCOPE_NAME -SCOPE_SCHEMA SCROLL SEARCH SECOND -SECTION -SECURITY +SEEK SELECT -SELECTIVE -SELF SENSITIVE -SEQUENCE -SEQUENCES -SERIALIZABLE -SERVER -SERVER_NAME -SESSION SESSION_USER SET -SETOF -SETS -SHARE SHOW SIMILAR -SIMPLE -SIZE +SIN +SINH +SKIP SMALLINT -SNAPSHOT SOME -SOURCE -SPACE SPECIFIC SPECIFICTYPE -SPECIFIC_NAME SQL -SQLCODE -SQLERROR SQLEXCEPTION SQLSTATE SQLWARNING SQRT -STABLE -STANDALONE START -STATE -STATEMENT STATIC -STATISTICS STDDEV_POP STDDEV_SAMP -STDIN -STDOUT -STORAGE -STRICT -STRIP -STRUCTURE -STYLE -SUBCLASS_ORIGIN SUBMULTISET +SUBSET SUBSTRING SUBSTRING_REGEX SUCCEEDS SUM SYMMETRIC -SYSID SYSTEM SYSTEM_TIME SYSTEM_USER -T TABLE -TABLES TABLESAMPLE -TABLESPACE -TABLE_NAME -TEMP -TEMPLATE -TEMPORARY -TEXT +TAN +TANH THEN -TIES TIME TIMESTAMP TIMEZONE_HOUR TIMEZONE_MINUTE TO -TOKEN -TOP_LEVEL_COUNT TRAILING -TRANSACTION -TRANSACTIONS_COMMITTED -TRANSACTIONS_ROLLED_BACK -TRANSACTION_ACTIVE -TRANSFORM -TRANSFORMS TRANSLATE TRANSLATE_REGEX TRANSLATION TREAT TRIGGER -TRIGGER_CATALOG -TRIGGER_NAME -TRIGGER_SCHEMA TRIM TRIM_ARRAY TRUE TRUNCATE -TRUSTED -TYPE -TYPES UESCAPE -UNBOUNDED -UNCOMMITTED -UNDER -UNENCRYPTED UNION UNIQUE UNKNOWN -UNLINK -UNLISTEN -UNLOGGED -UNNAMED +UNMATCHED UNNEST -UNTIL -UNTYPED UPDATE UPPER -URI -USAGE USER -USER_DEFINED_TYPE_CATALOG -USER_DEFINED_TYPE_CODE -USER_DEFINED_TYPE_NAME -USER_DEFINED_TYPE_SCHEMA USING -VACUUM -VALID -VALIDATE -VALIDATOR VALUE VALUES VALUE_OF @@ -1158,22 +842,15 @@ VARYING VAR_POP VAR_SAMP VERBOSE -VERSION VERSIONING -VIEW -VOLATILE WHEN WHENEVER WHERE -WHITESPACE WIDTH_BUCKET WINDOW WITH WITHIN WITHOUT -WORK -WRAPPER -WRITE XML XMLAGG XMLATTRIBUTES @@ -1181,7 +858,6 @@ XMLBINARY XMLCAST XMLCOMMENT XMLCONCAT -XMLDECLARATION XMLDOCUMENT XMLELEMENT XMLEXISTS @@ -1191,12 +867,8 @@ XMLNAMESPACES XMLPARSE XMLPI XMLQUERY -XMLROOT -XMLSCHEMA XMLSERIALIZE XMLTABLE XMLTEXT XMLVALIDATE YEAR -YES -ZONE diff --git a/lib/core/settings.py b/lib/core/settings.py index 6a49795e2..bf932fdfc 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -18,7 +18,7 @@ from lib.core.enums import OS from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.4.7.14" +VERSION = "1.4.7.15" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)