Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions pymysql/cursors.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@
#: You can use it to load large dataset.
RE_INSERT_VALUES = re.compile(
r"\s*((?:INSERT|REPLACE)\b.+\bVALUES?\s*)"
+ r"(\(\s*(?:%s|%\(.+\)s)\s*(?:,\s*(?:%s|%\(.+\)s)\s*)*\))"
+ r"(\s*(?:ON DUPLICATE.*)?);?\s*\Z",
+ r"(\(\s*(?:%s|%\([^)]+\)s)\s*(?:,\s*(?:%s|%\([^)]+\)s)\s*)*\))"
+ r'(\s*(?:AS\s+(?:`[^`]+`|"[^"]+"|[0-9A-Za-z_$]+)\s*'
+ r'(?:\(\s*(?:`[^`]+`|"[^"]+"|[0-9A-Za-z_$]+)\s*'
+ r'(?:,\s*(?:`[^`]+`|"[^"]+"|[0-9A-Za-z_$]+)\s*)*\))?\s*)?'
+ r"(?:ON DUPLICATE.*)?);?\s*\Z",
re.IGNORECASE | re.DOTALL,
)

Expand Down
25 changes: 25 additions & 0 deletions pymysql/tests/test_cursor.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,31 @@
import pytest


def test_re_insert_values_with_on_duplicate_key_alias():
m = pymysql.cursors.RE_INSERT_VALUES.match(
"INSERT INTO t1 (a,b,c) VALUES (%s,%s,%s) AS new "
"ON DUPLICATE KEY UPDATE c = new.a + new.b"
)
assert m is not None
assert m.group(1) == "INSERT INTO t1 (a,b,c) VALUES "
assert m.group(2) == "(%s,%s,%s)"
assert m.group(3) == " AS new ON DUPLICATE KEY UPDATE c = new.a + new.b"

m = pymysql.cursors.RE_INSERT_VALUES.match(
"INSERT INTO t1 (a,b,c) VALUES (%s,%s,%s) AS new(n1,n2,n3) "
"ON DUPLICATE KEY UPDATE c = n1 + n2"
)
assert m is not None
assert m.group(3) == " AS new(n1,n2,n3) ON DUPLICATE KEY UPDATE c = n1 + n2"

m = pymysql.cursors.RE_INSERT_VALUES.match(
"INSERT INTO t1 (a,b,c) VALUES (%s,%s,%s) "
"ON DUPLICATE KEY UPDATE c=VALUES(a)+VALUES(b)"
)
assert m is not None
assert m.group(3) == " ON DUPLICATE KEY UPDATE c=VALUES(a)+VALUES(b)"


class CursorTest(base.PyMySQLTestCase):
def setUp(self):
super().setUp()
Expand Down
Loading