refs #4538 many fixes and tests for advanced search operators

refs #4548 fixed the prepend and append operators for freetds / ms sql server and mysql / mariadb
qorelanguage · Jun 26, 2022 · 5403069 · 5403069
1 parent 04cbbba
commit 5403069
Show file tree

Hide file tree

Showing 12 changed files with 740 additions and 70 deletions.
diff --git a/doxygen/lang/900_release_notes.dox.tmpl b/doxygen/lang/900_release_notes.dox.tmpl
@@ -9,10 +9,14 @@
 
     @subsection qore_1_9_0_bug_fixes Bug Fixes in Qore
     - <a href="../../modules/FreetdsSqlUtil/html/index.html">FreetdsSqlUtil</a> module
+      - fixed the prepend and append column operators
+        (<a href="https://github.com/qorelanguage/qore/issues/4548">issue 4548</a>)
       - implemented support for generating queries based on generic expressions using the DataProvider module's
         generic expression support
         (<a href="https://github.com/qorelanguage/qore/issues/4538">issue 4538</a>)
     - <a href="../../modules/MysqlSqlUtil/html/index.html">MysqlSqlUtil</a> module
+      - fixed the prepend and append column operators
+        (<a href="https://github.com/qorelanguage/qore/issues/4548">issue 4548</a>)
       - implemented support for generating queries based on generic expressions using the DataProvider module's
         generic expression support
         (<a href="https://github.com/qorelanguage/qore/issues/4538">issue 4538</a>)

diff --git a/examples/test/qlib/SqlUtil/BulkFreetdsSqlUtil.qtest b/examples/test/qlib/SqlUtil/BulkFreetdsSqlUtil.qtest
@@ -8,13 +8,13 @@
 
 %requires ../../../../qlib/Util.qm
 %requires ../../../../qlib/QUnit.qm
+%requires ../../../../qlib/DataProvider
 %requires ../../../../qlib/SqlUtil
 %requires ../../../../qlib/BulkSqlUtil
 %requires ../../../../qlib/FreetdsSqlUtil.qm
 %requires ../../../../qlib/Schema.qm
 
 %requires ./BulkSqlUtilTestBase.qm
-#/;
 
 %exec-class FreetdsTest
 
@@ -27,7 +27,7 @@ class FreetdsTestSchema inherits SqlUtilTestSchema {
     private {
         const GenericOptions = (
             "replace": True,
-            );
+        );
 
         const IndexOptions = {};
 
@@ -40,11 +40,11 @@ class FreetdsTestSchema inherits SqlUtilTestSchema {
                 "null_f": c_varchar(69),
             ),
             "primary_key": ("name": "pk_sqlutil_test", "columns": ("id")),
-            );
+        );
 
         const Tables = (
             "sqlutil_test": T_SqlUtilTest,
-            );
+        );
     }
 
     constructor(AbstractDatasource ds, *string dts, *string its) : SqlUtilTestSchema(ds, dts, its) {
@@ -80,11 +80,11 @@ class FreetdsTest inherits SqlTestBase {
         const CustomColumns = (
             "varchar": (
                 "value": "hello",
-                "size": "20",
+                "size": 20,
             ),
             "char": (
                 "value": "hello",
-                "size": "20",
+                "size": 20,
             ),
             "decimal": (
                 "size": 15,

diff --git a/examples/test/qlib/SqlUtil/BulkMysqlSqlUtil.qtest b/examples/test/qlib/SqlUtil/BulkMysqlSqlUtil.qtest
@@ -7,6 +7,7 @@
 %strict-args
 
 %requires ../../../../qlib/QUnit.qm
+%requires ../../../../qlib/DataProvider
 %requires ../../../../qlib/SqlUtil
 %requires ../../../../qlib/BulkSqlUtil
 %requires ../../../../qlib/MysqlSqlUtil.qm
@@ -29,7 +30,7 @@ class MysqlTestSchema inherits SqlUtilTestSchema {
     private {
         const GenericOptions = (
             "replace": True,
-            );
+        );
 
         const IndexOptions = {};
 
@@ -42,11 +43,11 @@ class MysqlTestSchema inherits SqlUtilTestSchema {
                 "null_f": c_varchar(69),
             ),
             "primary_key": ("name": "pk_mysql_test", "columns": ("id")),
-            );
+        );
 
         const Tables = (
             "mysql_test": T_MysqlTest,
-            );
+        );
     }
 
     constructor(AbstractDatasource ds, *string dts, *string its) : SqlUtilTestSchema(ds, dts, its) {
@@ -82,11 +83,11 @@ class MysqlTest inherits SqlTestBase {
         const CustomColumns = (
             "varchar": (
                 "value": "hello",
-                "size": "20",
+                "size": 20,
             ),
             "char": (
                 "value": "hello",
-                "size": "20",
+                "size": 20,
             ),
             "decimal": (
                 "size": 15,

diff --git a/examples/test/qlib/SqlUtil/BulkOracleSqlUtil.qtest b/examples/test/qlib/SqlUtil/BulkOracleSqlUtil.qtest
@@ -8,6 +8,7 @@
 
 %requires ../../../../qlib/Util.qm
 %requires ../../../../qlib/QUnit.qm
+%requires ../../../../qlib/DataProvider
 %requires ../../../../qlib/SqlUtil
 %requires ../../../../qlib/BulkSqlUtil
 %requires ../../../../qlib/OracleSqlUtil.qm
@@ -30,7 +31,7 @@ class OracleTestSchema inherits SqlUtilTestSchema {
     private {
         const GenericOptions = (
             "replace": True,
-            );
+        );
 
         const IndexOptions = {};
 
@@ -43,15 +44,15 @@ class OracleTestSchema inherits SqlUtilTestSchema {
                 "null_f": c_varchar(69),
             ),
             "primary_key": ("name": "pk_oracle_test", "columns": ("id")),
-            );
+        );
 
         const Tables = (
             "oracle_test": T_OracleTest,
-            );
+        );
 
         const Sequences = (
             "oracle_test_seq": {},
-            );
+        );
     }
 
     constructor(AbstractDatasource ds, *string dts, *string its) : SqlUtilTestSchema(ds, dts, its) {
@@ -91,11 +92,11 @@ class OracleTest inherits SqlTestBase {
         const CustomColumns = (
             "varchar2": (
                 "value": "hello",
-                "size": "20",
+                "size": 20,
             ),
             "char": (
                 "value": "hello",
-                "size": "20",
+                "size": 20,
                 "expect": rpad("hello", 20),
             ),
             "number": (
@@ -121,15 +122,15 @@ class OracleTest inherits SqlTestBase {
             #raw
             #bfile
             #long
-            );
+        );
 
         const ConstColumns = (
             "const_f": (
                 "type": "varchar2",
                 "value": "test",
                 "size": "20",
             ),
-            );
+        );
     }
 
     constructor() : SqlTestBase("OracleTest", "1.0", \ARGV, MyOpts) {

diff --git a/examples/test/qlib/SqlUtil/BulkPgsqlSqlUtil.qtest b/examples/test/qlib/SqlUtil/BulkPgsqlSqlUtil.qtest
@@ -7,6 +7,7 @@
 %strict-args
 
 %requires ../../../../qlib/QUnit.qm
+%requires ../../../../qlib/DataProvider
 %requires ../../../../qlib/SqlUtil
 %requires ../../../../qlib/BulkSqlUtil
 %requires ../../../../qlib/PgsqlSqlUtil.qm
@@ -29,7 +30,7 @@ class PgsqlTestSchema inherits SqlUtilTestSchema {
     private {
         const GenericOptions = (
             "replace": True,
-            );
+        );
 
         const IndexOptions = {};
 
@@ -42,18 +43,19 @@ class PgsqlTestSchema inherits SqlUtilTestSchema {
                 "null_f": c_varchar(69),
             ),
             "primary_key": ("name": "pk_pgsql_test", "columns": ("id")),
-            );
+        );
 
         const Tables = (
             "pgsql_test": T_PgsqlTest,
-            );
+        );
 
         const Sequences = (
             "pgsql_test_seq": {},
-            );
+        );
     }
 
