Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#939 updated exaslct,slcci&slccisetup #435

Merged
merged 9 commits into from
Jul 31, 2024
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
2 changes: 1 addition & 1 deletion exaslct_scripts/exaslct.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ca-certificates|20230311ubuntu0.22.04.1
python3.10-dev|3.10.12-1~22.04.4
python3.10-dev|3.10.12-1~22.04.5
python3-distutils|3.10.8-1~22.04
curl|7.81.0-1ubuntu1.16
847 changes: 398 additions & 449 deletions poetry.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ keywords = ['exasol', 'udf', 'script-languages']

[tool.poetry.dependencies]
python = ">=3.10,<4"
exasol-script-languages-container-tool = "^0.19.0"
exasol-script-languages-container-ci = "^1.4.0"
exasol-script-languages-container-ci-setup = "^1.3.1"
exasol-script-languages-container-tool = "^0.20.0"
exasol-script-languages-container-ci = "^1.5.0"
exasol-script-languages-container-ci-setup = "^1.4.0"
docker = "!= 7.0.0"

[tool.poetry.dev-dependencies]
Expand Down
9 changes: 3 additions & 6 deletions test_container/build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ COPY deps/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
RUN apt-get -y update && \
apt-get -y install \
openjdk-17-jdk \
openjdk-11-jdk \
maven \
locales \
python3.10-venv \
Expand All @@ -21,14 +20,12 @@ RUN apt-get -y update && \
apt-get -y autoremove && \
ldconfig

RUN update-java-alternatives --set java-1.11.0-openjdk-amd64

RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh

RUN mkdir -p downloads/ODBC downloads/JDBC downloads/EXAplus
RUN curl -s https://x-up.s3.amazonaws.com/7.x/7.1.22/EXASOL_ODBC-7.1.22.tar.gz | tar -C downloads/ODBC --strip-components 1 -zxf -
RUN curl -s https://x-up.s3.amazonaws.com/7.x/7.1.14/EXASOL_JDBC-7.1.14.tar.gz | tar -C downloads/JDBC --strip-components 1 -zxf -
RUN curl -s https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/EXAplus-7.0.11.tar.gz | tar -C downloads/EXAplus --strip-components 1 -zxf -
RUN curl -s https://x-up.s3.amazonaws.com/7.x/24.1.1/Exasol_ODBC-24.1.1-Linux_x86_64.tar.gz | tar -C downloads/ODBC --strip-components 2 -zxf -
RUN curl -s https://x-up.s3.amazonaws.com/7.x/24.1.1/Exasol_JDBC-24.1.1.tar.gz | tar -C downloads/JDBC --strip-components 2 -zxf -
RUN curl -s https://x-up.s3.amazonaws.com/7.x/24.1.1/EXAplus-24.1.1.tar.gz | tar -C downloads/EXAplus --strip-components 2 -zxf -
ENV EXAPLUS=/downloads/EXAplus/exaplus

