diff --git a/tests/script/general/alter/insert1.sim b/tests/script/general/alter/insert1.sim index 7095313a0d24213f61b77907a6552780e0072e1e..031cba09e0a74907b63fe75193a9a1f3befea09e 100644 --- a/tests/script/general/alter/insert1.sim +++ b/tests/script/general/alter/insert1.sim @@ -20,25 +20,25 @@ endi if $data01 != -28 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi -if $data08 != null then +if $data08 != NULL then return -1 endi @@ -61,25 +61,25 @@ endi if $data02 != 0 then return -1 endi -if $data12 != null then +if $data12 != NULL then return -1 endi -if $data13 != null then +if $data13 != NULL then return -1 endi -if $data14 != null then +if $data14 != NULL then return -1 endi -if $data15 != null then +if $data15 != NULL then return -1 endi -if $data16 != null then +if $data16 != NULL then return -1 endi -if $data17 != null then +if $data17 != NULL then return -1 endi -if $data18 != null then +if $data18 != NULL then return -1 endi @@ -95,25 +95,25 @@ endi if $data01 != -28 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi -if $data08 != null then +if $data08 != NULL then return -1 endi if $data11 != -25 then @@ -122,22 +122,22 @@ endi if $data12 != 0 then return -1 endi -if $data13 != null then +if $data13 != NULL then return -1 endi -if $data14 != null then +if $data14 != NULL then return -1 endi -if $data15 != null then +if $data15 != NULL then return -1 endi -if $data16 != null then +if $data16 != NULL then return -1 endi -if $data17 != null then +if $data17 != NULL then return -1 endi -if $data18 != null then +if $data18 != NULL then return -1 endi if $data21 != -22 then @@ -149,19 +149,19 @@ endi if $data23 != 0 then return -1 endi -if $data24 != null then +if $data24 != NULL then return -1 endi -if $data25 != null then +if $data25 != NULL then return -1 endi -if $data26 != null then +if $data26 != NULL then return -1 endi -if $data27 != null then +if $data27 != NULL then return -1 endi -if $data28 != null then +if $data28 != NULL then return -1 endi @@ -177,25 +177,25 @@ endi if $data01 != -28 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi -if $data08 != null then +if $data08 != NULL then return -1 endi if $data11 != -25 then @@ -204,22 +204,22 @@ endi if $data12 != 0 then return -1 endi -if $data13 != null then +if $data13 != NULL then return -1 endi -if $data14 != null then +if $data14 != NULL then return -1 endi -if $data15 != null then +if $data15 != NULL then return -1 endi -if $data16 != null then +if $data16 != NULL then return -1 endi -if $data17 != null then +if $data17 != NULL then return -1 endi -if $data18 != null then +if $data18 != NULL then return -1 endi if $data21 != -22 then @@ -231,19 +231,19 @@ endi if $data23 != 0 then return -1 endi -if $data24 != null then +if $data24 != NULL then return -1 endi -if $data25 != null then +if $data25 != NULL then return -1 endi -if $data26 != null then +if $data26 != NULL then return -1 endi -if $data27 != null then +if $data27 != NULL then return -1 endi -if $data28 != null then +if $data28 != NULL then return -1 endi if $data31 != -19 then @@ -258,16 +258,16 @@ endi if $data34 != 0 then return -1 endi -if $data35 != null then +if $data35 != NULL then return -1 endi -if $data36 != null then +if $data36 != NULL then return -1 endi -if $data37 != null then +if $data37 != NULL then return -1 endi -if $data38 != null then +if $data38 != NULL then return -1 endi @@ -291,25 +291,25 @@ endi if $data01 != -28 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi -if $data08 != null then +if $data08 != NULL then return -1 endi if $data11 != -25 then @@ -318,22 +318,22 @@ endi if $data12 != 0 then return -1 endi -if $data13 != null then +if $data13 != NULL then return -1 endi -if $data14 != null then +if $data14 != NULL then return -1 endi -if $data15 != null then +if $data15 != NULL then return -1 endi -if $data16 != null then +if $data16 != NULL then return -1 endi -if $data17 != null then +if $data17 != NULL then return -1 endi -if $data18 != null then +if $data18 != NULL then return -1 endi if $data21 != -22 then @@ -345,19 +345,19 @@ endi if $data23 != 0 then return -1 endi -if $data24 != null then +if $data24 != NULL then return -1 endi -if $data25 != null then +if $data25 != NULL then return -1 endi -if $data26 != null then +if $data26 != NULL then return -1 endi -if $data27 != null then +if $data27 != NULL then return -1 endi -if $data28 != null then +if $data28 != NULL then return -1 endi if $data31 != -19 then @@ -372,16 +372,16 @@ endi if $data34 != 0 then return -1 endi -if $data35 != null then +if $data35 != NULL then return -1 endi -if $data36 != null then +if $data36 != NULL then return -1 endi -if $data37 != null then +if $data37 != NULL then return -1 endi -if $data38 != null then +if $data38 != NULL then return -1 endi if $data41 != -16 then @@ -399,13 +399,13 @@ endi if $data45 != 3 then return -1 endi -if $data46 != null then +if $data46 != NULL then return -1 endi -if $data47 != null then +if $data47 != NULL then return -1 endi -if $data48 != null then +if $data48 != NULL then return -1 endi @@ -421,25 +421,25 @@ endi if $data01 != -28 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi -if $data08 != null then +if $data08 != NULL then return -1 endi if $data11 != -25 then @@ -448,22 +448,22 @@ endi if $data12 != 0 then return -1 endi -if $data13 != null then +if $data13 != NULL then return -1 endi -if $data14 != null then +if $data14 != NULL then return -1 endi -if $data15 != null then +if $data15 != NULL then return -1 endi -if $data16 != null then +if $data16 != NULL then return -1 endi -if $data17 != null then +if $data17 != NULL then return -1 endi -if $data18 != null then +if $data18 != NULL then return -1 endi if $data21 != -22 then @@ -475,19 +475,19 @@ endi if $data23 != 0 then return -1 endi -if $data24 != null then +if $data24 != NULL then return -1 endi -if $data25 != null then +if $data25 != NULL then return -1 endi -if $data26 != null then +if $data26 != NULL then return -1 endi -if $data27 != null then +if $data27 != NULL then return -1 endi -if $data28 != null then +if $data28 != NULL then return -1 endi if $data31 != -19 then @@ -502,16 +502,16 @@ endi if $data34 != 0 then return -1 endi -if $data35 != null then +if $data35 != NULL then return -1 endi -if $data36 != null then +if $data36 != NULL then return -1 endi -if $data37 != null then +if $data37 != NULL then return -1 endi -if $data38 != null then +if $data38 != NULL then return -1 endi if $data41 != -16 then @@ -529,13 +529,13 @@ endi if $data45 != 3 then return -1 endi -if $data46 != null then +if $data46 != NULL then return -1 endi -if $data47 != null then +if $data47 != NULL then return -1 endi -if $data48 != null then +if $data48 != NULL then return -1 endi if $data51 != -13 then @@ -556,10 +556,10 @@ endi if $data56 != 8.00000 then return -1 endi -if $data57 != null then +if $data57 != NULL then return -1 endi -if $data58 != null then +if $data58 != NULL then return -1 endi @@ -575,25 +575,25 @@ endi if $data01 != -28 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi -if $data08 != null then +if $data08 != NULL then return -1 endi if $data11 != -25 then @@ -602,22 +602,22 @@ endi if $data12 != 0 then return -1 endi -if $data13 != null then +if $data13 != NULL then return -1 endi -if $data14 != null then +if $data14 != NULL then return -1 endi -if $data15 != null then +if $data15 != NULL then return -1 endi -if $data16 != null then +if $data16 != NULL then return -1 endi -if $data17 != null then +if $data17 != NULL then return -1 endi -if $data18 != null then +if $data18 != NULL then return -1 endi if $data21 != -22 then @@ -629,19 +629,19 @@ endi if $data23 != 0 then return -1 endi -if $data24 != null then +if $data24 != NULL then return -1 endi -if $data25 != null then +if $data25 != NULL then return -1 endi -if $data26 != null then +if $data26 != NULL then return -1 endi -if $data27 != null then +if $data27 != NULL then return -1 endi -if $data28 != null then +if $data28 != NULL then return -1 endi if $data31 != -19 then @@ -656,16 +656,16 @@ endi if $data34 != 0 then return -1 endi -if $data35 != null then +if $data35 != NULL then return -1 endi -if $data36 != null then +if $data36 != NULL then return -1 endi -if $data37 != null then +if $data37 != NULL then return -1 endi -if $data38 != null then +if $data38 != NULL then return -1 endi if $data41 != -16 then @@ -683,13 +683,13 @@ endi if $data45 != 3 then return -1 endi -if $data46 != null then +if $data46 != NULL then return -1 endi -if $data47 != null then +if $data47 != NULL then return -1 endi -if $data48 != null then +if $data48 != NULL then return -1 endi if $data51 != -13 then @@ -710,10 +710,10 @@ endi if $data56 != 8.00000 then return -1 endi -if $data57 != null then +if $data57 != NULL then return -1 endi -if $data58 != null then +if $data58 != NULL then return -1 endi if $data61 != -10 then @@ -737,7 +737,7 @@ endi if $data67 != 10.000000000 then return -1 endi -if $data68 != null then +if $data68 != NULL then return -1 endi @@ -753,25 +753,25 @@ endi if $data01 != -28 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi -if $data08 != null then +if $data08 != NULL then return -1 endi if $data11 != -25 then @@ -780,22 +780,22 @@ endi if $data12 != 0 then return -1 endi -if $data13 != null then +if $data13 != NULL then return -1 endi -if $data14 != null then +if $data14 != NULL then return -1 endi -if $data15 != null then +if $data15 != NULL then return -1 endi -if $data16 != null then +if $data16 != NULL then return -1 endi -if $data17 != null then +if $data17 != NULL then return -1 endi -if $data18 != null then +if $data18 != NULL then return -1 endi if $data21 != -22 then @@ -807,19 +807,19 @@ endi if $data23 != 0 then return -1 endi -if $data24 != null then +if $data24 != NULL then return -1 endi -if $data25 != null then +if $data25 != NULL then return -1 endi -if $data26 != null then +if $data26 != NULL then return -1 endi -if $data27 != null then +if $data27 != NULL then return -1 endi -if $data28 != null then +if $data28 != NULL then return -1 endi if $data31 != -19 then @@ -834,16 +834,16 @@ endi if $data34 != 0 then return -1 endi -if $data35 != null then +if $data35 != NULL then return -1 endi -if $data36 != null then +if $data36 != NULL then return -1 endi -if $data37 != null then +if $data37 != NULL then return -1 endi -if $data38 != null then +if $data38 != NULL then return -1 endi if $data41 != -16 then @@ -861,13 +861,13 @@ endi if $data45 != 3 then return -1 endi -if $data46 != null then +if $data46 != NULL then return -1 endi -if $data47 != null then +if $data47 != NULL then return -1 endi -if $data48 != null then +if $data48 != NULL then return -1 endi if $data51 != -13 then @@ -888,10 +888,10 @@ endi if $data56 != 8.00000 then return -1 endi -if $data57 != null then +if $data57 != NULL then return -1 endi -if $data58 != null then +if $data58 != NULL then return -1 endi if $data61 != -10 then @@ -915,7 +915,7 @@ endi if $data67 != 10.000000000 then return -1 endi -if $data68 != null then +if $data68 != NULL then return -1 endi if $data71 != -7 then @@ -942,7 +942,7 @@ endi if $data78 != 11 then return -1 endi -if $data79 != null then +if $data79 != NULL then return -1 endi @@ -959,25 +959,25 @@ endi if $data01 != -28 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi -if $data08 != null then +if $data08 != NULL then return -1 endi if $data11 != -25 then @@ -986,22 +986,22 @@ endi if $data12 != 0 then return -1 endi -if $data13 != null then +if $data13 != NULL then return -1 endi -if $data14 != null then +if $data14 != NULL then return -1 endi -if $data15 != null then +if $data15 != NULL then return -1 endi -if $data16 != null then +if $data16 != NULL then return -1 endi -if $data17 != null then +if $data17 != NULL then return -1 endi -if $data18 != null then +if $data18 != NULL then return -1 endi if $data21 != -22 then @@ -1013,19 +1013,19 @@ endi if $data23 != 0 then return -1 endi -if $data24 != null then +if $data24 != NULL then return -1 endi -if $data25 != null then +if $data25 != NULL then return -1 endi -if $data26 != null then +if $data26 != NULL then return -1 endi -if $data27 != null then +if $data27 != NULL then return -1 endi -if $data28 != null then +if $data28 != NULL then return -1 endi if $data31 != -19 then @@ -1040,16 +1040,16 @@ endi if $data34 != 0 then return -1 endi -if $data35 != null then +if $data35 != NULL then return -1 endi -if $data36 != null then +if $data36 != NULL then return -1 endi -if $data37 != null then +if $data37 != NULL then return -1 endi -if $data38 != null then +if $data38 != NULL then return -1 endi if $data41 != -16 then @@ -1067,13 +1067,13 @@ endi if $data45 != 3 then return -1 endi -if $data46 != null then +if $data46 != NULL then return -1 endi -if $data47 != null then +if $data47 != NULL then return -1 endi -if $data48 != null then +if $data48 != NULL then return -1 endi if $data51 != -13 then @@ -1094,10 +1094,10 @@ endi if $data56 != 8.00000 then return -1 endi -if $data57 != null then +if $data57 != NULL then return -1 endi -if $data58 != null then +if $data58 != NULL then return -1 endi if $data61 != -10 then @@ -1121,7 +1121,7 @@ endi if $data67 != 10.000000000 then return -1 endi -if $data68 != null then +if $data68 != NULL then return -1 endi if $data71 != -7 then diff --git a/tests/script/general/alter/insert2.sim b/tests/script/general/alter/insert2.sim index a248c7cd2b3a0247468a23202c6cff9205ba2e3f..1123fdb7903b466b3c79370a0ab02d6185cdf1b6 100644 --- a/tests/script/general/alter/insert2.sim +++ b/tests/script/general/alter/insert2.sim @@ -74,7 +74,7 @@ endi if $data07 != 8 then return -1 endi -if $data08 != null then +if $data08 != NULL then return -1 endi if $data11 != 1 then @@ -98,7 +98,7 @@ endi if $data17 != 8 then return -1 endi -if $data18 != null then +if $data18 != NULL then return -1 endi @@ -129,10 +129,10 @@ endi if $data06 != 8 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi -if $data08 != null then +if $data08 != NULL then return -1 endi if $data11 != 2 then @@ -153,10 +153,10 @@ endi if $data16 != 8 then return -1 endi -if $data17 != null then +if $data17 != NULL then return -1 endi -if $data18 != null then +if $data18 != NULL then return -1 endi if $data21 != 1 then @@ -177,10 +177,10 @@ endi if $data26 != 8 then return -1 endi -if $data27 != null then +if $data27 != NULL then return -1 endi -if $data28 != null then +if $data28 != NULL then return -1 endi @@ -206,16 +206,16 @@ endi if $data04 != 0 then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi -if $data08 != null then +if $data08 != NULL then return -1 endi if $data11 != 3 then @@ -230,16 +230,16 @@ endi if $data14 != 8 then return -1 endi -if $data15 != null then +if $data15 != NULL then return -1 endi -if $data16 != null then +if $data16 != NULL then return -1 endi -if $data17 != null then +if $data17 != NULL then return -1 endi -if $data18 != null then +if $data18 != NULL then return -1 endi if $data21 != 2 then @@ -254,16 +254,16 @@ endi if $data24 != 8 then return -1 endi -if $data25 != null then +if $data25 != NULL then return -1 endi -if $data26 != null then +if $data26 != NULL then return -1 endi -if $data27 != null then +if $data27 != NULL then return -1 endi -if $data28 != null then +if $data28 != NULL then return -1 endi if $data31 != 1 then @@ -278,16 +278,16 @@ endi if $data34 != 8 then return -1 endi -if $data35 != null then +if $data35 != NULL then return -1 endi -if $data36 != null then +if $data36 != NULL then return -1 endi -if $data37 != null then +if $data37 != NULL then return -1 endi -if $data38 != null then +if $data38 != NULL then return -1 endi @@ -313,19 +313,19 @@ endi if $data03 != 5 then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi -if $data08 != null then +if $data08 != NULL then return -1 endi if $data11 != -19 then @@ -337,19 +337,19 @@ endi if $data13 != 0 then return -1 endi -if $data14 != null then +if $data14 != NULL then return -1 endi -if $data15 != null then +if $data15 != NULL then return -1 endi -if $data16 != null then +if $data16 != NULL then return -1 endi -if $data17 != null then +if $data17 != NULL then return -1 endi -if $data18 != null then +if $data18 != NULL then return -1 endi if $data21 != 3 then @@ -361,19 +361,19 @@ endi if $data23 != 8 then return -1 endi -if $data24 != null then +if $data24 != NULL then return -1 endi -if $data25 != null then +if $data25 != NULL then return -1 endi -if $data26 != null then +if $data26 != NULL then return -1 endi -if $data27 != null then +if $data27 != NULL then return -1 endi -if $data28 != null then +if $data28 != NULL then return -1 endi if $data31 != 2 then @@ -385,19 +385,19 @@ endi if $data33 != 8 then return -1 endi -if $data34 != null then +if $data34 != NULL then return -1 endi -if $data35 != null then +if $data35 != NULL then return -1 endi -if $data36 != null then +if $data36 != NULL then return -1 endi -if $data37 != null then +if $data37 != NULL then return -1 endi -if $data38 != null then +if $data38 != NULL then return -1 endi if $data41 != 1 then @@ -409,19 +409,19 @@ endi if $data43 != 8 then return -1 endi -if $data44 != null then +if $data44 != NULL then return -1 endi -if $data45 != null then +if $data45 != NULL then return -1 endi -if $data46 != null then +if $data46 != NULL then return -1 endi -if $data47 != null then +if $data47 != NULL then return -1 endi -if $data48 != null then +if $data48 != NULL then return -1 endi @@ -443,22 +443,22 @@ endi if $data12 != 5 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi -if $data08 != null then +if $data08 != NULL then return -1 endi if $data21 != -19 then @@ -467,22 +467,22 @@ endi if $data22 != 0 then return -1 endi -if $data23 != null then +if $data23 != NULL then return -1 endi -if $data24 != null then +if $data24 != NULL then return -1 endi -if $data25 != null then +if $data25 != NULL then return -1 endi -if $data26 != null then +if $data26 != NULL then return -1 endi -if $data27 != null then +if $data27 != NULL then return -1 endi -if $data28 != null then +if $data28 != NULL then return -1 endi if $data31 != 3 then @@ -491,22 +491,22 @@ endi if $data32 != 8 then return -1 endi -if $data33 != null then +if $data33 != NULL then return -1 endi -if $data34 != null then +if $data34 != NULL then return -1 endi -if $data35 != null then +if $data35 != NULL then return -1 endi -if $data36 != null then +if $data36 != NULL then return -1 endi -if $data37 != null then +if $data37 != NULL then return -1 endi -if $data38 != null then +if $data38 != NULL then return -1 endi if $data41 != 2 then @@ -515,22 +515,22 @@ endi if $data42 != 8 then return -1 endi -if $data43 != null then +if $data43 != NULL then return -1 endi -if $data44 != null then +if $data44 != NULL then return -1 endi -if $data45 != null then +if $data45 != NULL then return -1 endi -if $data46 != null then +if $data46 != NULL then return -1 endi -if $data47 != null then +if $data47 != NULL then return -1 endi -if $data48 != null then +if $data48 != NULL then return -1 endi if $data51 != 1 then @@ -539,19 +539,19 @@ endi if $data52 != 8 then return -1 endi -if $data53 != null then +if $data53 != NULL then return -1 endi -if $data54 != null then +if $data54 != NULL then return -1 endi -if $data55 != null then +if $data55 != NULL then return -1 endi -if $data57 != null then +if $data57 != NULL then return -1 endi -if $data58 != null then +if $data58 != NULL then return -1 endi @@ -568,52 +568,52 @@ print data01 = $data01 if $data01 != -10 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi if $data11 != -13 then return -1 endi -if $data12 != null then +if $data12 != NULL then return -1 endi if $data21 != -16 then return -1 endi -if $data22 != null then +if $data22 != NULL then return -1 endi if $data31 != -19 then return -1 endi -if $data32 != null then +if $data32 != NULL then return -1 endi -if $data33 != null then +if $data33 != NULL then return -1 endi if $data41 != 3 then return -1 endi -if $data42 != null then +if $data42 != NULL then return -1 endi if $data51 != 2 then return -1 endi -if $data52 != null then +if $data52 != NULL then return -1 endi -if $data53 != null then +if $data53 != NULL then return -1 endi if $data61 != 1 then return -1 endi -if $data62 != null then +if $data62 != NULL then return -1 endi @@ -632,52 +632,52 @@ endi if $data01 != -10 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi if $data11 != -13 then return -1 endi -if $data12 != null then +if $data12 != NULL then return -1 endi if $data21 != -16 then return -1 endi -if $data22 != null then +if $data22 != NULL then return -1 endi if $data31 != -19 then return -1 endi -if $data32 != null then +if $data32 != NULL then return -1 endi -if $data33 != null then +if $data33 != NULL then return -1 endi if $data41 != 3 then return -1 endi -if $data42 != null then +if $data42 != NULL then return -1 endi if $data51 != 2 then return -1 endi -if $data52 != null then +if $data52 != NULL then return -1 endi -if $data53 != null then +if $data53 != NULL then return -1 endi if $data61 != 1 then return -1 endi -if $data62 != null then +if $data62 != NULL then return -1 endi diff --git a/tests/script/general/alter/metrics.sim b/tests/script/general/alter/metrics.sim index be11ddc7f577d014105ac6b76ba2b759b773238c..55763cf2d45ff106909292360da5adcc040e5aec 100644 --- a/tests/script/general/alter/metrics.sim +++ b/tests/script/general/alter/metrics.sim @@ -770,7 +770,7 @@ endi if $data21 != INT then return -1 endi -if $data30 != null then +if $data30 != NULL then return -1 endi diff --git a/tests/script/general/alter/table.sim b/tests/script/general/alter/table.sim index 8660d0d31224e081fb35af033fb1bdcc875621c3..9438bed8abd23b23dca2662c510651c4297562e2 100644 --- a/tests/script/general/alter/table.sim +++ b/tests/script/general/alter/table.sim @@ -673,7 +673,7 @@ endi if $data11 != INT then return -1 endi -if $data20 != null then +if $data20 != NULL then return -1 endi diff --git a/tests/script/general/compute/null.sim b/tests/script/general/compute/null.sim index 9f2e9ecf405cabaf955d22cf6351e1ce3416b425..df9d009f34c9861a624da5e502aa861af0713ea5 100644 --- a/tests/script/general/compute/null.sim +++ b/tests/script/general/compute/null.sim @@ -51,7 +51,7 @@ $tb = $tbPrefix . $i sql select * from $tb print $data00 $data01 $data02 -if $data01 != null then +if $data01 != NULL then return -1 endi if $data02 != 0 then @@ -165,7 +165,7 @@ sql select * from t2 if $rows != 1 then return -1 endi -if $data01 != null then +if $data01 != NULL then return -1 endi @@ -173,7 +173,7 @@ sql select * from t3 if $rows != 1 then return -1 endi -if $data01 != null then +if $data01 != NULL then return -1 endi @@ -181,7 +181,7 @@ sql select * from t4 if $rows != 1 then return -1 endi -if $data01 != null then +if $data01 != NULL then return -1 endi @@ -189,7 +189,7 @@ sql select * from t5 if $rows != 1 then return -1 endi -if $data01 != null then +if $data01 != NULL then return -1 endi @@ -197,7 +197,7 @@ sql select * from t6 if $rows != 1 then return -1 endi -if $data01 != null then +if $data01 != NULL then return -1 endi @@ -205,7 +205,7 @@ sql select * from t7 if $rows != 1 then return -1 endi -if $data01 != null then +if $data01 != NULL then return -1 endi @@ -213,7 +213,7 @@ endi #if $rows != 1 then # return -1 #endi -#if $data01 != null then +#if $data01 != NULL then # return -1 #endi diff --git a/tests/script/general/http/telegraf.sim b/tests/script/general/http/telegraf.sim index d9f3340f06fa80dad2291ceca6d17af07a4be923..60eeec652e8b5fa7be5488a4a85b8b258cf4495c 100644 --- a/tests/script/general/http/telegraf.sim +++ b/tests/script/general/http/telegraf.sim @@ -16,14 +16,14 @@ print =============== step1 - parse system_content curl -u root:taosdata -d '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:6020/telegraf/ print $system_content -if $system_content != @{"status":"error","code":1022,"desc":"database name can not be null"}@ then +if $system_content != @{"status":"error","code":1022,"desc":"database name can not be NULL"}@ then return -1 endi system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_admin' -d '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:6020/telegraf/ print $system_content -if $system_content != @{"status":"error","code":1022,"desc":"database name can not be null"}@ then +if $system_content != @{"status":"error","code":1022,"desc":"database name can not be NULL"}@ then return -1 endi @@ -170,7 +170,7 @@ endi system_content curl -u root:taosdata -d '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"":"windows"},"timestamp":1535784122}' 127.0.0.1:6020/telegraf/db/root/taosdata1 print $system_content -if $system_content != @{"status":"error","code":1038,"desc":"tag name is null"}@ then +if $system_content != @{"status":"error","code":1038,"desc":"tag name is NULL"}@ then return -1 endi @@ -191,14 +191,14 @@ endi system_content curl -u root:taosdata -d '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":""},"timestamp":1535784122}' 127.0.0.1:6020/telegraf/db/root/taosdata1 print $system_content -if $system_content != @{"status":"error","code":1041,"desc":"tag value is null"}@ then +if $system_content != @{"status":"error","code":1041,"desc":"tag value is NULL"}@ then return -1 endi system_content curl -u root:taosdata -d '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"1022":"111"},"timestamp":1535784122}' 127.0.0.1:6020/telegraf/db/root/taosdata1 print $system_content -if $system_content != @{"status":"error","code":1042,"desc":"table is null"}@ then +if $system_content != @{"status":"error","code":1042,"desc":"table is NULL"}@ then return -1 endi @@ -219,14 +219,14 @@ endi system_content curl -u root:taosdata -d '{"fields":{"":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:6020/telegraf/db/root/taosdata1 print $system_content -if $system_content != @{"status":"error","code":1048,"desc":"field name is null"}@ then +if $system_content != @{"status":"error","code":1048,"desc":"field name is NULL"}@ then return -1 endi system_content curl -u root:taosdata -d '{"fields":{"Percent_DPC_Time":"","Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:6020/telegraf/db/root/taosdata1 print $system_content -if $system_content != @{"status":"error","code":1051,"desc":"field value is null"}@ then +if $system_content != @{"status":"error","code":1051,"desc":"field value is NULL"}@ then return -1 endi diff --git a/tests/script/general/parser/alter.sim b/tests/script/general/parser/alter.sim index 1b19101bc01580cf53cee08514fe9a27e1f9d57e..f97581c5f5be19323a927ede71f3b87a381b3c3f 100644 --- a/tests/script/general/parser/alter.sim +++ b/tests/script/general/parser/alter.sim @@ -38,7 +38,7 @@ endi if $data02 != 1 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi sql alter table tb add column c3 nchar(4) @@ -46,7 +46,7 @@ sql select * from tb order by ts desc if $rows != 1 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi sql insert into tb values (now, 2, 2, 'taos') @@ -72,13 +72,13 @@ endi if $data02 != 1 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi sql alter table mt add column c3 nchar(4) sql select * from tb order by ts desc -if $data03 != null then +if $data03 != NULL then return -1 endi sql insert into tb values (now, 2, 2, 'taos') @@ -89,7 +89,7 @@ endi if $data03 != taos then return -1 endi -if $data13 != null then +if $data13 != NULL then return -1 endi sql drop table tb @@ -169,7 +169,7 @@ endi if $data01 != 2 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi sql alter table mt add column c2 int @@ -200,7 +200,7 @@ if $data02 != insert then endi sql alter table mt add column c3 nchar(4) sql select * from tb order by ts desc -if $data03 != null then +if $data03 != NULL then return -1 endi # the query below should be deleted after bug fix diff --git a/tests/script/general/parser/alter1.sim b/tests/script/general/parser/alter1.sim index c0221e1033d59c88140667e804f5eec1808eb1b2..7c4609a87d79db00d835ee517ecb1b7a0162be24 100644 --- a/tests/script/general/parser/alter1.sim +++ b/tests/script/general/parser/alter1.sim @@ -36,16 +36,16 @@ print rows = $rows if $rows != 4 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data13 != null then +if $data13 != NULL then return -1 endi -if $data23 != null then +if $data23 != NULL then return -1 endi -if $data33 != null then +if $data33 != NULL then return -1 endi @@ -53,10 +53,10 @@ sql select c1 from stb if $rows != 4 then return -1 endi -if $data00 != null then +if $data00 != NULL then return -1 endi -if $data30 != null then +if $data30 != NULL then return -1 endi @@ -69,10 +69,10 @@ sql select c1+speed from car1 if $rows != 2 then return -1 endi -if $data00 != null then +if $data00 != NULL then return -1 endi -if $data10 != null then +if $data10 != NULL then return -1 endi @@ -80,10 +80,10 @@ sql select * from car1 if $rows != 2 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data13 != null then +if $data13 != NULL then return -1 endi diff --git a/tests/script/general/parser/columnValue_bool.sim b/tests/script/general/parser/columnValue_bool.sim index 84ee53670ed7809e2be9f394ece6b9db6e433c88..7f3a6c3d6affaefcc2a8d47963ac065c2dc71b25 100644 --- a/tests/script/general/parser/columnValue_bool.sim +++ b/tests/script/general/parser/columnValue_bool.sim @@ -10,7 +10,7 @@ print ========== bool sql create table mt_bool (ts timestamp, c bool) tags (tagname bool) ## case 00: static create table for test tag values -sql create table st_bool_0 using mt_bool tags (null) +sql create table st_bool_0 using mt_bool tags (NULL) sql select tagname from st_bool_0 if $data00 != NULL then print ==1== expect: NULL, actually: $data00 @@ -22,7 +22,7 @@ if $data00 != NULL then print ==2== expect: NULL, actually: $data00 return -1 endi -sql create table st_bool_2 using mt_bool tags ('null') +sql create table st_bool_2 using mt_bool tags ('NULL') sql select tagname from st_bool_2 if $data00 != NULL then print ==3== expect: NULL, actually: $data00 @@ -34,7 +34,7 @@ if $data00 != NULL then print ==4== expect: NULL, actually: $data00 return -1 endi -sql create table st_bool_4 using mt_bool tags ("null") +sql create table st_bool_4 using mt_bool tags ("NULL") sql select tagname from st_bool_4 if $data00 != NULL then print ==5== expect: NULL, actually: $data00 @@ -120,7 +120,7 @@ if $data00 != 1 then endi ## case 01: insert values for test column values -sql insert into st_bool_0 values (now, null) +sql insert into st_bool_0 values (now, NULL) sql select * from st_bool_0 if $rows != 1 then return -1 @@ -138,7 +138,7 @@ if $data01 != NULL then print ==18== expect: NULL, actually: $data01 return -1 endi -sql insert into st_bool_2 values (now, 'null') +sql insert into st_bool_2 values (now, 'NULL') sql select * from st_bool_2 if $rows != 1 then return -1 @@ -156,7 +156,7 @@ if $data01 != NULL then print ==20== expect: NULL, actually: $data01 return -1 endi -sql insert into st_bool_4 values (now, "null") +sql insert into st_bool_4 values (now, "NULL") sql select * from st_bool_4 if $rows != 1 then return -1 @@ -284,7 +284,7 @@ if $data01 != 1 then endi ## case 02: dynamic create table for test tag values -sql insert into st_bool_16 using mt_bool tags (null) values (now, null) +sql insert into st_bool_16 using mt_bool tags (NULL) values (now, NULL) sql select tagname from st_bool_16 if $data00 != NULL then print ==33== expect: NULL, actually: $data00 @@ -307,7 +307,7 @@ if $data01 != NULL then print ==36== expect: NULL, actually: $data01 return -1 endi -sql insert into st_bool_18 using mt_bool tags ('null') values (now, 'null') +sql insert into st_bool_18 using mt_bool tags ('NULL') values (now, 'NULL') sql select tagname from st_bool_18 if $data00 != NULL then print ==37== expect: NULL, actually: $data00 @@ -329,7 +329,7 @@ if $data01 != NULL then print ==40== expect: NULL, actually: $data01 return -1 endi -sql insert into st_bool_20 using mt_bool tags ("null") values (now, "null") +sql insert into st_bool_20 using mt_bool tags ("NULL") values (now, "NULL") sql select tagname from st_bool_20 if $data00 != NULL then print ==41== expect: NULL, actually: $data00 @@ -505,7 +505,7 @@ endi #if $data00 != false then # return -1 #endi -#sql alter table st_bool_0 set tag tagname=null +#sql alter table st_bool_0 set tag tagname=NULL #sql select tagname from st_bool_0 #if $data00 != NULL then # return -1 @@ -515,7 +515,7 @@ endi #if $data00 != true then # return -1 #endi -#sql alter table st_bool_0 set tag tagname='null' +#sql alter table st_bool_0 set tag tagname='NULL' #sql select tagname from st_bool_0 #if $data00 != NULL then # return -1 @@ -535,7 +535,7 @@ endi #if $data00 != true then # return -1 #endi -#sql alter table st_bool_0 set tag tagname="null" +#sql alter table st_bool_0 set tag tagname="NULL" #sql select tagname from st_bool_0 #if $data00 != NULL then # return -1 diff --git a/tests/script/general/parser/create_mt.sim b/tests/script/general/parser/create_mt.sim index 275393f4ac95766f0512577a01a4011dae8805ad..43fc216ab00402651828a5b64da303facde3cac0 100644 --- a/tests/script/general/parser/create_mt.sim +++ b/tests/script/general/parser/create_mt.sim @@ -46,7 +46,7 @@ if $rows != 0 then return -1 endi print data00 = $data00 -if $data00 != null then +if $data00 != NULL then return -1 endi print case_insensitivity test passed diff --git a/tests/script/general/parser/create_tb.sim b/tests/script/general/parser/create_tb.sim index a3a18697a2a13b2cde3f63ad6916ab023d95e01e..33b7be11949bfad28a5110f6afb7b8b1dc697954 100644 --- a/tests/script/general/parser/create_tb.sim +++ b/tests/script/general/parser/create_tb.sim @@ -45,7 +45,7 @@ if $rows != 0 then return -1 endi print data00 = $data00 -if $data00 != null then +if $data00 != NULL then return -1 endi print case_insensitivity test passed diff --git a/tests/script/general/parser/fill.sim b/tests/script/general/parser/fill.sim index c3966c47c130972112b50a2a4713cddeebe69b2d..459bc7611ed2e61f7913b1932c9a6a5d559f0594 100644 --- a/tests/script/general/parser/fill.sim +++ b/tests/script/general/parser/fill.sim @@ -390,7 +390,7 @@ sql select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $ sql select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 1e1, 1e1, 1e1) sql select first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1e', '1e1') # fill quoted values into bool column will throw error unless the value is 'true' or 'false' Note:2018-10-24 -# fill values into binary or nchar columns will be set to null automatically Note:2018-10-24 +# fill values into binary or nchar columns will be set to NULL automatically Note:2018-10-24 sql_error select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1e', '1e1','1e1') sql select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, true, true, true) sql select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'true', 'true','true') @@ -649,25 +649,25 @@ endi if $data01 != 1 then return -1 endi -if $data11 != null then +if $data11 != NULL then return -1 endi if $data21 != 1 then return -1 endi -if $data31 != null then +if $data31 != NULL then return -1 endi if $data41 != 1 then return -1 endi -if $data51 != null then +if $data51 != NULL then return -1 endi if $data61 != 1 then return -1 endi -if $data71 != null then +if $data71 != NULL then return -1 endi if $data81 != 1 then @@ -686,25 +686,25 @@ endi if $data01 != 0.000000000 then return -1 endi -if $data11 != null then +if $data11 != NULL then return -1 endi if $data21 != 1.000000000 then return -1 endi -if $data31 != null then +if $data31 != NULL then return -1 endi if $data41 != 2.000000000 then return -1 endi -if $data51 != null then +if $data51 != NULL then return -1 endi if $data61 != 3.000000000 then return -1 endi -if $data71 != null then +if $data71 != NULL then return -1 endi if $data81 != 4.000000000 then @@ -719,25 +719,25 @@ endi if $data01 != 0 then return -1 endi -if $data11 != null then +if $data11 != NULL then return -1 endi if $data21 != 1 then return -1 endi -if $data31 != null then +if $data31 != NULL then return -1 endi if $data41 != 2 then return -1 endi -if $data51 != null then +if $data51 != NULL then return -1 endi if $data61 != 3 then return -1 endi -if $data71 != null then +if $data71 != NULL then return -1 endi if $data81 != 4 then @@ -752,25 +752,25 @@ endi if $data01 != 0 then return -1 endi -if $data11 != null then +if $data11 != NULL then return -1 endi if $data21 != 1 then return -1 endi -if $data31 != null then +if $data31 != NULL then return -1 endi if $data41 != 2 then return -1 endi -if $data51 != null then +if $data51 != NULL then return -1 endi if $data61 != 3 then return -1 endi -if $data71 != null then +if $data71 != NULL then return -1 endi if $data81 != 4 then @@ -785,25 +785,25 @@ endi if $data01 != 0 then return -1 endi -if $data11 != null then +if $data11 != NULL then return -1 endi if $data21 != 1 then return -1 endi -if $data31 != null then +if $data31 != NULL then return -1 endi if $data41 != 2 then return -1 endi -if $data51 != null then +if $data51 != NULL then return -1 endi if $data61 != 3 then return -1 endi -if $data71 != null then +if $data71 != NULL then return -1 endi if $data81 != 4 then @@ -818,25 +818,25 @@ endi if $data01 != 0 then return -1 endi -if $data11 != null then +if $data11 != NULL then return -1 endi if $data21 != 1 then return -1 endi -if $data31 != null then +if $data31 != NULL then return -1 endi if $data41 != 2 then return -1 endi -if $data51 != null then +if $data51 != NULL then return -1 endi if $data61 != 3 then return -1 endi -if $data71 != null then +if $data71 != NULL then return -1 endi if $data81 != 4 then diff --git a/tests/script/general/parser/fill_stb.sim b/tests/script/general/parser/fill_stb.sim index a40e5d15a41563c19111ab702a295e4c9f6f8fa2..113f4b68a45b795e04d64913bb56bb17efec321e 100644 --- a/tests/script/general/parser/fill_stb.sim +++ b/tests/script/general/parser/fill_stb.sim @@ -68,7 +68,7 @@ $tsu = $tsu + $ts0 #### fill test cases for stables -# null values in each group +# NULL values in each group #sql select count(*) from $stb where ts >= '2018-09-16 00:00:00.000' and ts <= $tsu interval(1d) fill(prev) group by t1 #$val = $tbNum * 2 #if rows != $val then @@ -227,7 +227,7 @@ sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 1e1, 1e1, 1e1) sql select first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1e', '1e1') # fill quoted values into bool column will throw error unless the value is 'true' or 'false' Note:2018-10-24 -# fill values into binary or nchar columns will be set to null automatically Note:2018-10-24 +# fill values into binary or nchar columns will be set to NULL automatically Note:2018-10-24 sql_error select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1e', '1e1','1e1') sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, true, true, true) sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'true', 'true','true') @@ -283,13 +283,13 @@ endi if $data08 != 0 then return -1 endi -if $data15 != null then +if $data15 != NULL then return -1 endi -if $data16 != null then +if $data16 != NULL then return -1 endi -if $data17 != null then +if $data17 != NULL then return -1 endi if $data18 != 0 then @@ -313,16 +313,16 @@ endi if $data07 != nchar0 then return -1 endi -if $data12 != null then +if $data12 != NULL then return -1 endi -if $data14 != null then +if $data14 != NULL then return -1 endi -if $data16 != null then +if $data16 != NULL then return -1 endi -if $data17 != null then +if $data17 != NULL then return -1 endi if $data08 != 5 then @@ -341,7 +341,7 @@ endi if $data07 != nchar0 then return -1 endi -if $data17 != null then +if $data17 != NULL then return -1 endi @@ -359,16 +359,16 @@ endi if $data01 != 0 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi if $data09 != 5 then return -1 endi -if $data12 != null then +if $data12 != NULL then return -1 endi if $data19 != 5 then @@ -386,17 +386,17 @@ endi ## NULL fill print fill(NULL) -sql select max(c1), min(c2), avg(c3), sum(c4), count(c5), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 4 interval(5m) fill(value, null) group by t1 limit 5 +sql select max(c1), min(c2), avg(c3), sum(c4), count(c5), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 4 interval(5m) fill(value, NULL) group by t1 limit 5 if $rows != 25 then return -1 endi if $data01 != 0 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi if $data06 != 1 then @@ -405,16 +405,16 @@ endi if $data09 != 5 then return -1 endi -if $data11 != null then +if $data11 != NULL then return -1 endi -if $data12 != null then +if $data12 != NULL then return -1 endi if $data19 != 5 then return -1 endi -if $data18 != null then +if $data18 != NULL then return -1 endi if $data59 != 6 then diff --git a/tests/script/general/parser/first_last_query.sim b/tests/script/general/parser/first_last_query.sim index 2a10e09db420d465049ee48e120511da1be68d83..17e9d3502dd6f5289ca6f56d6da52e06df06378b 100644 --- a/tests/script/general/parser/first_last_query.sim +++ b/tests/script/general/parser/first_last_query.sim @@ -40,27 +40,27 @@ print data03 = $data03 if $data03 != 0.00000 then return -1 endi -#if $data04 != null then +#if $data04 != NULL then if $data04 != 0.000000000 then return -1 endi -#if $data05 != null then +#if $data05 != NULL then if $data05 != 0 then return -1 endi -#if $data06 != null then +#if $data06 != NULL then if $data06 != 0 then return -1 endi -#if $data07 != null then +#if $data07 != NULL then if $data07 != 1 then return -1 endi -#if $data08 != null then +#if $data08 != NULL then if $data08 != BINARY then return -1 endi -#if $data09 != null then +#if $data09 != NULL then if $data09 != NCHAR then return -1 endi diff --git a/tests/script/general/parser/insert_tb.sim b/tests/script/general/parser/insert_tb.sim index 201bb2878642f20a87ead70c387851bcd8ba847e..4f2c5fcc7849a195470969abfc54025919b39e53 100644 --- a/tests/script/general/parser/insert_tb.sim +++ b/tests/script/general/parser/insert_tb.sim @@ -218,10 +218,10 @@ if $data46 != @quoted double@ then return -1 endi -# case: support null char of the binary field [TBASE-660] -sql create table nullb (ts timestamp, c1 binary(20), c2 binary(20), c3 float) -sql insert into nullb values ('2018-09-17 09:00:00.000', '', '', 3.746) -sql select * from nullb +# case: support NULL char of the binary field [TBASE-660] +sql create table NULLb (ts timestamp, c1 binary(20), c2 binary(20), c3 float) +sql insert into NULLb values ('2018-09-17 09:00:00.000', '', '', 3.746) +sql select * from NULLb if $rows != 1 then return -1 endi diff --git a/tests/script/general/parser/interp_test.sim b/tests/script/general/parser/interp_test.sim index 03e699732161fd6ccf0d3934afdc7a96b060fd35..3e6d5de85bd315886493985fc3d2ac7e324efbee 100644 --- a/tests/script/general/parser/interp_test.sim +++ b/tests/script/general/parser/interp_test.sim @@ -87,7 +87,7 @@ $tb = $tbPrefix . 0 ### illegal queries on a table sql_error select interp(ts), c1 from $tb where ts = $ts0 sql_error select interp(ts) from $tb where ts >= $ts0 - sql_error select interp(ts), max(c1), min(c2), count(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(null) + sql_error select interp(ts), max(c1), min(c2), count(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(NULL) ### interp from tb + fill $t = $ts0 + 1000 @@ -107,7 +107,7 @@ $tb = $tbPrefix . 0 return -1 endi - ## fill(null) + ## fill(NULL) $t = $tsu - 1000 sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(value, NULL) order by ts asc if $rows != 1 then @@ -116,31 +116,31 @@ $tb = $tbPrefix . 0 if $data00 != @18-11-25 19:29:59.000@ then return -1 endi - if $data01 != null then + if $data01 != NULL then return -1 endi - if $data02 != null then + if $data02 != NULL then return -1 endi - if $data03 != null then + if $data03 != NULL then return -1 endi - if $data04 != null then + if $data04 != NULL then return -1 endi - if $data05 != null then + if $data05 != NULL then return -1 endi - if $data06 != null then + if $data06 != NULL then return -1 endi - if $data07 != null then + if $data07 != NULL then return -1 endi - if $data08 != null then + if $data08 != NULL then return -1 endi - if $data09 != null then + if $data09 != NULL then return -1 endi @@ -209,7 +209,7 @@ $tb = $tbPrefix . 0 if $data01 != 0 then return -1 endi - if $data02 != null then + if $data02 != NULL then return -1 endi if $data03 != 0.00000 then @@ -254,13 +254,13 @@ $tb = $tbPrefix . 0 if $data06 != 0 then return -1 endi - if $data07 != null then + if $data07 != NULL then return -1 endi - if $data08 != null then + if $data08 != NULL then return -1 endi - if $data09 != null then + if $data09 != NULL then return -1 endi # columns contain NULL values @@ -276,13 +276,13 @@ $tb = $tbPrefix . 0 if $data01 != 0 then return -1 endi - if $data02 != null then + if $data02 != NULL then return -1 endi if $data03 != 0.00167 then return -1 endi - if $data04 != null then + if $data04 != NULL then return -1 endi if $data05 != 0 then @@ -291,13 +291,13 @@ $tb = $tbPrefix . 0 if $data06 != 0 then return -1 endi - if $data07 != null then + if $data07 != NULL then return -1 endi - if $data08 != null then + if $data08 != NULL then return -1 endi - if $data09 != null then + if $data09 != NULL then return -1 endi @@ -346,13 +346,13 @@ $tb = $tbPrefix . 0 if $data01 != 0 then return -1 endi - if $data02 != null then + if $data02 != NULL then return -1 endi if $data03 != 0.00000 then return -1 endi - if $data04 != null then + if $data04 != NULL then return -1 endi if $data05 != 0 then @@ -413,10 +413,10 @@ $tb = $tbPrefix . 0 if $data07 != 1 then return -1 endi - if $data08 != null then + if $data08 != NULL then return -1 endi - if $data09 != null then + if $data09 != NULL then return -1 endi @@ -454,7 +454,7 @@ $tb = $tbPrefix . 0 if $data09 != nchar0 then return -1 endi - # table has null columns + # table has NULL columns sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $ts0 fill(value, -1, -2, -3) if $rows != 1 then return -1 @@ -465,13 +465,13 @@ $tb = $tbPrefix . 0 if $data01 != 0 then return -1 endi - if $data02 != null then + if $data02 != NULL then return -1 endi if $data03 != 0.00000 then return -1 endi - if $data04 != null then + if $data04 != NULL then return -1 endi @@ -521,10 +521,10 @@ $tb = $tbPrefix . 0 if $data08 != intp_tb0 then return -1 endi - if $data22 != null then + if $data22 != NULL then return -1 endi - if $data24 != null then + if $data24 != NULL then return -1 endi if $data28 != intp_tb2 then @@ -558,51 +558,51 @@ $tb = $tbPrefix . 0 if $data21 != 0 then return -1 endi - if $data22 != null then + if $data22 != NULL then return -1 endi - if $data24 != null then + if $data24 != NULL then return -1 endi ## interp(*) from stb + group by + fill(none) $t = $ts0 + 1000 - sql select interp(*) from $stb where ts = $t fill(null) group by tbname + sql select interp(*) from $stb where ts = $t fill(NULL) group by tbname if $rows != $tbNum then return -1 endi if $data00 != @18-09-17 09:00:01.000@ then return -1 endi -if $data01 != null then +if $data01 != NULL then return -1 endi -if $data12 != null then +if $data12 != NULL then return -1 endi -if $data23 != null then +if $data23 != NULL then return -1 endi -if $data34 != null then +if $data34 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data16 != null then +if $data16 != NULL then return -1 endi -if $data27 != null then +if $data27 != NULL then return -1 endi -if $data38 != null then +if $data38 != NULL then return -1 endi -if $data09 != null then +if $data09 != NULL then return -1 endi -sql select interp(*) from $stb where ts = $ts0 fill(null) group by tbname +sql select interp(*) from $stb where ts = $ts0 fill(NULL) group by tbname print $rows if $rows != 4 then @@ -619,10 +619,10 @@ endi if $data21 != 0 then return -1 endi -if $data22 != null then +if $data22 != NULL then return -1 endi -if $data24 != null then +if $data24 != NULL then return -1 endi @@ -670,13 +670,13 @@ endi if $data21 != 0 then return -1 endi - if $data22 != null then + if $data22 != NULL then return -1 endi if $data23 != 0.00000 then return -1 endi - if $data24 != null then + if $data24 != NULL then return -1 endi if $data25 != 0 then @@ -724,13 +724,13 @@ endi if $data06 != 0 then return -1 endi - if $data07 != null then + if $data07 != NULL then return -1 endi - if $data08 != null then + if $data08 != NULL then return -1 endi - if $data09 != null then + if $data09 != NULL then return -1 endi if $data20 != @18-09-17 09:00:01.000@ then @@ -739,13 +739,13 @@ endi if $data21 != 0 then return -1 endi - if $data22 != null then + if $data22 != NULL then return -1 endi if $data23 != 0.00167 then return -1 endi - if $data24 != null then + if $data24 != NULL then return -1 endi if $data25 != 0 then @@ -754,13 +754,13 @@ endi if $data26 != 0 then return -1 endi - if $data27 != null then + if $data27 != NULL then return -1 endi - if $data28 != null then + if $data28 != NULL then return -1 endi - if $data29 != null then + if $data29 != NULL then return -1 endi @@ -796,10 +796,10 @@ endi if $data07 != 1 then return -1 endi - if $data08 != null then + if $data08 != NULL then return -1 endi - if $data09 != null then + if $data09 != NULL then return -1 endi if $data20 != @18-09-17 09:00:01.000@ then @@ -826,9 +826,9 @@ endi if $data27 != 1 then return -1 endi - if $data28 != null then + if $data28 != NULL then return -1 endi - if $data29 != null then + if $data29 != NULL then return -1 endi diff --git a/tests/script/general/parser/lastrow_query.sim b/tests/script/general/parser/lastrow_query.sim index 3ff0426dcd12d8464bebb9490803e804572b049d..a5e003fb651e69024326c58e5d8716d6509f28a2 100644 --- a/tests/script/general/parser/lastrow_query.sim +++ b/tests/script/general/parser/lastrow_query.sim @@ -27,7 +27,7 @@ endi if $data01 != 1439 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi if $data03 != 1439.00000 then diff --git a/tests/script/general/parser/limit1_stb.sim b/tests/script/general/parser/limit1_stb.sim index b9ba90ef5098dcce003be1ce07af9c21bdfaf870..e69d6ab14ff99c9f2c623d2ca8f0a358a23f991c 100644 --- a/tests/script/general/parser/limit1_stb.sim +++ b/tests/script/general/parser/limit1_stb.sim @@ -62,13 +62,13 @@ endi if $data01 != 9 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi if $data03 != 9.00000 then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi if $data05 != 9 then @@ -130,13 +130,13 @@ endi if $data11 != 0 then return -1 endi -if $data12 != null then +if $data12 != NULL then return -1 endi if $data13 != 0.00000 then return -1 endi -if $data14 != null then +if $data14 != NULL then return -1 endi if $data15 != 0 then @@ -261,13 +261,13 @@ endi if $data01 != 0 then return -1 endi -if $data12 != null then +if $data12 != NULL then return -1 endi if $data23 != 2.00000 then return -1 endi -if $data34 != null then +if $data34 != NULL then return -1 endi if $data45 != 4 then @@ -428,7 +428,7 @@ endi if $data26 != 1 then return -1 endi -if $data31 != null then +if $data31 != NULL then return -1 endi if $data42 != 4.500000000 then @@ -458,7 +458,7 @@ endi if $data00 != 9 then return -1 endi -if $data01 != null then +if $data01 != NULL then return -1 endi if $data12 != 4.500000000 then diff --git a/tests/script/general/parser/limit1_tb.sim b/tests/script/general/parser/limit1_tb.sim index a9484d10dbaaad1c8c08b2ae54caf85ad186207e..8ed21a47e6b928cbd3f9ab4019edd8c1f70e3190 100644 --- a/tests/script/general/parser/limit1_tb.sim +++ b/tests/script/general/parser/limit1_tb.sim @@ -111,16 +111,16 @@ endi if $data09 != nchar0 then return -1 endi -if $data11 != null then +if $data11 != NULL then return -1 endi -if $data12 != null then +if $data12 != NULL then return -1 endi -if $data13 != null then +if $data13 != NULL then return -1 endi -if $data14 != null then +if $data14 != NULL then return -1 endi @@ -543,7 +543,7 @@ endi if $data14 != 8.000000000 then return -1 endi -if $data21 != null then +if $data21 != NULL then return -1 endi @@ -613,7 +613,7 @@ endi if $data21 != 7.000000000 then return -1 endi -if $data31 != null then +if $data31 != NULL then return -1 endi sql select avg(c1), avg(c2), avg(c3), avg(c4), avg(c5), avg(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 3 offset 1 diff --git a/tests/script/general/parser/limit2_query.sim b/tests/script/general/parser/limit2_query.sim index d5b4d3e5ff19759a2b24d2e950392f325ec048e9..57cd13abeec1d3487032d4bfa26c91a98c2a065f 100644 --- a/tests/script/general/parser/limit2_query.sim +++ b/tests/script/general/parser/limit2_query.sim @@ -166,13 +166,13 @@ endi if $data47 != 1 then return -1 endi -if $data57 != null then +if $data57 != NULL then return -1 endi if $data68 != binary3 then return -1 endi -if $data79 != null then +if $data79 != NULL then return -1 endi @@ -216,10 +216,10 @@ endi if $data09 != nchar5 then return -1 endi -if $data18 != null then +if $data18 != NULL then return -1 endi -if $data19 != null then +if $data19 != NULL then return -1 endi if $data16 != -2.000000000 then @@ -269,10 +269,10 @@ endi if $data27 != 1 then return -1 endi -if $data38 != null then +if $data38 != NULL then return -1 endi -if $data49 != null then +if $data49 != NULL then return -1 endi diff --git a/tests/script/general/parser/limit_stb.sim b/tests/script/general/parser/limit_stb.sim index 3e3c75ddacfc103e9e229b6406d81561beb182d4..c6a3766b7d41b690cda319859ad3186af23ef6dd 100644 --- a/tests/script/general/parser/limit_stb.sim +++ b/tests/script/general/parser/limit_stb.sim @@ -117,13 +117,13 @@ endi if $data01 != 9 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi if $data03 != 9.00000 then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi if $data05 != 9 then @@ -185,13 +185,13 @@ endi if $data11 != 0 then return -1 endi -if $data12 != null then +if $data12 != NULL then return -1 endi if $data13 != 0.00000 then return -1 endi -if $data14 != null then +if $data14 != NULL then return -1 endi if $data15 != 0 then @@ -405,7 +405,7 @@ endi if $data28 != 4 then return -1 endi -if $data31 != null then +if $data31 != NULL then return -1 endi if $data47 != nchar0 then @@ -427,7 +427,7 @@ endi if $data00 != 9 then return -1 endi -if $data01 != null then +if $data01 != NULL then return -1 endi if $data02 != 4.500000000 then @@ -726,16 +726,16 @@ endi if $data00 != @18-09-17 09:10:00.000@ then return -1 endi -if $data01 != null then +if $data01 != NULL then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi if $data09 != 5 then return -1 endi -if $data13 != null then +if $data13 != NULL then return -1 endi if $data19 != 5 then @@ -747,13 +747,13 @@ endi if $data24 != 0 then return -1 endi -if $data25 != null then +if $data25 != NULL then return -1 endi -if $data26 != null then +if $data26 != NULL then return -1 endi -if $data27 != null then +if $data27 != NULL then return -1 endi if $data28 != 1 then diff --git a/tests/script/general/parser/limit_tb.sim b/tests/script/general/parser/limit_tb.sim index 8fee85cece4d3b4deb1eb159dcb33d8a528970e1..00d49b556fa013383881fd2f25c0b171e1096618 100644 --- a/tests/script/general/parser/limit_tb.sim +++ b/tests/script/general/parser/limit_tb.sim @@ -111,16 +111,16 @@ endi if $data09 != nchar0 then return -1 endi -if $data11 != null then +if $data11 != NULL then return -1 endi -if $data12 != null then +if $data12 != NULL then return -1 endi -if $data13 != null then +if $data13 != NULL then return -1 endi -if $data14 != null then +if $data14 != NULL then return -1 endi @@ -537,7 +537,7 @@ endi if $data14 != 8.000000000 then return -1 endi -if $data21 != null then +if $data21 != NULL then return -1 endi @@ -554,7 +554,7 @@ endi if $data21 != 9 then return -1 endi -if $data31 != null then +if $data31 != NULL then return -1 endi @@ -574,7 +574,7 @@ endi if $data31 != 9 then return -1 endi -if $data41 != null then +if $data41 != NULL then return -1 endi sql select sum(c1), sum(c2), sum(c3), sum(c4), sum(c5), sum(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 5 offset 1 @@ -590,7 +590,7 @@ endi if $data21 != 9 then return -1 endi -if $data31 != null then +if $data31 != NULL then return -1 endi @@ -607,7 +607,7 @@ endi if $data21 != 7.000000000 then return -1 endi -if $data31 != null then +if $data31 != NULL then return -1 endi sql select avg(c1), avg(c2), avg(c3), avg(c4), avg(c5), avg(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 3 offset 1 @@ -623,7 +623,7 @@ endi if $data21 != 9.000000000 then return -1 endi -if $data31 != null then +if $data31 != NULL then return -1 endi diff --git a/tests/script/general/parser/null_char.sim b/tests/script/general/parser/null_char.sim index ae402a477de2e4053479a32079d2dc3f9b9494bc..e4f6c5f84972319483061ae50f7c267bb97292fc 100644 --- a/tests/script/general/parser/null_char.sim +++ b/tests/script/general/parser/null_char.sim @@ -9,57 +9,57 @@ system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect -print ========== null_char.sim +print ========== NULL_char.sim $db = db sql drop database if exists $db sql create database $db sql use $db -#### case 0: field null, or 'null' +#### case 0: field NULL, or 'NULL' sql create table mt1 (ts timestamp, col1 int, col2 bigint, col3 float, col4 double, col5 binary(8), col6 bool, col7 smallint, col8 tinyint, col9 nchar(8)) tags (tag1 binary(8), tag2 nchar(8), tag3 int, tag4 bigint, tag5 bool, tag6 float) -sql create table st1 using mt1 tags (null, 'null', 100, 1000, 'false', 9.123) +sql create table st1 using mt1 tags (NULL, 'NULL', 100, 1000, 'false', 9.123) sql insert into st1 values ('2019-01-01 09:00:00.000', 123, -123, 3.0, 4.0, 'binary', true, 1000, 121, 'nchar') sql insert into st1 values ('2019-01-01 09:00:01.000', '456', '456', '3.33', '4.444', 'binary', 'true', '1001', '122', 'nchar') -sql insert into st1 values ('2019-01-01 09:00:02.000', null, null, null, null, null, null, null, null, null) -sql insert into st1 values ('2019-01-01 09:00:03.000', null, null, null, null, 'null', 'null', 2002, 127, 'null') +sql insert into st1 values ('2019-01-01 09:00:02.000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) +sql insert into st1 values ('2019-01-01 09:00:03.000', NULL, NULL, NULL, NULL, 'NULL', 'NULL', 2002, 127, 'NULL') sql select * from mt1 if $rows != 4 then return -1 endi -if $data21 != null then +if $data21 != NULL then return -1 endi -if $data22 != null then +if $data22 != NULL then return -1 endi -if $data23 != null then +if $data23 != NULL then return -1 endi -if $data24 != null then +if $data24 != NULL then return -1 endi -if $data25 != null then +if $data25 != NULL then return -1 endi -if $data26 != null then +if $data26 != NULL then return -1 endi -if $data27 != null then +if $data27 != NULL then return -1 endi -if $data28 != null then +if $data28 != NULL then return -1 endi -if $data29 != null then +if $data29 != NULL then return -1 endi -if $data31 != null then +if $data31 != NULL then return -1 endi -if $data32 != null then +if $data32 != NULL then return -1 endi #if $data33 != 0.00000 then @@ -70,20 +70,20 @@ endi # print === expect 0.00000, actually $data34 # return -1 #endi -if $data35 != null then +if $data35 != NULL then return -1 endi -if $data36 != null then +if $data36 != NULL then return -1 endi -if $data39 != null then +if $data39 != NULL then return -1 endi -#### case 1: tag null, or 'null' +#### case 1: tag NULL, or 'NULL' sql create table mt2 (ts timestamp, col1 int, col3 float, col5 binary(8), col6 bool, col9 nchar(8)) tags (tag1 binary(8), tag2 nchar(8), tag3 int, tag5 bool) -sql create table st2 using mt2 tags (null, 'null', 102, 'true') +sql create table st2 using mt2 tags (NULL, 'NULL', 102, 'true') sql describe st2 if $rows != 10 then return -1 @@ -92,7 +92,7 @@ if $data63 != NULL then print ==1== expect: NULL, actually: $data63 return -1 endi -if $data73 != null then +if $data73 != NULL then print ==2== expect: NULL, actually: $data73 return -1 endi @@ -127,7 +127,7 @@ endi ### bool: sql_error create table stx using mt2 tags ('NULL', '123aBc', 104, '123') sql_error create table sty using mt2 tags ('NULL', '123aBc', 104, 'xtz') -sql create table st4 using mt2 tags ('NULL', '123aBc', 104, 'null') +sql create table st4 using mt2 tags ('NULL', '123aBc', 104, 'NULL') sql describe st4 if $rows != 10 then return -1 @@ -168,9 +168,9 @@ endi #### case 2: dynamic create table using super table when insert into sql create table mt3 (ts timestamp, col1 int, col3 float, col5 binary(8), col6 bool, col9 nchar(8)) tags (tag1 binary(8), tag2 nchar(8), tag3 int, tag5 bool) -sql_error insert into st31 using mt3 tags (null, 'null', 102, 'true') values (now+1s, 31, 31, 'bin_31', '123', 'nchar_31') +sql_error insert into st31 using mt3 tags (NULL, 'NULL', 102, 'true') values (now+1s, 31, 31, 'bin_31', '123', 'nchar_31') sql_error insert into st32 using mt3 tags (NULL, 'ABC', 103, 'FALSE') values (now+2s, 32, 32.12345, 'bin_32', 'abc', 'nchar_32') -sql_error insert into st33 using mt3 tags ('NULL', '123aBc', 104, 'null') values (now+3s, 33, 33, 'bin_33', 'false123', 'nchar_33') +sql_error insert into st33 using mt3 tags ('NULL', '123aBc', 104, 'NULL') values (now+3s, 33, 33, 'bin_33', 'false123', 'nchar_33') sql_error insert into st34 using mt3 tags ('NULL', '123aBc', 105, NULL) values (now+4s, 34, 34.12345, 'bin_34', 'true123', 'nchar_34') @@ -214,9 +214,9 @@ sql alter table st41 set tag tag_binary = "" #if $data23 != $tagvalue then # return -1 #endi -sql alter table st41 set tag tag_binary = "null" +sql alter table st41 set tag tag_binary = "NULL" sql describe st41 -if $data23 != null then +if $data23 != NULL then return -1 endi sql alter table st41 set tag tag_binary = NULL @@ -242,9 +242,9 @@ sql alter table st41 set tag tag_nchar = '' #if $data33 != $tagvalue then # return -1 #endi -sql alter table st41 set tag tag_nchar = "null" +sql alter table st41 set tag tag_nchar = "NULL" sql describe st41 -if $data33 != null then +if $data33 != NULL then return -1 endi sql alter table st41 set tag tag_nchar = NULL @@ -279,13 +279,13 @@ sql describe st41 if $data43 != -2000 then return -1 endi -sql alter table st41 set tag tag_int = null +sql alter table st41 set tag tag_int = NULL sql describe st41 if $data43 != NULL then print ==10== expect: NULL, actually: $data43 return -1 endi -sql alter table st41 set tag tag_int = 'null' +sql alter table st41 set tag tag_int = 'NULL' sql_error alter table st41 set tag tag_int = '' sql_error alter table st41 set tag tag_int = abc379 @@ -310,13 +310,13 @@ sql describe st41 if $data53 != true then return -1 endi -sql alter table st41 set tag tag_bool = 'null' +sql alter table st41 set tag tag_bool = 'NULL' sql describe st41 if $data53 != NULL then print ==14== expect: NULL, actually: $data53 return -1 endi -sql alter table st41 set tag tag_bool = null +sql alter table st41 set tag tag_bool = NULL sql describe st41 if $data53 != NULL then return -1 @@ -350,13 +350,13 @@ if $data63 != 54.123455 then print ==11== expect: 54.123455, actually : $data63 return -1 endi -sql alter table st41 set tag tag_float = null +sql alter table st41 set tag tag_float = NULL sql describe st41 if $data63 != NULL then print ==12== expect: NULL, actually : $data63 return -1 endi -sql alter table st41 set tag tag_float = 'null' +sql alter table st41 set tag tag_float = 'NULL' sql describe st41 if $data63 != NULL then print ==17== expect: NULL, actually : $data63 @@ -396,13 +396,13 @@ sql describe st41 if $data73 != -2456.000000 then return -1 endi -sql alter table st41 set tag tag_double = null +sql alter table st41 set tag tag_double = NULL sql describe st41 if $data73 != NULL then print ==13== expect: NULL, actually : $data73 return -1 endi -sql alter table st41 set tag tag_double = 'null' +sql alter table st41 set tag tag_double = 'NULL' sql describe st41 if $data73 != NULL then print ==20== expect: NULL, actually : $data73 @@ -420,7 +420,7 @@ sql create table mt5 (ts timestamp, c1 int) tags (tag_bigint bigint, tag_smallin sql create table st51 using mt5 tags (1, 2, 3) sql alter table st51 set tag tag_bigint = '-379' sql alter table st51 set tag tag_bigint = -2000 -sql alter table st51 set tag tag_bigint = null +sql alter table st51 set tag tag_bigint = NULL sql alter table st51 set tag tag_bigint = 9223372036854775807 sql describe st51 if $data23 != 9223372036854775807 then @@ -439,13 +439,13 @@ endi sql_error alter table st51 set tag tag_bigint = -9223372036854775808 -sql alter table st51 set tag tag_bigint = 'null' +sql alter table st51 set tag tag_bigint = 'NULL' sql_error alter table st51 set tag tag_bigint = '' sql_error alter table st51 set tag tag_bigint = abc379 #### sql alter table st51 set tag tag_smallint = -2000 -sql alter table st51 set tag tag_smallint = null +sql alter table st51 set tag tag_smallint = NULL sql alter table st51 set tag tag_smallint = 32767 sql describe st51 if $data33 != 32767 then @@ -460,13 +460,13 @@ if $data33 != -32767 then endi sql_error alter table st51 set tag tag_smallint = -32768 -sql alter table st51 set tag tag_smallint = 'null' +sql alter table st51 set tag tag_smallint = 'NULL' sql_error alter table st51 set tag tag_smallint = '' sql_error alter table st51 set tag tag_smallint = abc379 #### sql alter table st51 set tag tag_tinyint = -127 -sql alter table st51 set tag tag_tinyint = null +sql alter table st51 set tag tag_tinyint = NULL sql alter table st51 set tag tag_tinyint = 127 sql describe st51 if $data43 != 127 then @@ -479,7 +479,7 @@ if $data43 != -127 then endi sql_error alter table st51 set tag tag_tinyint = '-128' sql_error alter table st51 set tag tag_tinyint = 128 -sql alter table st51 set tag tag_tinyint = 'null' +sql alter table st51 set tag tag_tinyint = 'NULL' sql_error alter table st51 set tag tag_tinyint = '' sql_error alter table st51 set tag tag_tinyint = abc379 diff --git a/tests/script/general/parser/projection_limit_offset.sim b/tests/script/general/parser/projection_limit_offset.sim index d990a79628e213502de73283999761755f572efa..4b10694190f29fc205caa96aa2d3c52897c0eff2 100644 --- a/tests/script/general/parser/projection_limit_offset.sim +++ b/tests/script/general/parser/projection_limit_offset.sim @@ -344,11 +344,11 @@ if $data11 != 1 then return -1 endi -if $data12 != null then +if $data12 != NULL then return -1 endi -if $data13 != null then +if $data13 != NULL then return -1 endi diff --git a/tests/script/general/parser/set_tag_vals.sim b/tests/script/general/parser/set_tag_vals.sim index 270b6ed0656515bc703dd43f39479cef828d2cf1..de29c28ba38550eab2d5b928d3aa3e86cddb0c73 100644 --- a/tests/script/general/parser/set_tag_vals.sim +++ b/tests/script/general/parser/set_tag_vals.sim @@ -87,7 +87,7 @@ if $rows != 0 then return -1 endi -print ================== set tag to null +print ================== set tag to NULL sql create table stb1_tg (ts timestamp, c1 int) tags(t1 int,t2 bigint,t3 double,t4 float,t5 smallint,t6 tinyint) sql create table stb2_tg (ts timestamp, c1 int) tags(t1 bool,t2 binary(10), t3 nchar(10)) sql create table tb1_tg1 using stb1_tg tags(1,2,3,4,5,6) @@ -195,33 +195,33 @@ sql select * from stb1_tg if $rows != 1 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi sql select * from stb2_tg -if $data02 != null then +if $data02 != NULL then return -1 endi print $data03 -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi diff --git a/tests/script/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim index 7d2d3fc60b11e5b8d978030f430807fd6d598ba8..234e31d2618530171c5f58742474c98c6a358dda 100644 --- a/tests/script/general/parser/slimit.sim +++ b/tests/script/general/parser/slimit.sim @@ -57,7 +57,7 @@ while $i < $tbNum $x = $x + 1 endw $ts = $ts + $delta - sql insert into $tb values ( $ts , null, null, null, null, null, null, null, null, null ) + sql insert into $tb values ( $ts , NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) $i = $i + 1 endw print ====== $db tables created @@ -87,7 +87,7 @@ while $i < $tbNum while $x < $rowNum $xs = $x * $delta $ts = $ts0 + $xs - sql insert into $tb values ( $ts , null , null , null , null , null , null , null , null , null ) + sql insert into $tb values ( $ts , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL ) $x = $x + 1 endw $i = $i + 1 diff --git a/tests/script/general/parser/slimit_query.sim b/tests/script/general/parser/slimit_query.sim index 7735b1b84b4b81fd83050d07a2275f42e00b9f00..655bc5f8beab0209428a4796ba83ba10d8b3afde 100644 --- a/tests/script/general/parser/slimit_query.sim +++ b/tests/script/general/parser/slimit_query.sim @@ -219,10 +219,10 @@ endi if $data13 != -2.000000000 then return -1 endi -if $data17 != null then +if $data17 != NULL then return -1 endi -if $data18 != null then +if $data18 != NULL then return -1 endi if $data19 != slm_tb6 then @@ -293,10 +293,10 @@ endi if $data13 != -2.000000000 then return -1 endi -if $data17 != null then +if $data17 != NULL then return -1 endi -if $data18 != null then +if $data18 != NULL then return -1 endi if $data19 != slm_tb5 then diff --git a/tests/script/general/parser/timestamp.sim b/tests/script/general/parser/timestamp.sim index ce2b62fcc9a1aad21b41d8013cd9388929fbcdb3..9a1c793909e4b1dd19a9004f6a8bece0c1972ac5 100644 --- a/tests/script/general/parser/timestamp.sim +++ b/tests/script/general/parser/timestamp.sim @@ -49,7 +49,7 @@ while $i < $tbNum $x = $x + 1 endw $ts = $ts + $delta - sql insert into $tb values ( $ts , null, null ) + sql insert into $tb values ( $ts , NULL, NULL ) $i = $i + 1 endw print ====== $db tables created diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim index c840bcf22e76c8db4da773c58464efde1e0674c4..fb3a0a69e7f28501a07ec3c1840ece094a473994 100644 --- a/tests/script/general/parser/where.sim +++ b/tests/script/general/parser/where.sim @@ -228,47 +228,47 @@ if $data11 != @19-01-01 09:10:00.000@ then return -1 endi -sql create table tb_where_null (ts timestamp, c1 float, c2 binary(10)) -sql insert into tb_where_null values ('2019-01-01 09:00:00.000', 1, 'val1') -sql insert into tb_where_null values ('2019-01-01 09:00:01.000', NULL, NULL) -sql insert into tb_where_null values ('2019-01-01 09:00:02.000', 2, 'val2') -sql_error select * from tb_where_null where c1 = NULL -sql_error select * from tb_where_null where c1 <> NULL -sql_error select * from tb_where_null where c1 < NULL -sql select * from tb_where_null where c1 = "NULL" +sql create table tb_where_NULL (ts timestamp, c1 float, c2 binary(10)) +sql insert into tb_where_NULL values ('2019-01-01 09:00:00.000', 1, 'val1') +sql insert into tb_where_NULL values ('2019-01-01 09:00:01.000', NULL, NULL) +sql insert into tb_where_NULL values ('2019-01-01 09:00:02.000', 2, 'val2') +sql_error select * from tb_where_NULL where c1 = NULL +sql_error select * from tb_where_NULL where c1 <> NULL +sql_error select * from tb_where_NULL where c1 < NULL +sql select * from tb_where_NULL where c1 = "NULL" if $rows != 0 then return -1 endi -sql select * from tb_where_null where c1 <> "NULL" +sql select * from tb_where_NULL where c1 <> "NULL" if $rows != 2 then return -1 endi -sql select * from tb_where_null where c1 <> "nulL" +sql select * from tb_where_NULL where c1 <> "nulL" if $rows != 2 then return -1 endi -sql select * from tb_where_null where c1 > "NULL" +sql select * from tb_where_NULL where c1 > "NULL" if $rows != 0 then return -1 endi -sql select * from tb_where_null where c1 >= "NULL" +sql select * from tb_where_NULL where c1 >= "NULL" if $rows != 0 then return -1 endi -sql select * from tb_where_null where c2 = "NULL" +sql select * from tb_where_NULL where c2 = "NULL" if $rows != 0 then return -1 endi -sql select * from tb_where_null where c2 <> "NULL" +sql select * from tb_where_NULL where c2 <> "NULL" if $rows != 2 then return -1 endi -sql select * from tb_where_null where c2 <> "nUll" +sql select * from tb_where_NULL where c2 <> "nUll" if $rows != 2 then return -1 endi diff --git a/tests/script/general/stream/metrics_del.sim b/tests/script/general/stream/metrics_del.sim index 025f4cbdc0568ff2c5a821b17ca7aaa200870473..c856871e93b7be436cd7da6d665cb90439c9ae7f 100644 --- a/tests/script/general/stream/metrics_del.sim +++ b/tests/script/general/stream/metrics_del.sim @@ -84,12 +84,12 @@ $st = $stPrefix . c3 sql select * from $st print ===> select * from $st print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09 -if $data01 != null then +if $data01 != NULL then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi diff --git a/tests/script/general/stream/stream_2.sim b/tests/script/general/stream/stream_2.sim index ed45784584120e25fe2c039e07d754d1309db958..13aac983374b40258f12f6a4b5d7e7e7dd143a0b 100644 --- a/tests/script/general/stream/stream_2.sim +++ b/tests/script/general/stream/stream_2.sim @@ -185,10 +185,10 @@ print select * from $st => $data01 $data02, $data03 if $data01 != 200 then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi diff --git a/tests/script/general/stream/table_del.sim b/tests/script/general/stream/table_del.sim index 16dc8c2bb12caf1dd5e4c31523fe03667b8335dd..66fd58308f06cd053e063cde8b77b1ec18515169 100644 --- a/tests/script/general/stream/table_del.sim +++ b/tests/script/general/stream/table_del.sim @@ -79,12 +79,12 @@ $st = $stPrefix . c3 sql select * from $st print ===> select * from $st print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09 -if $data01 != null then +if $data01 != NULL then return -1 endi -if $data02 != null then +if $data02 != NULL then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi diff --git a/tests/script/general/table/int.sim b/tests/script/general/table/int.sim index 5c5b542e0acfc9e84574dd6aaa396a4b23c804fc..81bdcda47dd14c59df6017a07dde64da87b6546f 100644 --- a/tests/script/general/table/int.sim +++ b/tests/script/general/table/int.sim @@ -22,7 +22,7 @@ sql select * from $tb order by ts desc if $rows != 1 then return -1 endi -if $data01 != null then +if $data01 != NULL then return -1 endi @@ -35,7 +35,7 @@ sql select * from $tb order by ts desc if $rows != 2 then return -1 endi -if $data01 != null then +if $data01 != NULL then return -1 endi @@ -58,7 +58,7 @@ sql select * from $tb order by ts desc if $rows != 4 then return -1 endi -if $data01 != null then +if $data01 != NULL then return -1 endi @@ -96,22 +96,22 @@ if $data01 != 2 then endi print =============== step8 -sql insert into $tb values (now+8m, "null") +sql insert into $tb values (now+8m, "NULL") sql select * from $tb order by ts desc if $rows != 8 then return -1 endi -if $data01 != null then +if $data01 != NULL then return -1 endi print =============== step9 -sql insert into $tb values (now+9m, 'null') +sql insert into $tb values (now+9m, 'NULL') sql select * from $tb order by ts desc if $rows != 9 then return -1 endi -if $data01 != null then +if $data01 != NULL then return -1 endi @@ -131,4 +131,4 @@ if $rows != 0 then return -1 endi -system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT diff --git a/tests/script/general/tag/add.sim b/tests/script/general/tag/add.sim index 92fa80045065c52ad0ebea1a23019eba9ff3d97e..3d4323c4017b23741dbdf3bdc604b7830bc58782 100644 --- a/tests/script/general/tag/add.sim +++ b/tests/script/general/tag/add.sim @@ -545,7 +545,7 @@ endi if $data04 != 0 then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi diff --git a/tests/script/general/tag/change.sim b/tests/script/general/tag/change.sim index 74431458f94febf71da647d340d9caccc4f41807..1b7e643a21c5fc56321ee9d6d18992e5f1f82496 100644 --- a/tests/script/general/tag/change.sim +++ b/tests/script/general/tag/change.sim @@ -394,7 +394,7 @@ endi if $data06 != 6 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -421,7 +421,7 @@ endi if $data06 != 6 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -448,7 +448,7 @@ endi if $data06 != 6 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -475,7 +475,7 @@ endi if $data06 != 6 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -502,7 +502,7 @@ endi if $data06 != 6 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi diff --git a/tests/script/general/tag/commit.sim b/tests/script/general/tag/commit.sim index 1e78628b284ef571843135d6bbd73c4e5e395e92..021f49a9986fd612f2b2e23a6da606cf779ff88d 100644 --- a/tests/script/general/tag/commit.sim +++ b/tests/script/general/tag/commit.sim @@ -544,7 +544,7 @@ endi if $data04 != 0 then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi @@ -1054,7 +1054,7 @@ endi if $data04 != 0 then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi diff --git a/tests/script/general/tag/delete.sim b/tests/script/general/tag/delete.sim index ef886d76446cd44f87c0449140686c25ac98a6d7..6dd6254d3201728c3c66cc15aae50ad1ed03d905 100644 --- a/tests/script/general/tag/delete.sim +++ b/tests/script/general/tag/delete.sim @@ -428,7 +428,7 @@ endi if $data02 != 1 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi @@ -452,7 +452,7 @@ endi if $data02 != 1 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi @@ -476,7 +476,7 @@ endi if $data02 != 1 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi @@ -500,7 +500,7 @@ endi if $data02 != 1.000000000 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi @@ -524,10 +524,10 @@ endi if $data02 != 1 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi @@ -554,10 +554,10 @@ endi if $data02 != 1 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi @@ -584,10 +584,10 @@ endi if $data02 != 1 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi @@ -614,10 +614,10 @@ endi if $data02 != 1.000000000 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi @@ -644,13 +644,13 @@ endi if $data02 != 1 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi @@ -683,13 +683,13 @@ endi if $data03 != 4.00000 then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi @@ -722,16 +722,16 @@ endi if $data03 != 4.000000000 then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -771,13 +771,13 @@ endi if $data04 != 5.000000000 then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi diff --git a/tests/script/general/tag/set.sim b/tests/script/general/tag/set.sim index e48db5a7a8a3f4087169607e5acbdb8a6d485655..bc7b8ac53416cdf556122f0edd693593fffca875 100644 --- a/tests/script/general/tag/set.sim +++ b/tests/script/general/tag/set.sim @@ -338,7 +338,7 @@ endi if $data06 != 11 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -365,7 +365,7 @@ endi if $data06 != 11 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -392,7 +392,7 @@ endi if $data06 != 11 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -419,7 +419,7 @@ endi if $data06 != 11 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -446,7 +446,7 @@ endi if $data06 != 11 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi diff --git a/tests/script/unique/big/balance.sim b/tests/script/unique/big/balance.sim index 3d4d39af536a3ccb5ffbb609a36b3dcc34413e4c..4eb5772811b526a10f6eb64930c1026a51393551 100644 --- a/tests/script/unique/big/balance.sim +++ b/tests/script/unique/big/balance.sim @@ -160,7 +160,7 @@ print dnode3 freeVnodes $data3_192.168.0.3 if $data3_192.168.0.1 != 2 then goto show3 endi -if $data3_192.168.0.2 != null then +if $data3_192.168.0.2 != NULL then goto show3 endi if $data3_192.168.0.3 != 2 then @@ -216,7 +216,7 @@ print dnode3 freeVnodes $data3_192.168.0.3 if $data3_192.168.0.1 != 0 then goto show4 endi -if $data3_192.168.0.3 != null then +if $data3_192.168.0.3 != NULL then goto show4 endi diff --git a/tests/script/unique/cluster/balance1.sim b/tests/script/unique/cluster/balance1.sim index 424a80d25aa397837fd4598ccd0a48c77e27f140..10e05971d7f0f01a1641f615cef2097417793e9a 100644 --- a/tests/script/unique/cluster/balance1.sim +++ b/tests/script/unique/cluster/balance1.sim @@ -77,7 +77,7 @@ print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then return -1 endi -if $dnode2Vnodes != null then +if $dnode2Vnodes != NULL then return -1 endi @@ -146,7 +146,7 @@ print dnode2 $dnode2Vnodes if $dnode1Vnodes != 3 then goto show4 endi -if $dnode2Vnodes != null then +if $dnode2Vnodes != NULL then goto show4 endi @@ -229,7 +229,7 @@ print dnode3 $dnode3Vnodes if $dnode1Vnodes != 3 then goto show8 endi -if $dnode3Vnodes != null then +if $dnode3Vnodes != NULL then goto show8 endi @@ -245,7 +245,7 @@ if $dnode1Role != master then return -1 endi -if $dnode3Role != null then +if $dnode3Role != NULL then return -1 endi diff --git a/tests/script/unique/cluster/balance2.sim b/tests/script/unique/cluster/balance2.sim index 08fdd233e012f89a29bcaca938fb34f73aeb224a..d741e03eec9723a7e191c35138836b784a8658bc 100644 --- a/tests/script/unique/cluster/balance2.sim +++ b/tests/script/unique/cluster/balance2.sim @@ -131,7 +131,7 @@ print dnode3 $dnode3Vnodes if $dnode1Vnodes != 3 then goto show2 endi -if $dnode2Vnodes != null then +if $dnode2Vnodes != NULL then goto show2 endi if $dnode3Vnodes != 3 then @@ -194,7 +194,7 @@ print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 endi -if $dnode2Role != null then +if $dnode2Role != NULL then return -1 endi if $dnode3Role != slave then @@ -231,7 +231,7 @@ endi if $dnode4Vnodes != 3 then goto show4 endi -if $dnode3Vnodes != null then +if $dnode3Vnodes != NULL then goto show4 endi @@ -248,10 +248,10 @@ print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 endi -if $dnode2Role != null then +if $dnode2Role != NULL then return -1 endi -if $dnode3Role != null then +if $dnode3Role != NULL then return -1 endi @@ -339,7 +339,7 @@ print dnode4 $dnode4Vnodes $dnode5Vnodes = $data2_5 print dnode5 $dnode5Vnodes -if $dnode1Vnodes != null then +if $dnode1Vnodes != NULL then goto show6 endi if $dnode4Vnodes != 3 then diff --git a/tests/script/unique/cluster/balance3.sim b/tests/script/unique/cluster/balance3.sim index 407adc7f3b61301d6a5d08047160ae0b4d3fac27..e9847e21dac7af4deeb8e92b8ff59b2b5bc8a821 100644 --- a/tests/script/unique/cluster/balance3.sim +++ b/tests/script/unique/cluster/balance3.sim @@ -110,7 +110,7 @@ endi if $dnode3Vnodes != 3 then goto show1 endi -if $dnode4Vnodes != null then +if $dnode4Vnodes != NULL then goto show1 endi @@ -166,7 +166,7 @@ print dnode4 $dnode4Vnodes if $dnode1Vnodes != 3 then goto show3 endi -if $dnode2Vnodes != null then +if $dnode2Vnodes != NULL then goto show3 endi if $dnode3Vnodes != 3 then @@ -232,7 +232,7 @@ endi if $dnode5Vnodes != 3 then goto show5 endi -if $dnode3Vnodes != null then +if $dnode3Vnodes != NULL then goto show5 endi if $dnode4Vnodes != 3 then @@ -298,7 +298,7 @@ endi if $dnode6Vnodes != 3 then goto show7 endi -if $dnode4Vnodes != null then +if $dnode4Vnodes != NULL then goto show7 endi diff --git a/tests/script/unique/dnode/balance1.sim b/tests/script/unique/dnode/balance1.sim index 79f22c42ff6cd875af09b3baf56fef8a57872347..34d3310394ea6d071965878a9450fb75c53254c0 100644 --- a/tests/script/unique/dnode/balance1.sim +++ b/tests/script/unique/dnode/balance1.sim @@ -103,7 +103,7 @@ print dnode2 openVnodes $data2_2 if $data2_1 != 2 then goto show4 endi -if $data2_2 != null then +if $data2_2 != NULL then goto show4 endi if $rows != 1 then @@ -131,7 +131,7 @@ print dnode3 openVnodes $data2_3 if $data2_1 != 0 then goto show5 endi -if $data2_2 != null then +if $data2_2 != NULL then goto show5 endi if $data2_3 != 2 then @@ -155,7 +155,7 @@ print dnode3 openVnodes $data2_3 if $data2_1 != 0 then return -1 endi -if $data2_2 != null then +if $data2_2 != NULL then return -1 endi if $data2_3 != 3 then @@ -182,7 +182,7 @@ print dnode4 openVnodes $data2_4 if $data2_1 != 0 then goto show7 endi -if $data2_2 != null then +if $data2_2 != NULL then goto show7 endi if $data2_3 != 2 then @@ -210,7 +210,7 @@ print dnode4 openVnodes $data2_4 if $data2_1 != 0 then return -1 endi -if $data2_2 != null then +if $data2_2 != NULL then return -1 endi if $data2_3 != 2 then @@ -240,10 +240,10 @@ print dnode4 openVnodes $data2_4 if $data2_1 != 0 then goto show9 endi -if $data2_2 != null then +if $data2_2 != NULL then goto show9 endi -if $data2_3 != null then +if $data2_3 != NULL then goto show9 endi if $data2_4 != 4 then diff --git a/tests/script/unique/dnode/balance2.sim b/tests/script/unique/dnode/balance2.sim index 4518c4262230f15c1f2e7d4e3cfe06ddc1960600..9786a854a5845ba4981f49265b98394893f4ba8c 100644 --- a/tests/script/unique/dnode/balance2.sim +++ b/tests/script/unique/dnode/balance2.sim @@ -76,7 +76,7 @@ print dnode3 openVnodes $data2_3 if $data2_1 != 2 then goto show2 endi -if $data2_2 != null then +if $data2_2 != NULL then goto show2 endi if $data2_3 != 2 then @@ -105,7 +105,7 @@ print dnode4 openVnodes $data2_4 if $data2_1 != 0 then goto show3 endi -if $data2_2 != null then +if $data2_2 != NULL then goto show3 endi if $data2_3 != 2 then @@ -132,7 +132,7 @@ print dnode4 openVnodes $data2_4 if $data2_1 != 0 then return -1 endi -if $data2_2 != null then +if $data2_2 != NULL then return -1 endi if $data2_3 != 3 then @@ -163,7 +163,7 @@ print dnode5 openVnodes $data2_5 if $data2_1 != 0 then goto show5 endi -if $data2_2 != null then +if $data2_2 != NULL then goto show5 endi if $data2_3 != 2 then @@ -196,10 +196,10 @@ print dnode5 openVnodes $data2_5 if $data2_1 != 0 then goto show6 endi -if $data2_2 != null then +if $data2_2 != NULL then goto show6 endi -if $data2_3 != null then +if $data2_3 != NULL then goto show6 endi if $data2_4 != 3 then diff --git a/tests/script/unique/dnode/balance3.sim b/tests/script/unique/dnode/balance3.sim index acb0d033d4a21ed7bb262b9437cdb4d404fe437f..6d5bbc77a53cbd72a58d97506bdcd7ee0efcbaf2 100644 --- a/tests/script/unique/dnode/balance3.sim +++ b/tests/script/unique/dnode/balance3.sim @@ -88,7 +88,7 @@ print dnode4 openVnodes $data2_4 if $data2_1 != 2 then goto show2 endi -if $data2_2 != null then +if $data2_2 != NULL then goto show2 endi if $data2_3 != 2 then @@ -122,7 +122,7 @@ print dnode5 openVnodes $data2_5 if $data2_1 != 0 then goto show3 endi -if $data2_2 != null then +if $data2_2 != NULL then goto show3 endi if $data2_3 != 2 then @@ -162,7 +162,7 @@ print dnode5 openVnodes $data2_5 if $data2_1 != 0 then goto show4 endi -if $data2_2 != null then +if $data2_2 != NULL then goto show4 endi if $data2_3 != 3 then @@ -228,7 +228,7 @@ endi if $data2_6 != 3 then goto show6 endi -if $data2_3 != null then +if $data2_3 != NULL then goto show6 endi if $data2_4 != 3 then diff --git a/tests/script/unique/dnode/balancex.sim b/tests/script/unique/dnode/balancex.sim index d717250a796af420ef589f43b176a137b4460271..4b46db4b4900a3da083eb8c9e2eee25516363cb2 100644 --- a/tests/script/unique/dnode/balancex.sim +++ b/tests/script/unique/dnode/balancex.sim @@ -132,7 +132,7 @@ print dnode3 openVnodes $data2_3 if $data2_1 != 1 then goto show5 endi -if $data2_2 != null then +if $data2_2 != NULL then goto show5 endi if $data2_3 != 3 then diff --git a/tests/script/unique/dnode/offline1.sim b/tests/script/unique/dnode/offline1.sim index 5e4ab65be37e90a4cf6737d6fa7b485c16dd61ae..4d67b5f55ca9ef1d8bd27e8eab1688ed600cf598 100644 --- a/tests/script/unique/dnode/offline1.sim +++ b/tests/script/unique/dnode/offline1.sim @@ -63,7 +63,7 @@ print dnode1 $data4_2 if $data4_1 != ready then return -1 endi -if $data4_2 != null then +if $data4_2 != NULL then return -1 endi diff --git a/tests/script/unique/dnode/offline2.sim b/tests/script/unique/dnode/offline2.sim index 2615746e05ab0dcfb22caccd42f4fc3cead7e931..6aa85465dded7acbe45d2071e8970eab1060b38e 100644 --- a/tests/script/unique/dnode/offline2.sim +++ b/tests/script/unique/dnode/offline2.sim @@ -90,7 +90,7 @@ sql show dnodes if $data4_1 != ready then goto show4 endi -if $data4_2 != null then +if $data4_2 != NULL then goto show4 endi if $data4_3 != ready then diff --git a/tests/script/unique/dnode/remove1.sim b/tests/script/unique/dnode/remove1.sim index c69c51fa96ba1c18f93bd1d0ec6f1043e4d412cb..d6837d7dfef9bd9a497d21658f50150b4b823f6c 100644 --- a/tests/script/unique/dnode/remove1.sim +++ b/tests/script/unique/dnode/remove1.sim @@ -105,7 +105,7 @@ sql show dnodes print dnode1 openVnodes $data2_1 print dnode2 openVnodes $data2_2 print dnode3 openVnodes $data2_3 -if $data2_2 != null then +if $data2_2 != NULL then goto show4 endi @@ -130,7 +130,7 @@ print dnode4 openVnodes $data2_4 if $data2_1 != 4 then goto show5 endi -if $data2_2 != null then +if $data2_2 != NULL then goto show5 endi if $data2_3 != 2 then diff --git a/tests/script/unique/dnode/remove2.sim b/tests/script/unique/dnode/remove2.sim index c9e48d9283c929ef388fcf38f27342dd8c01dbd0..66ebd9772205e7dd1ad6f08e0432862570abd455 100644 --- a/tests/script/unique/dnode/remove2.sim +++ b/tests/script/unique/dnode/remove2.sim @@ -106,7 +106,7 @@ sql show dnodes print dnode1 openVnodes $data2_1 print dnode2 openVnodes $data2_2 print dnode3 openVnodes $data2_3 -if $data2_2 != null then +if $data2_2 != NULL then goto show4 endi if $data2_1 != 3 then diff --git a/tests/script/unique/dnode/vnode_clean.sim b/tests/script/unique/dnode/vnode_clean.sim index 6b3c8ebeb243b96cad8b4b33ede5ad92977a2f41..55abdab2b04af84a7333fcc59f1dc5a231833555 100644 --- a/tests/script/unique/dnode/vnode_clean.sim +++ b/tests/script/unique/dnode/vnode_clean.sim @@ -91,7 +91,7 @@ print dnode2 openVnodes $data2_2 if $data2_1 != 2 then goto show4 endi -if $data2_2 != null then +if $data2_2 != NULL then goto show4 endi if $rows != 1 then @@ -220,7 +220,7 @@ print dnode3 openVnodes $data2_3 if $data2_1 != 4 then goto show9 endi -if $data2_2 != null then +if $data2_2 != NULL then goto show9 endi if $data2_3 != 0 then diff --git a/tests/script/unique/http/opentsdb.sim b/tests/script/unique/http/opentsdb.sim index d1b193173e451f7c01829608c8a7845b1d58ba17..1c09dac5b681c1a4c2331db98db61394f9e4a49a 100644 --- a/tests/script/unique/http/opentsdb.sim +++ b/tests/script/unique/http/opentsdb.sim @@ -12,7 +12,7 @@ print ============================ dnode1 start print =============== step1 - parse system_content curl -u root:taosdata -d '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:6020/opentsdb/ print $system_content -if $system_content != @{"status":"error","code":1057,"desc":"database name can not be null"}@ then +if $system_content != @{"status":"error","code":1057,"desc":"database name can not be NULL"}@ then return -1 endi @@ -24,7 +24,7 @@ endi system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:6020/opentsdb/ print $system_content -if $system_content != @{"status":"error","code":1057,"desc":"database name can not be null"}@ then +if $system_content != @{"status":"error","code":1057,"desc":"database name can not be NULL"}@ then return -1 endi @@ -129,7 +129,7 @@ endi system_content curl -u root:taosdata -d '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"": "web01"}}]' 127.0.0.1:6020/opentsdb/db/put print $system_content -if $system_content != @{"status":"error","code":1073,"desc":"tag name is null"}@ then +if $system_content != @{"status":"error","code":1073,"desc":"tag name is NULL"}@ then return -1 endi @@ -147,7 +147,7 @@ endi system_content curl -u root:taosdata -d '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": ""}}]' 127.0.0.1:6020/opentsdb/db/put print $system_content -if $system_content != @{"status":"error","code":1076,"desc":"tag value is null"}@ then +if $system_content != @{"status":"error","code":1076,"desc":"tag value is NULL"}@ then return -1 endi diff --git a/tests/script/unique/metrics/balance_replica1.sim b/tests/script/unique/metrics/balance_replica1.sim index eb502762608cc911517505fed6c1455d4d3c7645..3c4e8b06642a686c82cc712e9b1da41d73e42ae0 100644 --- a/tests/script/unique/metrics/balance_replica1.sim +++ b/tests/script/unique/metrics/balance_replica1.sim @@ -76,7 +76,7 @@ print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show1 endi -if $dnode2Vnodes != null then +if $dnode2Vnodes != NULL then goto show1 endi print =============== step3 start dnode2 diff --git a/tests/script/unique/mnode/mgmt22.sim b/tests/script/unique/mnode/mgmt22.sim index 3275a233ad091742cd26af356fd1905d5b77c6d5..ae3c386122102fa13ccc75de90ee90709ccbadc7 100644 --- a/tests/script/unique/mnode/mgmt22.sim +++ b/tests/script/unique/mnode/mgmt22.sim @@ -100,7 +100,7 @@ endi if $data2_2 != slave then goto show7 endi -if $data3_3 != null then +if $data3_3 != NULL then goto show7 endi diff --git a/tests/script/unique/mnode/mgmt23.sim b/tests/script/unique/mnode/mgmt23.sim index 8c144dd0c44e23dc381ead7aa3ff32815965b6e1..99d91595735e5b71d480b9bb0514808e3c8d7c86 100644 --- a/tests/script/unique/mnode/mgmt23.sim +++ b/tests/script/unique/mnode/mgmt23.sim @@ -59,7 +59,7 @@ endi if $dnode2Role != slave then return -1 endi -if $dnode3Role != null then +if $dnode3Role != NULL then return -1 endi @@ -78,7 +78,7 @@ print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 endi -if $dnode2Role != null then +if $dnode2Role != NULL then return -1 endi if $dnode3Role != slave then @@ -106,7 +106,7 @@ print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 endi -if $dnode2Role != null then +if $dnode2Role != NULL then return -1 endi if $dnode3Role != slave then diff --git a/tests/script/unique/mnode/mgmt25.sim b/tests/script/unique/mnode/mgmt25.sim index 8c8eeba466c31ab6efabd00e129a78d13c13ecd3..ba545f94797261c8f394128027cba86718e0b1cc 100644 --- a/tests/script/unique/mnode/mgmt25.sim +++ b/tests/script/unique/mnode/mgmt25.sim @@ -59,7 +59,7 @@ endi if $dnode2Role != slave then return -1 endi -if $dnode3Role != null then +if $dnode3Role != NULL then return -1 endi @@ -78,7 +78,7 @@ print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 endi -if $dnode2Role != null then +if $dnode2Role != NULL then return -1 endi if $dnode3Role != slave then diff --git a/tests/script/unique/mnode/mgmt26.sim b/tests/script/unique/mnode/mgmt26.sim index 373a0abaed191075666085574dc013c3f1cb0721..e5ead5bb3915d950ce5cd9999867647f671a85a2 100644 --- a/tests/script/unique/mnode/mgmt26.sim +++ b/tests/script/unique/mnode/mgmt26.sim @@ -59,7 +59,7 @@ endi if $dnode2Role != slave then return -1 endi -if $dnode3Role != null then +if $dnode3Role != NULL then return -1 endi @@ -79,7 +79,7 @@ print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 endi -if $dnode2Role != null then +if $dnode2Role != NULL then return -1 endi if $dnode3Role != slave then @@ -106,7 +106,7 @@ print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 endi -if $dnode2Role != null then +if $dnode2Role != NULL then return -1 endi if $dnode3Role != slave then diff --git a/tests/script/unique/mnode/mgmt33.sim b/tests/script/unique/mnode/mgmt33.sim index e3a62a2d22cae72ef7a12d9f85dc5da1046a88a3..36b7ba81394d6055305f7b7dabf6b504e140720c 100644 --- a/tests/script/unique/mnode/mgmt33.sim +++ b/tests/script/unique/mnode/mgmt33.sim @@ -18,10 +18,10 @@ print dnode3 ==> $data3_3 if $data2_1 != master then return -1 endi -if $data3_2 != null then +if $data3_2 != NULL then return -1 endi -if $data3_3 != null then +if $data3_3 != NULL then return -1 endi @@ -44,7 +44,7 @@ endi if $dnode2Role != slave then return -1 endi -if $dnode3Role != null then +if $dnode3Role != NULL then return -1 endi @@ -86,7 +86,7 @@ print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 endi -if $dnode2Role != null then +if $dnode2Role != NULL then return -1 endi if $dnode3Role != slave then @@ -156,7 +156,7 @@ print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role -if $dnode1Role != null then +if $dnode1Role != NULL then return -1 endi #if $dnode2Role != master then diff --git a/tests/script/unique/mnode/mgmt34.sim b/tests/script/unique/mnode/mgmt34.sim index 4409c825c8138420ab853a787b8d8041bf544584..1139daea1cccfb87962aebc3a9fec1c63f2cd53b 100644 --- a/tests/script/unique/mnode/mgmt34.sim +++ b/tests/script/unique/mnode/mgmt34.sim @@ -22,10 +22,10 @@ print dnode3 ==> $data3_3 if $data2_1 != master then return -1 endi -if $data3_2 != null then +if $data3_2 != NULL then return -1 endi -if $data3_3 != null then +if $data3_3 != NULL then return -1 endi @@ -50,10 +50,10 @@ endi if $dnode2Role != slave then return -1 endi -if $dnode3Role != null then +if $dnode3Role != NULL then return -1 endi -if $dnode4Role != null then +if $dnode4Role != NULL then return -1 endi @@ -81,7 +81,7 @@ endi if $dnode3Role != slave then return -1 endi -if $dnode4Role != null then +if $dnode4Role != NULL then return -1 endi @@ -110,7 +110,7 @@ endi if $dnode3Role != slave then return -1 endi -if $dnode4Role != null then +if $dnode4Role != NULL then return -1 endi @@ -131,7 +131,7 @@ print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 endi -if $dnode2Role != null then +if $dnode2Role != NULL then return -1 endi if $dnode3Role != slave then @@ -165,7 +165,7 @@ print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 endi -if $dnode2Role != null then +if $dnode2Role != NULL then return -1 endi if $dnode3Role != slave then @@ -207,7 +207,7 @@ print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role print dnode4 ==> $dnode4Role -if $dnode1Role != null then +if $dnode1Role != NULL then return -1 endi if $dnode2Role != slave then diff --git a/tests/script/unique/mnode/mgmtr2.sim b/tests/script/unique/mnode/mgmtr2.sim index 097d5109296eb1447b5d3b8d5960b27cb0437518..aa0f4877fbcb7844050bd606e829b80bd990285d 100644 --- a/tests/script/unique/mnode/mgmtr2.sim +++ b/tests/script/unique/mnode/mgmtr2.sim @@ -23,10 +23,10 @@ print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 endi -if $dnode2Role != null then +if $dnode2Role != NULL then return -1 endi -if $dnode3Role != null then +if $dnode3Role != NULL then return -1 endi @@ -71,7 +71,7 @@ endi if $rows != 2 then return -1 endi -if $dnode3Role != null then +if $dnode3Role != NULL then return -1 endi diff --git a/tests/script/unique/stream/metrics_balance.sim b/tests/script/unique/stream/metrics_balance.sim index ff6ca9d1f0b64cac4ed17e1ecc5f1ac8ddd5859d..e711baf2066f39a9a6614da36058e0d2fbfbb87b 100644 --- a/tests/script/unique/stream/metrics_balance.sim +++ b/tests/script/unique/stream/metrics_balance.sim @@ -192,7 +192,7 @@ print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show1 endi -if $dnode2Vnodes != null then +if $dnode2Vnodes != NULL then goto show1 endi diff --git a/tests/script/unique/stream/table_balance.sim b/tests/script/unique/stream/table_balance.sim index 015f9f1f17485724618dd72cd0b304774e0809f6..7e33005b9b963b26f428ac6ee52a0fa83f243e5b 100644 --- a/tests/script/unique/stream/table_balance.sim +++ b/tests/script/unique/stream/table_balance.sim @@ -129,7 +129,7 @@ print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show1 endi -if $dnode2Vnodes != null then +if $dnode2Vnodes != NULL then goto show1 endi diff --git a/tests/script/unique/stream/table_move.sim b/tests/script/unique/stream/table_move.sim index 6589ed941e74c17a0d39b03a058b198fb969e356..54cd3195dbba171c62aadad2beb9b66d1d75e2e8 100644 --- a/tests/script/unique/stream/table_move.sim +++ b/tests/script/unique/stream/table_move.sim @@ -163,7 +163,7 @@ print dnode2 $dnode2Vnodes if $dnode1Vnodes != 6 then goto show1 endi -if $dnode2Vnodes != null then +if $dnode2Vnodes != NULL then goto show1 endi @@ -214,7 +214,7 @@ print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 print dnode2 $dnode2Vnodes -if $dnode1Vnodes != null then +if $dnode1Vnodes != NULL then goto show6 endi if $dnode2Vnodes != 6 then diff --git a/tests/script/windows/alter/metrics.sim b/tests/script/windows/alter/metrics.sim index 7cfee695d0022a1871efbf5fa9cfeb6882f46036..ce003a98363488f1be2969104420c59a10628a1f 100644 --- a/tests/script/windows/alter/metrics.sim +++ b/tests/script/windows/alter/metrics.sim @@ -763,7 +763,7 @@ endi if $data21 != INT then return -1 endi -if $data30 != null then +if $data30 != NULL then return -1 endi diff --git a/tests/script/windows/alter/table.sim b/tests/script/windows/alter/table.sim index a05b6559dd14a5e107ca07c7c663db950510dd90..155debda0de7f5617d33fc20146c578dae344ebb 100644 --- a/tests/script/windows/alter/table.sim +++ b/tests/script/windows/alter/table.sim @@ -666,7 +666,7 @@ endi if $data11 != INT then return -1 endi -if $data20 != null then +if $data20 != NULL then return -1 endi diff --git a/tests/script/windows/tag/add.sim b/tests/script/windows/tag/add.sim index b7348466866e7739f2ad31f305a3a1b3baf2259c..adcff4f62d8551f287d34e626396a7173f112665 100644 --- a/tests/script/windows/tag/add.sim +++ b/tests/script/windows/tag/add.sim @@ -537,7 +537,7 @@ endi if $data04 != false then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi diff --git a/tests/script/windows/tag/change.sim b/tests/script/windows/tag/change.sim index 201c74c0bf36664c7354e4b98dabac0eb8ac1d38..95a767da496b336d65e140203b51850235ec8433 100644 --- a/tests/script/windows/tag/change.sim +++ b/tests/script/windows/tag/change.sim @@ -386,7 +386,7 @@ endi if $data06 != 6 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -413,7 +413,7 @@ endi if $data06 != 6 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -440,7 +440,7 @@ endi if $data06 != 6 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -467,7 +467,7 @@ endi if $data06 != 6 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -494,7 +494,7 @@ endi if $data06 != 6 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi diff --git a/tests/script/windows/tag/delete.sim b/tests/script/windows/tag/delete.sim index d671b61abe604636d25bbe3baa390ab06b2c179c..75702fe9eee4eb22a0dc90b17805f01ae182fd8e 100644 --- a/tests/script/windows/tag/delete.sim +++ b/tests/script/windows/tag/delete.sim @@ -420,7 +420,7 @@ endi if $data02 != true then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi @@ -444,7 +444,7 @@ endi if $data02 != 1 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi @@ -468,7 +468,7 @@ endi if $data02 != 1 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi @@ -492,7 +492,7 @@ endi if $data02 != 1.000000000 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi @@ -516,10 +516,10 @@ endi if $data02 != true then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi @@ -546,10 +546,10 @@ endi if $data02 != 1 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi @@ -576,10 +576,10 @@ endi if $data02 != 1 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi @@ -606,10 +606,10 @@ endi if $data02 != 1.000000000 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi @@ -636,13 +636,13 @@ endi if $data02 != 1 then return -1 endi -if $data03 != null then +if $data03 != NULL then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi @@ -675,13 +675,13 @@ endi if $data03 != 4.0000 then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi @@ -714,16 +714,16 @@ endi if $data03 != 4.000000000 then return -1 endi -if $data04 != null then +if $data04 != NULL then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -763,13 +763,13 @@ endi if $data04 != 5.000000000 then return -1 endi -if $data05 != null then +if $data05 != NULL then return -1 endi -if $data06 != null then +if $data06 != NULL then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi diff --git a/tests/script/windows/tag/set.sim b/tests/script/windows/tag/set.sim index 7f8cf3b0a7236e7c60ed3edf279584300d40b8d9..b264164604cf09f37938c51d3186b5f79e9a49f4 100644 --- a/tests/script/windows/tag/set.sim +++ b/tests/script/windows/tag/set.sim @@ -330,7 +330,7 @@ endi if $data06 != 11 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -357,7 +357,7 @@ endi if $data06 != 11 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -384,7 +384,7 @@ endi if $data06 != 11 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -411,7 +411,7 @@ endi if $data06 != 11 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi @@ -438,7 +438,7 @@ endi if $data06 != 11 then return -1 endi -if $data07 != null then +if $data07 != NULL then return -1 endi