diff --git a/CMakeLists.txt b/CMakeLists.txt index c2e117e..c4a4fd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,6 @@ set(SOURCE usql/usql_ddl.cpp usql/usql_function.cpp usql/table.cpp - usql/table.h usql/row.cpp usql/csvreader.cpp usql/settings.cpp diff --git a/usql/usql.cpp b/usql/usql.cpp index fb155d9..ca18fe1 100644 --- a/usql/usql.cpp +++ b/usql/usql.cpp @@ -173,7 +173,6 @@ std::unique_ptr USql::eval_function_value_node(Table *table, Row &row evaluatedPars.push_back(eval_value_node(table, row, param.get(), nullptr, nullptr)); } - // at this moment no functions without parameter(s) or first param can be null if (evaluatedPars.empty() || evaluatedPars[0]->isNull()) return std::make_unique(); diff --git a/utils/remote_install.sh b/utils/remote_install.sh index 8ccacc6..52f1276 100755 --- a/utils/remote_install.sh +++ b/utils/remote_install.sh @@ -23,9 +23,9 @@ if [ "$#" -eq 1 ]; then fi echo "Building ml" -ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; gcc -std=c99 -c -O2 -o linenoise.o clib/linenoise.c" -ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; c++ -c -O2 -I/usr/local/opt/openssl/include -Iclib -I./ --std=c++17 ml.cpp ml_io.cpp ml_date.cpp ml_string.cpp ml_util.cpp ml_profiler.cpp ml_usql.cpp clib/json11.cpp clib/csvparser.cpp clib/sslclient.cpp clib/tcpnet.cpp clib/printf.cpp usql/exception.cpp usql/lexer.cpp usql/parser.cpp usql/usql.cpp usql/table.cpp usql/table.h usql/row.cpp usql/csvreader.cpp usql/usql.cpp usql/usql_ddl.cpp usql/usql_dml.cpp usql/usql_function.cpp usql/settings.cpp" -ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; c++ -o ml -O2 -L/usr/local/lib -L/usr/local/opt/openssl/lib -lm -lstdc++ -lcrypto -lssl *.o" +ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; gcc -std=c99 -c -O3 -o linenoise.o clib/linenoise.c" +ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; c++ -c -O3 -I/usr/local/opt/openssl/include -Iclib -I./ --std=c++17 ml.cpp ml_io.cpp ml_date.cpp ml_string.cpp ml_util.cpp ml_profiler.cpp ml_usql.cpp clib/json11.cpp clib/csvparser.cpp clib/sslclient.cpp clib/tcpnet.cpp clib/printf.cpp usql/exception.cpp usql/lexer.cpp usql/parser.cpp usql/usql.cpp usql/table.cpp usql/row.cpp usql/csvreader.cpp usql/usql.cpp usql/usql_ddl.cpp usql/usql_dml.cpp usql/usql_function.cpp usql/settings.cpp" +ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; c++ -o ml -O3 -L/usr/local/lib -L/usr/local/opt/openssl/lib -L/lib/x86_64-linux-gnu -lm -lstdc++ -lcrypto -lssl *.o" echo "Installing new version"