Commit Graph

700 Commits

Author SHA1 Message Date
Mick Semb Wever 3c66c74a0f
Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  3.x cqlshlib tests broken on python2.7
2025-12-19 23:34:52 +01:00
Mick Semb Wever 0293e8b750
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  3.x cqlshlib tests broken on python2.7
2025-12-19 23:34:02 +01:00
Mick Semb Wever 9e04193c3f
3.x cqlshlib tests broken on python2.7
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-21079
2025-12-19 23:22:13 +01:00
mck fd3f8249d5
Fix cassandra-cqlsh-tests.sh on python <= 3.8
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-20669
2025-05-21 23:26:33 +02:00
Francisco Guerrero 4f9e474bb1
Fix autocompletion for role names/user names
patch by Francisco Guerrero; reviewed by Stefan Miklosovic, Bernardo Botella for CASSANDRA-20175
2025-02-04 10:44:12 +01:00
vgali7 a79f7f4b00
Fix text containing "/*" being interpreted as multiline comment in cqlsh
patch by Vineet Gali; reviewed by Brandon Williams, Brad Schoening for CASSANDRA-17667

Co-authored-by: Attila Homoki <biotep@yahoo.com>
Co-authored-by: Brad Schoening <bschoeni@gmail.com>
2024-09-24 13:21:24 +02:00
Mick Semb Wever aa2494b30b
Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Missing license info and headers
2023-08-31 22:39:56 +02:00
Mick Semb Wever 14e89fc3c7
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Missing license info and headers
2023-08-31 22:36:33 +02:00
Mick Semb Wever ce49e775f7
Missing license info and headers
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-18807
2023-08-31 22:30:42 +02:00
Brandon Williams b43293e200 Upgrade cython
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18121
2023-01-20 15:24:41 -06:00
Brandon Williams f6933a0419 convert cqlshlib from nose to pytest
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18088
2023-01-20 15:24:29 -06:00
Brandon Williams 563a26c6b1 get newest pip in cassandra-cqlsh-tests.sh
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18121
2023-01-20 15:24:17 -06:00
Brandon Williams 0b5248d8c3 Accommodate python 3.11
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18088
2023-01-20 15:23:58 -06:00
Maciej Sokol 175272fff4 Fix formatting of duration in cqlsh
Patch by Maciej Sokol; reviewed by brandonwilliams and edimitrova for
CASSANDRA-18141
2023-01-17 14:28:31 -06:00
Bereng 1df8174d67 Cqlshlib tests are j11 greedy
Patch by Berenguer Blasi; reviewed by Ekaterina Dimitrova and Michael Semb Wever for CASSANDRA-18039
2022-11-15 09:31:45 +01:00
Bereng 0f2fb1eeb3 Cqlsh Cython failure on 4.0
Patch by Berenguer Blasi; reviewed by Michael Semb Wever for CASSANDRA-18036
2022-11-11 10:56:02 +01:00
Mick Semb Wever 38806e795b
Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Upgrade Cython, minimum required now is 0.27.2
2022-11-10 14:41:34 +01:00
Mick Semb Wever a44209cf43
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Upgrade Cython, minimum required now is 0.27.2
2022-11-10 14:40:29 +01:00
Mick Semb Wever d9ef794ef6
Upgrade Cython, minimum required now is 0.27.2
patch by Mick Semb Wever; reviewed by Berenguer Blasi for CASSANDRA-18028
2022-11-10 14:34:55 +01:00
Stefan Miklosovic e9b411e3e0 Merge branch 'cassandra-3.11' into cassandra-4.0 2022-10-03 12:06:37 +02:00
Stefan Miklosovic ad6bca4ab5 Merge branch 'cassandra-3.0' into cassandra-3.11 2022-10-03 10:43:08 +02:00
Brad Schoening 83c1f7713b Fix auto-completing "WITH" when creating a materialized view (CASSANDRA-17879)
patch by Brad Schoening; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-17879
2022-10-03 10:35:38 +02:00
Bereng bb5b2d2889 Merge branch 'cassandra-3.11' into cassandra-4.0 2022-06-14 06:59:00 +02:00
Tanuj Nayak f884dda75b CQLSH unicode control character list is too liberal
patch by Tanuj Nayak; reviewed by Berenguer Blasi, Brandon Williams for CASSANDRA-17617
2022-06-14 06:57:16 +02:00
Brandon Williams f3123a6538 remove futures module requirement from pylib
patch by Brandon Williams; reviewed by Stefan Miklosovic for CASSANDRA-17393
2022-03-15 10:16:27 +01:00
Aleksei Zotov c3d51a825c Merge branch 'cassandra-3.0' into cassandra-3.11 2022-02-19 13:20:04 +04:00
Aleksei Zotov d17b16c9b1 Fix flaky test - test_cqlsh_completion.TestCqlshCompletion
Patch by Aleksei Zotov; reviewed by Brandon Williams for CASSANDRA-17338
2022-02-19 13:18:38 +04:00
Aleksei Zotov e77738f0c3 Merge branch 'cassandra-3.0' into cassandra-3.11 2022-02-17 22:59:27 +04:00
Aleksei Zotov 63788661cb Fixed TestCqlshOutput failing tests
Patch by Aleksei Zotov; reviewed by Brandon Williams for CASSANDRA-17386
2022-02-17 22:57:44 +04:00
Brad Schoening 8c8d9b8e57 Remove obsolete 'cql' dependency
Patch by Brad Schoening; reviewed by brandonwilliams and bereng for
CASSANDRA-17247
2022-01-20 10:02:07 -06:00
Brandon Williams aecac82027 Merge branch 'cassandra-3.11' into cassandra-4.0 2022-01-11 08:25:51 -06:00
Brandon Williams b17d701c58 Merge branch 'cassandra-3.0' into cassandra-3.11 2022-01-11 08:23:01 -06:00
Johannes Weißl 75e0e8cf41 Fix cqlsh COPY abort on window resize
Patch by Johannes Weißl; reviewed by brandonwilliams and bereng for
CASSANDRA-15230
2022-01-11 08:22:15 -06:00
Brandon Williams b22749bbb2 Remove thrift dep from cqlsh tests.
Patch by brandonwilliams; reviewed by edimitrova for CASSANDRA-17020
2021-10-01 10:02:05 -05:00
Mick Semb Wever 7bab2da375
Dockerise cqlshlib tests
patch by Mick Semb Wever; reviewed by Berenguer Blasi, Brandon Williams for CASSANDRA-16809
2021-08-10 10:05:48 +02:00
Mick Semb Wever 09c157e0f8
Dockerise cqlshlib tests
patch by Mick Semb Wever; reviewed by Berenguer Blasi, Brandon Williams for CASSANDRA-16809
2021-08-10 09:57:21 +02:00
Andrés de la Peña 906781ecbb Merge branch 'cassandra-3.11' into cassandra-4.0 2021-07-13 13:04:48 +01:00
Aleksandr Sorokoumov 2a8e01858f Make cqlsh use the same set of reserved keywords than the server uses
patch by Aleksandr Sorokoumov; reviewed by Andrés de la Peña and Ekaterina Dimitrova for CASSANDRA-15663