-    constructor(AbstractDatasource ds, *string dts, *string its) : SqlUtilTestSchema(ds, dts, its) {
+    constructor(AbstractDatasource ds, *string dts, *string its)
+            : SqlUtilTestSchema(ds, dts, its) {
     }
 
     private string getNameImpl() {
@@ -105,11 +107,11 @@ class PgsqlTest inherits SqlTestBase {
         const CustomColumns = (
             "varchar": (
                 "value": "hello",
-                "size": "20",
+                "size": 20,
             ),
             "char": (
                 "value": "hello",
-                "size": "20",
+                "size": 20,
             ),
             "numeric": (
                 "size": 15,
@@ -167,15 +169,14 @@ class PgsqlTest inherits SqlTestBase {
             "inet": ("bind": pgsql_bind (PG_TYPE_INET, "192.168.11.1"), "expect": "192.168.11.1/32"),
             "cidr": ("bind": pgsql_bind (PG_TYPE_CIDR, "192.168"), "expect": "192.168.0.0/24"),
 %endif
-            );
+        );
     }
 
     constructor() : SqlTestBase("PgsqlTest", "1.0", \ARGV, MyOpts) {
         Datasource ds;
         try {
             ds = getDatasource();
-        }
-        catch (hash ex) {
+        } catch (hash<ExceptionInfo> ex) {
             if (m_options.verbose)
                 printf("%s: %s\n", ex.err, ex.desc);
             # skip tests if we can't create the datasource

diff --git a/examples/test/qlib/SqlUtil/BulkSqlUtilTestBase.qm b/examples/test/qlib/SqlUtil/BulkSqlUtilTestBase.qm
@@ -15,6 +15,7 @@ module BulkSqlUtilTestBase {
 }
 
 %requires ../../../../qlib/QUnit.qm
+%requires ../../../../qlib/DataProvider
 %requires ../../../../qlib/SqlUtil
 %requires ../../../../qlib/BulkSqlUtil
 %requires ../../../../qlib/Schema.qm
@@ -30,7 +31,7 @@ public class SqlUtilTestSchema inherits AbstractSchema {
                 hash ch = (
                     "native_type": type,
                     "notnull": True,
-                    );
+                );
                 if (h.value.typeCode() == NT_HASH)
                     ch += (h.value - ("value", "bind", "expect", "type"));
                 tables{table}.columns{SqlTestBase::getColumnName(h.key)} = ch;
@@ -59,7 +60,7 @@ public class SqlTestBase inherits QUnit::Test {
 
         const MyOpts = Opts + (
             "connstr": "c,conn=s",
-            );
+        );
 
         const OptionColumn = 22;