Merge pull request #2078 from szeck87/sql-tests

Enable SQL for CI tests

.travis.yml

@@ -60,6 +60,9 @@ before_install:
   # linux: Install Nix, Nix packages, upgrade pip, and install python packages
   # osx: Update Homebrew, remove conflicting cask, brew bundle, symlink elm-format,
   #      upgrade pip, and install python packages
+  - echo $TRAVIS_COMMIT_MESSAGE
+  - export TRAVIS_COMMIT_MESSAGE=""
+  - echo $TRAVIS_COMMIT_MESSAGE
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       curl https://nixos.org/nix/install | sh &&
       . ~/.nix-profile/etc/profile.d/nix.sh &&

examples/simple-jsbeautifyrc/sql/expected/test.sql

@@ -3,7 +3,7 @@ SELECT ca.proj_id AS proj_id,
        ca.ca_date_start AS proj_start,
        ca.ca_date_end AS proj_end,
 
-  (SELECT count(*)
+  (SELECT COUNT(*)
    FROM rotations r
    WHERE r.proj_id = proj_id
      AND r.r_status = 'R'
@@ -12,7 +12,7 @@ SELECT ca.proj_id AS proj_id,
   (SELECT count(*)
    FROM rotations r
    WHERE r.proj_id = proj_id
-     AND r.channel_id = 24) r_rtb_count
+     AND r.channel_id = 24 ) r_rtb_count
 FROM projs ca,
      clients c,
      proj_auth caa
@@ -20,6 +20,6 @@ WHERE ca.client_id = 12345
   AND ca.client_id = c.client_id
   AND ca_type = 'zzz'
   AND c.agency_id = 0
-  AND ca.client_id = nvl(caa.client_id, ca.client_id)
-  AND proj_id = nvl(caa.proj_id, proj_id)
+  AND ca.client_id = NVL(caa.client_id, ca.client_id)
+  AND proj_id = NVL(caa.proj_id, proj_id)
   AND caa.contact_id = 7890

examples/simple-jsbeautifyrc/sql/expected/test2.sql

@@ -4,21 +4,30 @@ VALUES('hallpclnx',
        CURRENT_TIMESTAMP);
 
 
-INSERT INTO thread (thread, description, created_at, client_id)
+INSERT INTO THREAD (THREAD,
+                    description,
+                    created_at,
+                    client_id)
 VALUES(1,
        'Living room camera',
        CURRENT_TIMESTAMP,
        1);
 
 
-INSERT INTO thread (thread, description, created_at, client_id)
+INSERT INTO THREAD (THREAD,
+                    description,
+                    created_at,
+                    client_id)
 VALUES(2,
        'Porch camera',
        CURRENT_TIMESTAMP,
        1);
 
 
-INSERT INTO thread (thread, description, created_at, client_id)
+INSERT INTO THREAD (THREAD,
+                    description,
+                    created_at,
+                    client_id)
 VALUES(2,
        'Garden camera',
        CURRENT_TIMESTAMP,
@@ -28,5 +37,4 @@ VALUES(2,
 INSERT INTO client (HOST, description, created_at)
 VALUES('shedpclnx',
        'My shed linux machine',
-       CURRENT_TIMESTAMP);
-
+       CURRENT_TIMESTAMP);

examples/simple-jsbeautifyrc/sql/original/test.sql

@@ -1 +1 @@
-SELECT ca.proj_id AS proj_id, ca.ca_name AS proj_name, ca.ca_date_start AS proj_start, ca.ca_date_end AS proj_end,(SELECT COUNT(*) FROM rotations r WHERE r.proj_id = proj_id AND r.r_status = 'R' GROUP BY r.proj_id) r_count, (SELECT count(*) FROM rotations r WHERE r.proj_id = proj_id AND r.channel_id = 24 ) r_rtb_count FROM projs ca, clients c, proj_auth caa WHERE ca.client_id = 12345 AND ca.client_id = c.client_id AND ca_type = 'zzz' AND c.agency_id = 0 AND ca.client_id = NVL( caa.client_id, ca.client_id ) AND proj_id = NVL( caa.proj_id, proj_id ) AND caa.contact_id = 7890
+SELECT ca.proj_id AS proj_id, ca.ca_name AS proj_name, ca.ca_date_start AS proj_start, ca.ca_date_end AS proj_end,(SELECT COUNT(*) FROM rotations r WHERE r.proj_id = proj_id AND r.r_status = 'R' GROUP BY r.proj_id) r_count, (SELECT count(*) FROM rotations r WHERE r.proj_id = proj_id AND r.channel_id = 24 ) r_rtb_count FROM projs ca, clients c, proj_auth caa WHERE ca.client_id = 12345 AND ca.client_id = c.client_id AND ca_type = 'zzz' AND c.agency_id = 0 AND ca.client_id = NVL( caa.client_id, ca.client_id ) AND proj_id = NVL( caa.proj_id, proj_id ) AND caa.contact_id = 7890

examples/simple-jsbeautifyrc/sql/original/test2.sql

@@ -2,4 +2,4 @@ INSERT INTO client (host, description, created_at) VALUES('hallpclnx', 'My linux
 INSERT INTO thread (thread, description, created_at, client_id) VALUES(1, 'Living room camera', CURRENT_TIMESTAMP, 1);
 INSERT INTO thread (thread, description, created_at, client_id) VALUES(2, 'Porch camera', CURRENT_TIMESTAMP, 1);
 INSERT INTO thread (thread, description, created_at, client_id) VALUES(2, 'Garden camera', CURRENT_TIMESTAMP, 1);
-INSERT INTO client (host, description, created_at) VALUES('shedpclnx', 'My shed linux machine', CURRENT_TIMESTAMP);
+INSERT INTO client (host, description, created_at) VALUES('shedpclnx', 'My shed linux machine', CURRENT_TIMESTAMP);