From 4722816635cd6cc4ddc13756f5f922126011a95e Mon Sep 17 00:00:00 2001
From: Semyon Proshev <Semyon.Proshev@jetbrains.com>
Date: Mon, 29 Feb 2016 18:19:19 +0300
Subject: [PATCH] PY-16814 Fixed: No Language Injection for PostgresQL WITH 
 statements PY-18345 Fixed: SQL dialect incorrect after update to 5.0.4
 PY-18871 Fixed: Wrong SQL detection

Improve SQL injection by pyInjections.xml enhancement
---
 .../src/resources/pyInjections.xml            | 72 ++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/python/IntelliLang-python/src/resources/pyInjections.xml b/python/IntelliLang-python/src/resources/pyInjections.xml
index f20273e7d1df..cb6bb415ba37 100644
--- a/python/IntelliLang-python/src/resources/pyInjections.xml
+++ b/python/IntelliLang-python/src/resources/pyInjections.xml
@@ -9,6 +9,76 @@
   </injection>
   <injection language="SQL" injector-id="python">
     <display-name>"SQL select/delete/insert/update/create"</display-name>
-    <place><![CDATA[pyStringLiteralMatches("((SELECT|DELETE)\\s.*FROM)|((INSERT|REPLACE)\\s.*INTO)|(UPDATE\\s.*SET)|((CREATE|DROP|ALTER)\\s.*(TABLE|INDEX|VIEW))")]]></place>
+
+    <!-- template for SQL statements -->
+    <!--                                              \/     matches SQL comments     \/   \/ start statement regexp here -->
+    <!-- <place><![CDATA[pyStringLiteralMatches("^\\s*(((- -|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*")]]></place> -->
+    <!--                                                 /\ don't forget to remove this space -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(SELECT\\s.+\\sFROM\\s.+)")]]></place>
+    <!-- SELECT smth FROM smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(INSERT\\s+INTO\\s.+)")]]></place>
+    <!-- INSERT INTO smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(UPDATE\\s.+\\sSET\\s.+)")]]></place>
+    <!-- UPDATE smth SET smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(DELETE\\s+(\\*\\s+)?FROM\\s.+)")]]></place>
+    <!-- DELETE *? FROM smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*((CREATE|DROP)\\s+DATABASE\\s.+)")]]></place>
+    <!-- CREATE|DROP DATABASE smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(CREATE\\s+TABLE\\s.+\\(.+\\))")]]></place>
+    <!-- CREATE TABLE smth (...) -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*((ALTER|TRUNCATE)\\s+TABLE\\s.+)")]]></place>
+    <!-- ALTER|TRUNCATE TABLE smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(DROP\\s+TABLE\\s.+)")]]></place>
+    <!-- DROP TABLE smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(CREATE\\s+(UNIQUE\\s+)?INDEX\\s.+\\sON\\s.+)")]]></place>
+    <!-- CREATE UNIQUE? INDEX smth ON smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*((ALTER|DROP)\\s+INDEX\\s.+)")]]></place>
+    <!-- ALTER|DROP INDEX smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(CREATE\\s+(OR\\s+REPLACE\\s+)?VIEW\\s.+\\sAS\\s.+)")]]></place>
+    <!-- CREATE (OR REPLACE)? VIEW smth AS smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*((ALTER|DROP)\\s+VIEW\\s.+)")]]></place>
+    <!-- ALTER|DROP VIEW smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(REPLACE\\s+INTO\\s.+)")]]></place>
+    <!-- REPLACE INTO smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(WITH\\s.+\\sAS\\s.+)")]]></place>
+    <!-- WITH smth AS smth-->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(COPY\\s.+\\s(FROM|TO)\\s.+)")]]></place>
+    <!-- COPY smth (FROM|TO) smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(CREATE\\s+(OR\\s+REPLACE\\s+)?TRIGGER\\s.+\\sON\\s.+)")]]></place>
+    <!-- CREATE (OR REPLACE)? TRIGGER smth ON smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(CREATE\\s+(OR\\s+REPLACE\\s+)?FUNCTION\\s.+\\sRETURNS?\\s.+)")]]></place>
+    <!-- CREATE (OR REPLACE)? FUNCTION smth RETURNS? smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(CREATE\\s+(OR\\s+REPLACE\\s+)?PROC(EDURE)?\\s.+)")]]></place>
+    <!-- CREATE (OR REPLACE)? PROC(EDURE)? smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(ALTER\\s+SEQUENCE\\s.+)")]]></place>
+    <!-- ALTER SEQUENCE smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(BEGIN\\s.+\\sEND;?\$)")]]></place>
+    <!-- Oracle transaction: BEGIN smth END;?$ -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*(BEGIN\\s+TRAN(SACTION)?\\s.+)")]]></place>
+    <!-- TSQL transaction: BEGIN TRAN(SACTION)? smth -->
+
+    <place><![CDATA[pyStringLiteralMatches("^\\s*(((--|#)[^\n\r]*)|(/\\*.*\\*/))*\\s*((BEGIN)|(START TRANSACTION))(\\s[^\n\r]+)?;")]]></place>
+    <!-- MySQL/PostgreSQL transaction: ((BEGIN)|(START TRANSACTION))( smth)?; -->
   </injection>
 </component>