Merge pull request #77 from fermitools/impl_76

convert 'ordered' to be order by created_timestamp,file_id...

Author: marcmengel

metacat/mql/sql_converter.py

@@ -81,7 +81,7 @@ def ordered(self, node, child):
                     select {t}.*
                     from (
                         $child_sql
-                    ) {t} order by {t}.id
+                    ) {t} order by {t}.created_timestamp,{t}.id
                 -- end of ordered {t}
             """, child_sql = child_sql)
             return Node("sql", sql=sql)
@@ -174,7 +174,7 @@ def parents_of(self, node, *args, with_meta=False, with_provenance=False, ordere
             c = alias("c")
             pc = alias("pc")
             columns = self.columns(p, with_meta, with_provenance)
-            order = f"order by {p}.id" if ordered else ""
+            order = f"order by {p}.created_timestamp,{p}.id" if ordered else ""
             table = "files_with_provenance" if with_provenance else "files"
             new_sql = insert_sql(f"""\
                 --  parents of {p}
@@ -204,7 +204,7 @@ def children_of(self, node, *args, with_meta=False, with_provenance=False, order
             c = alias("c")
             pc = alias("pc")
             columns = self.columns(c, with_meta, with_provenance)
-            order = f"order by {p}.id" if ordered else ""
+            order = f"order by {p}.created_timestamp,{p}.id" if ordered else ""
             table = "files_with_provenance" if with_provenance else "files"
             new_sql = insert_sql(f"""\
                 -- children of {c}

tests/test_commandline.py

@@ -164,6 +164,14 @@ def test_metacat_query_q_1(auth, tst_file_md_list, tst_ds):
     for md in tst_file_md_list[:-1]:
         assert data.find(md["name"]) >= 0
 
+def test_metacat_query_q_ordered_1(auth, tst_file_md_list, tst_ds):
+    with open("qfl1", "w") as qf:
+        qf.write(f"files from {tst_ds} ordered")
+    with os.popen("metacat query -q qfl1", "r") as fin:
+        data = fin.read()
+    os.unlink("qfl1")
+    for md in tst_file_md_list[:-1]:
+        assert data.find(md["name"]) >= 0
 
 def test_metacat_query_q_2(auth, tst_file_md_list, tst_ds):
     with open("qfl1", "w") as qf:
@@ -390,7 +398,7 @@ def test_metacat_file_show(auth, tst_file_md_list, tst_ds):
     assert md['name'] == fname
     assert md['namespace'] == ns
 
-    assert md['size'] in (38, 39) 
+    assert md['size'] in (37 ,38, 39) 
     assert md['created_timestamp'] > 0
     assert md['creator'] == os.environ["USER"]
     assert 'updated_timestamp' in md