Fixed issue with joining csvs and rdbs

SDM-TIB · Jul 19, 2024 · a832f39 · a832f39
1 parent f0eebbc
commit a832f39
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ You can easily customize your own configurations from the set of features that S
 
 ## Version 
 ```
-4.7.4.8
+4.7.4.9
 ```
 
 ## RML-Test Cases

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.7.4.8
+4.7.4.9
diff --git a/rdfizer/rdfizer/__init__.py b/rdfizer/rdfizer/__init__.py
@@ -5016,13 +5016,16 @@ def semantify_file(triples_map, triples_map_list, delimiter, output_file_descrip
                                                 hash_maker_xml(child_root, triples_map_element,
                                                                predicate_object_map.object_map, parent_map, namespace)
                                         else:
-                                            database, query_list = translate_sql(triples_map_element)
                                             db = connector.connect(host=host, port=int(port), user=user,
                                                                    password=password)
                                             cursor = db.cursor(buffered=True)
                                             cursor.execute("use " + datab)
-                                            for query in query_list:
-                                                cursor.execute(query)
+                                            if triples_map_element.query != "None":
+                                                cursor.execute(triples_map_element.query)
+                                            else:
+                                                database, query_list = translate_sql(triples_map_element)
+                                                for query in query_list:
+                                                    cursor.execute(query)
                                             hash_maker_array(cursor, triples_map_element,
                                                              predicate_object_map.object_map)
 
@@ -5156,13 +5159,16 @@ def semantify_file(triples_map, triples_map_list, delimiter, output_file_descrip
                                                 hash_maker_xml(child_root, triples_map_element,
                                                                predicate_object_map.object_map, parent_map, namespace)
                                         else:
-                                            database, query_list = translate_sql(triples_map_element)
                                             db = connector.connect(host=host, port=int(port), user=user,
                                                                    password=password)
                                             cursor = db.cursor(buffered=True)
                                             cursor.execute("use " + datab)
-                                            for query in query_list:
-                                                cursor.execute(query)
+                                            if triples_map_element.query != "None":
+                                                cursor.execute(triples_map_element.query)
+                                            else:
+                                                database, query_list = translate_sql(triples_map_element)
+                                                for query in query_list:
+                                                    cursor.execute(query)
                                             hash_maker_array(cursor, triples_map_element,
                                                              predicate_object_map.object_map)
                                     if sublist(predicate_object_map.object_map.child, row.keys()):

diff --git a/rdfizer/rdfizer/semantify.py b/rdfizer/rdfizer/semantify.py
@@ -5016,13 +5016,16 @@ def semantify_file(triples_map, triples_map_list, delimiter, output_file_descrip
                                                 hash_maker_xml(child_root, triples_map_element,
                                                                predicate_object_map.object_map, parent_map, namespace)
                                         else:
-                                            database, query_list = translate_sql(triples_map_element)
                                             db = connector.connect(host=host, port=int(port), user=user,
                                                                    password=password)
                                             cursor = db.cursor(buffered=True)
                                             cursor.execute("use " + datab)
-                                            for query in query_list:
-                                                cursor.execute(query)
+                                            if triples_map_element.query != "None":
+                                                cursor.execute(triples_map_element.query)
+                                            else:
+                                                database, query_list = translate_sql(triples_map_element)
+                                                for query in query_list:
+                                                    cursor.execute(query)
                                             hash_maker_array(cursor, triples_map_element,
                                                              predicate_object_map.object_map)
 
@@ -5156,13 +5159,16 @@ def semantify_file(triples_map, triples_map_list, delimiter, output_file_descrip
                                                 hash_maker_xml(child_root, triples_map_element,
                                                                predicate_object_map.object_map, parent_map, namespace)
                                         else:
-                                            database, query_list = translate_sql(triples_map_element)
                                             db = connector.connect(host=host, port=int(port), user=user,
                                                                    password=password)
                                             cursor = db.cursor(buffered=True)
                                             cursor.execute("use " + datab)
-                                            for query in query_list:
-                                                cursor.execute(query)
+                                            if triples_map_element.query != "None":
+                                                cursor.execute(triples_map_element.query)
+                                            else:
+                                                database, query_list = translate_sql(triples_map_element)
+                                                for query in query_list:
+                                                    cursor.execute(query)
                                             hash_maker_array(cursor, triples_map_element,
                                                              predicate_object_map.object_map)
                                     if sublist(predicate_object_map.object_map.child, row.keys()):
-Original file line number
+Diff line change
@@ Expand Up @@
     ## Version
     ```
-.7.4.8
+.7.4.9
     ```
     ## RML-Test Cases
@@ Expand Down @@