Merge in java updates for truncateTableCommand with UTs

SVN r64364 |2019-08-23 22:21:44 +0000

Author: i.hilerio

.gitattributes

@@ -80,6 +80,7 @@ java/src/org/labkey/remoteapi/query/SelectRowsCommand.java -text
 java/src/org/labkey/remoteapi/query/SelectRowsResponse.java -text
 java/src/org/labkey/remoteapi/query/Sort.java -text
 java/src/org/labkey/remoteapi/query/SqlExecuteCommand.java -text
+java/src/org/labkey/remoteapi/query/TruncateTableCommand.java -text
 java/src/org/labkey/remoteapi/query/UpdateRowsCommand.java -text
 java/src/org/labkey/remoteapi/sas/Main.java -text
 java/src/org/labkey/remoteapi/sas/SASBaseSelectCommand.java -text

java/src/org/labkey/remoteapi/query/RowsResponse.java

@@ -192,11 +192,14 @@ private void caseInsensitizeRowMaps()
     {
         //copy the row maps into case-insensitive hash maps
         List<Map<String,Object>> ciRows = new ArrayList<>();
-        
-        for(Map<String,Object> row : getRows())
+
+        if (getRows() != null)
         {
-            //copy the row map into a case-insensitive hash map
-            ciRows.add(new CaseInsensitiveHashMap<>(row));
+            for(Map<String,Object> row : getRows())
+            {
+                //copy the row map into a case-insensitive hash map
+                ciRows.add(new CaseInsensitiveHashMap<>(row));
+            }
         }
 
         //reset the rows array

java/src/org/labkey/remoteapi/query/TruncateTableCommand.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2008-2009 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.labkey.remoteapi.query;
+
+/**
+ * Command for deleting rows from a read-write schema. The user associated
+ * with the connection used when executing this command must have
+ * permission to delete the data.
+ * <p>
+ * For details on schemas and queries, and example code, see the {@link SaveRowsCommand}.
+ */
+public class TruncateTableCommand extends SaveRowsCommand
+{
+    /**
+     * Constructs a TruncateTableCommand for the given schemaName and queryName.
+     * See the {@link SaveRowsCommand} for more details.
+     * @param schemaName The schemaName
+     * @param queryName The queryName.
+     * @see SaveRowsCommand
+     */
+    public TruncateTableCommand(String schemaName, String queryName)
+    {
+        super(schemaName, queryName, "truncateTable");
+    }
+
+    public TruncateTableCommand(TruncateTableCommand source)
+    {
+        super(source);
+    }
+
+    @Override
+    public TruncateTableCommand copy()
+    {
+        return new TruncateTableCommand(this);
+    }
+}

java/src/org/labkey/remoteapi/test/Test.java

@@ -44,8 +44,8 @@ public static void main(String[] args) throws Exception
     {
         String baseUrl = "http://localhost:8080/labkey";
         Connection cn = args.length < 2 ? new Connection(baseUrl) : new Connection(baseUrl, args[0], args[1]);
-//        Connection cn = new Connection(baseUrl, new ApiKeyCredentialsProvider("session:d7c3a4aeb283e3e54c4126a707908420"));
-//        Connection cn = new Connection(baseUrl, new NetRcCredentialsProvider(baseUrl));
+        //Connection cn = new Connection(baseUrl, new ApiKeyCredentialsProvider("session:d7c3a4aeb283e3e54c4126a707908420"));
+        //Connection cn = new Connection(baseUrl, new NetRcCredentialsProvider(baseUrl));
 
         try
         {
@@ -62,7 +62,9 @@ public static void main(String[] args) throws Exception
             // Run NabAssayTest with -Dclean=false and rename subfolder "Rename############" to "nabassay"
             nabTest(cn, "/Nab Test Verify Project/nabassay");
             assayTest(cn, "/Nab Test Verify Project/nabassay");
+            truncateAssayFailsTest(cn, "/Nab Test Verify Project/nabassay");
 
+            truncateTableSuccessTest(cn, "Api Test");
             System.out.println("*** All tests completed successfully ***");
         }
         catch(CommandException e)
@@ -136,6 +138,16 @@ public static void crudTest(Connection cn, String folder) throws Exception
         assert srresp.getRowCount().intValue() == rowCount;
     }
 
+    // Assumes that /remoteapi/sas/People.xls has been imported as a list into folder
+    public static void truncateTableSuccessTest(Connection cn, String folder) throws Exception
+    {
+        TruncateTableCommand trunc = new TruncateTableCommand("lists", "People");
+        SaveRowsResponse resp = trunc.execute(cn, folder);
+
+        assert resp.getRowsAffected().intValue() == 9;
+        assert resp.getRows().size() == 0;
+    }
+
     // Assumes that /remoteapi/sas/People.xls has been imported as a list into folder
     public static void execSqlTest(Connection cn, String folder) throws Exception
     {
@@ -280,4 +292,18 @@ public static void assayTest(Connection cn, String folder) throws Exception
         AssayListResponse resp = cmd.execute(cn, folder);
         System.out.println(resp.getDefinitions());
     }
+
+    // Assumes that folder has been populated with assays
+    public static void truncateAssayFailsTest(Connection cn, String folder) throws Exception
+    {
+        TruncateTableCommand trunc = new TruncateTableCommand("assay.NAb.TestAssayNab", "WellData");
+        try{
+            SaveRowsResponse resp = trunc.execute(cn, folder);
+        }
+        catch (CommandException e)
+        {
+            assert e.getStatusCode() == 500;
+            assert e.getLocalizedMessage().equals("The query 'WellData' in the schema 'assay.NAb.TestAssayNab' is not truncatable.");
+        }
+    }
 }