COPY deps/requirements.txt requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion test_container/tests/test/disabled/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'''

cmd = '''%(exaplus)s -c %(conn)s -u sys -P exasol
-no-config -autocommit ON -L -pipe''' % {
-no-config -autocommit ON -L -pipe -jdbcparam validateservercertificate=0''' % {
'exaplus': os.environ.get('EXAPLUS',
'/usr/opt/EXASuite-4/EXASolution-4.2.9/bin/Console/exaplus'),
'conn': udf.opts.server
Expand Down
4 changes: 2 additions & 2 deletions test_container/tests/test/generic/dynamic_input.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,12 @@ def test_exception_wrong_operation(self):

@requires('EMPTY_SET_RETURNS')
def test_exception_empty_set_returns(self):
with self.assertRaisesRegex(Exception, 'user defined set script has no arguments'):
with self.assertRaisesRegex(Exception, 'data exception - missing input parameters for SET UDF script'):
self.query('''select fn1.empty_set_returns() from groupt''')

@requires('EMPTY_SET_EMITS')
def test_exception_empty_set_emits(self):
with self.assertRaisesRegex(Exception, 'user defined set script has no arguments'):
with self.assertRaisesRegex(Exception, 'data exception - missing input parameters for SET UDF script'):
self.query('''select fn1.empty_set_emits() from groupt''')

class DynamicInputOptimizations(Test):
Expand Down
2 changes: 1 addition & 1 deletion test_container/tests/test/generic/performance.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def setUpClass(cls):
REJECT LIMIT 0;"""

cmd = '''%(exaplus)s -c %(conn)s -u sys -P exasol
-no-config -autocommit ON -L -pipe''' % {
-no-config -autocommit ON -L -pipe -jdbcparam validateservercertificate=0''' % {
'exaplus': os.environ.get('EXAPLUS',
'/usr/opt/EXASuite-4/EXASolution-4.2.9/bin/Console/exaplus'),
'conn': udf.opts.server
Expand Down
4 changes: 2 additions & 2 deletions test_container/tests/test/generic/unicode.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def run(ctx):
select pyversion_schema.python_version();
''' % {'sl': script_languages})
cmd = '''%(exaplus)s -c %(conn)s -u sys -P exasol
-no-config -autocommit ON -L -pipe''' % {
-no-config -autocommit ON -L -pipe -jdbcparam validateservercertificate=0''' % {
'exaplus': os.environ.get('EXAPLUS',
'/usr/opt/EXASuite-4/EXASolution-4.2.9/bin/Console/exaplus'),
'conn': server
Expand Down Expand Up @@ -136,7 +136,7 @@ def setUpModule():
ROW SEPARATOR = 'CRLF';
''' % os.path.join(os.getcwd(), csvfile.name)
cmd = '''%(exaplus)s -c %(conn)s -u sys -P exasol
-no-config -autocommit ON -L -pipe''' % {
-no-config -autocommit ON -L -pipe -jdbcparam validateservercertificate=0''' % {
'exaplus': os.environ.get('EXAPLUS',
'/usr/opt/EXASuite-4/EXASolution-4.2.9/bin/Console/exaplus'),
'conn': udf.opts.server
Expand Down
2 changes: 1 addition & 1 deletion test_container/tests/test/java/unicode.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
class JavaUnicode(udf.TestCase):
def test_unicode_umlaute(self):
cmd = '''%(exaplus)s -c %(conn)s -u sys -P exasol
-no-config -autocommit ON -L -pipe''' % {
-no-config -autocommit ON -L -pipe -jdbcparam validateservercertificate=0''' % {
'exaplus': os.environ.get('EXAPLUS',
'/usr/opt/EXASuite-5/EXASolution-5.0.rc1/bin/Console/exaplus'),
'conn': udf.opts.server
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def generate_data_linear(self, multiplier, base=10):
try:
os.mkfifo(fifo_filename)
cmd = '''%(exaplus)s -c %(conn)s -u %(user)s -P %(password)s -s %(schema)s
-no-config -autocommit ON -L -pipe''' % {
-no-config -autocommit ON -L -pipe -jdbcparam validateservercertificate=0''' % {
'exaplus': os.environ.get('EXAPLUS'),
'conn': udf.opts.server,
'user': self.user,
Expand Down
2 changes: 1 addition & 1 deletion test_container/tests/test/python3/all/getpass.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def run(ctx):
/
'''))
rows = self.query("select get_user_from_passwd()")
expected = u"exadefusr"
expected = u"nobody"
self.assertEqual(expected, rows[0][0])


Expand Down
4 changes: 2 additions & 2 deletions test_container/tests/test/python3/all/unicode.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

class PythonUnicode(udf.TestCase):
def test_unicode_umlaute(self):
cmd = '''%(exaplus)s -c %(conn)s -u sys -P exasol
-no-config -autocommit ON -L -pipe''' % {
cmd = '''%(exaplus)s -c %(conn)s -u sys -P exasol
-no-config -autocommit ON -L -pipe -jdbcparam validateservercertificate=0''' % {
'exaplus': os.environ.get('EXAPLUS',
'/usr/opt/EXASuite-4/EXASolution-4.2.9/bin/Console/exaplus'),
'conn': udf.opts.server
Expand Down