Co-authored-by: Aleksandr Sorokoumov <aleksandr.sorokoumov@gmail.com>
Co-authored-by: Ekaterina Dimitrova <ekaterina.dimitrova@datastax.com>
Co-authored-by: Andrés de la Peña <a.penya.garcia@gmail.com>
2021-07-13 11:45:25 +01:00
Brandon Williams 1579d20ceb ninja remove noisly line during cqlsh export 2021-06-14 11:00:20 -05:00
Ekaterina Dimitrova d69a7e4b8a Merge branch 'cassandra-3.11' into cassandra-4.0.0 2021-06-12 14:00:47 -04:00
Ekaterina Dimitrova 0878f15361 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-06-12 13:53:12 -04:00
kamlesh-ghoradkar a0af091a5c CQL shell should prefer newer TLS version by default
patch by Kamlesh Ghoradkar; reviewed by Ekaterina Dimitrova, Adam Holmberg, David Capwell, Justin Chu and Brandon Williamms for CASSANDRA-16695
2021-06-12 13:49:19 -04:00
Brandon Williams cfc8ef3313 ninja fix six typo to be six >=1.12.0 2021-05-26 16:52:14 -05:00
Adam Holmberg 0301fc6cea cqlsh: fix DESC TYPE with non-ascii character in the identifier
Patch by Adam Holmberg; reviewed by brandonwilliams for CASSANDRA-16400
2021-05-17 14:54:58 -05:00
Ekaterina Dimitrova 326d61e835 Remove drivers dependency and bring cql_keywords_reserved on server side
authored and reviewed by Ekaterina Dimitrova, Adam Holmberg and Andres de la Pena for CASSANDRA-16659
2021-05-17 08:57:39 -04:00
Bereng b67d04b6fe
cassandra-cqlsh-tests.sh should return different return codes on circle vs jenkins
patch by Mick Semb Wever; reviewed by Berenguer Blasi for CASSANDRA-16655
2021-05-05 18:05:29 +02:00
Brandon Williams a3db11831a Revert "Fix cqlsh DESC TYPE with non-ascii character in the identifier"
This reverts commit 327d7c1803.
2021-05-05 07:21:53 -05:00
Brandon Williams a75b9b8533 Revert "fix errant line breaks"
This reverts commit d2fcdacfa1.
2021-05-04 16:18:27 -05:00
Brandon Williams d2fcdacfa1 fix errant line breaks 2021-05-04 16:10:57 -05:00
Adam Holmberg 327d7c1803 Fix cqlsh DESC TYPE with non-ascii character in the identifier
Patch by Adam Holmberg; reviewed by brandonwilliams for CASSANDRA-16400
2021-05-04 11:52:23 -05:00