Merge remote-tracking branch 'remotemain/develop' into CBRD-25318

.circleci/config.yml

@@ -2,11 +2,6 @@ defaults: &defaults
   working_directory: /home
   docker:
     - image: cubridci/cubridci:develop
-
-oraclelinux: &oraclelinux
-  working_directory: /home
-  docker:
-    - image: cubridci/cubridci:ol7.8 
 
 test_defaults: &test_defaults
   steps:
@@ -20,7 +15,20 @@ test_defaults: &test_defaults
         command: |
           ulimit -c 1
           /entrypoint.sh checkout
-          circleci tests glob cubrid-testcases/$TEST_SUITE/_* | circleci tests split | tee tc.list
+          if [ $TEST_SUITE = "plcsql" ] 
+          then
+            # Hack way to run plcsql test without modifying CUBRID CI docker
+            TEST_SUITE="sql"
+            glob_path=cubrid-testcases/sql/{_05_plcsql,_35_fig_cake/plcsql}
+          elif [ $TEST_SUITE = "sql" ] 
+          then
+            rm -rf cubrid-testcases/$TEST_SUITE/_05_plcsql
+            rm -rf cubrid-testcases/$TEST_SUITE/_35_fig_cake/plcsql
+            glob_path="cubrid-testcases/$TEST_SUITE/_*"
+          else
+            glob_path="cubrid-testcases/$TEST_SUITE/_*"
+          fi
+          circleci tests glob $glob_path | circleci tests split | tee tc.list
           find cubrid-testcases/$TEST_SUITE/_* -maxdepth 0 -type d -print0 | grep -vzZ -f tc.list | xargs -0 rm -rf
           /entrypoint.sh test
     - run:
@@ -84,19 +92,11 @@ jobs:
     parallelism: 8
     <<: *test_defaults
 
-  test_medium_ol:
-    <<: *oraclelinux
-    environment:
-      TEST_SUITE: medium
-    resource_class: medium
-    <<: *test_defaults
-
-  test_sql_ol:
-    <<: *oraclelinux
+  test_plcsql:
+    <<: *defaults
     environment:
-      TEST_SUITE: sql
+      TEST_SUITE: plcsql
     resource_class: medium
-    parallelism: 8
     <<: *test_defaults
 
   build-windows:
@@ -144,11 +144,8 @@ workflows:
       - test_sql:
           requires:
             - build
-
-      - test_medium_ol:
-          requires:
-            - build
-      - test_sql_ol:
+      - test_plcsql:
           requires:
             - build
+
       - build-windows

.github/workflows/license_headers/apache_bat3.txt

@@ -0,0 +1,18 @@
+@echo off
+
+@rem
+@rem
+@rem Copyright 2016 CUBRID Corporation
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem

.gitignore

@@ -67,7 +67,7 @@ cm_common/cub_jobsa
 cm_common/cub_sainfo
 .installed
 /java/bin/
-/java/jspserver.jar
+/java/pl_server.jar
 /java/src-jsp/
 /java/src/
 /msg/*/*.cat

CMakeLists.txt

@@ -808,6 +808,10 @@ if(WITH_JDBC AND EXISTS ${CMAKE_SOURCE_DIR}/cubrid-jdbc/src)
   install(DIRECTORY ${JDBC_DIR}/
     DESTINATION ${CUBRID_JDBCDIR} COMPONENT JDBC
     FILES_MATCHING PATTERN "*.jar"
+    PATTERN ".github" EXCLUDE
+    PATTERN "cmake" EXCLUDE
+    PATTERN "src" EXCLUDE
+    PATTERN "output" EXCLUDE
   )
 endif()
 
@@ -827,7 +831,7 @@ add_subdirectory(demo)
 add_subdirectory(contrib)
 add_subdirectory(locales)
 add_subdirectory(timezones)
-add_subdirectory(jsp)
+add_subdirectory(pl_engine)
 if(AT_LEAST_ONE_UNIT_TEST)
   add_subdirectory(unit_tests)
 endif()

cs/CMakeLists.txt

@@ -50,6 +50,7 @@ set(COMPAT_SOURCES
   ${COMPAT_DIR}/db_json_path.cpp
   ${COMPAT_DIR}/db_json_types_internal.cpp
   ${COMPAT_DIR}/db_macro.c
+  ${COMPAT_DIR}/db_method_static.cpp
   ${COMPAT_DIR}/db_obj.c
   ${COMPAT_DIR}/db_old.c
   ${COMPAT_DIR}/db_query.c
@@ -294,6 +295,7 @@ set(JSP_SOURCES
 
 set(METHOD_SOURCES
   ${METHOD_DIR}/method_connection_cl.cpp
+  ${METHOD_DIR}/method_compile_def.cpp
   ${METHOD_DIR}/method_callback.cpp
   ${METHOD_DIR}/method_def.cpp
   ${METHOD_DIR}/method_error.cpp
@@ -512,7 +514,7 @@ add_library(cubridcs SHARED
   )
 set_target_properties(cubridcs PROPERTIES SOVERSION "${CUBRID_MAJOR_VERSION}.${CUBRID_MINOR_VERSION}")
 
-target_compile_definitions(cubridcs PRIVATE CS_MODE ${COMMON_DEFS})
+target_compile_definitions(cubridcs PRIVATE CS_MODE CUBRID_EXPORTING ${COMMON_DEFS})
 if(NOT USE_CUBRID_ENV)
   target_compile_definitions(cubridcs PRIVATE ${DIR_DEFS})
 endif(NOT USE_CUBRID_ENV)

cubrid/CMakeLists.txt

@@ -272,8 +272,11 @@ set(JSP_SOURCES
   )
 
 set(METHOD_SOURCES
+  ${METHOD_DIR}/method_connection_java.cpp
   ${METHOD_DIR}/method_connection_sr.cpp
   ${METHOD_DIR}/method_connection_pool.cpp
+  ${METHOD_DIR}/method_compile_def.cpp
+  ${METHOD_DIR}/method_compile.cpp
   ${METHOD_DIR}/method_def.cpp
   ${METHOD_DIR}/method_error.cpp
   ${METHOD_DIR}/method_invoke_builtin.cpp
@@ -518,7 +521,7 @@ if(WIN32)
   set_target_properties(cubrid PROPERTIES OUTPUT_NAME libcubrid)
 endif(WIN32)
 
-target_compile_definitions(cubrid PRIVATE SERVER_MODE ${COMMON_DEFS})
+target_compile_definitions(cubrid PRIVATE SERVER_MODE CUBRID_EXPORTING ${COMMON_DEFS})
 if(NOT USE_CUBRID_ENV)
   target_compile_definitions(cubrid PRIVATE ${DIR_DEFS})
 endif(NOT USE_CUBRID_ENV)

demo/CMakeLists.txt

@@ -19,7 +19,12 @@
 install(FILES 
   ${CMAKE_SOURCE_DIR}/demo/demodb_objects 
   ${CMAKE_SOURCE_DIR}/demo/demodb_schema
-  DESTINATION ${CUBRID_DEMODIR}) 
+  DESTINATION ${CUBRID_DEMODIR})
+
+install(DIRECTORY
+  ${CMAKE_SOURCE_DIR}/demo/plcsql
+  DESTINATION ${CUBRID_DEMODIR}
+)
 
 if(UNIX)
   set(DEMODB_SCRIPT make_cubrid_demo.sh)