pyLodStorage 0.2.1__tar.gz → 0.2.2__tar.gz

{pylodstorage-0.2.1 → pylodstorage-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pylodstorage
-Version: 0.2.1
+Version: 0.2.2
 Summary: python List of Dict (Table) Storage library
 Home-page: https://github.com/WolfgangFahl/pyLodStorage
 Author: Wolfgang Fahl

{pylodstorage-0.2.1 → pylodstorage-0.2.2}/lodstorage/sql.py

@@ -173,9 +173,9 @@ class SQLDB(object):
             msg="%s\nfailed:%s%s" % (insertCmd,str(ex),debugInfo)
             raise Exception(msg)
         
-    def query(self,sqlQuery,params=None):
+    def queryGen(self,sqlQuery,params=None):
         '''
-        run the given sqlQuery and return a list of Dicts
+        run the given sqlQuery a a generator for dicts
         
         Args:
             
@@ -183,7 +183,7 @@ class SQLDB(object):
             params(tuple): the query params, if any
                 
         Returns:
-            list: a list of Dicts
+            a generator of dicts
         '''
         if self.debug:
             print(sqlQuery)
@@ -196,17 +196,32 @@ class SQLDB(object):
         else:
             query = cur.execute(sqlQuery)
         colname = [ d[0] for d in query.description ]
-        resultList=[]
         try:
             # loop over all rows
             for row in query:
                 record=dict(zip(colname, row))
-                resultList.append(record)
+                yield record
         except Exception as ex:
             msg=str(ex)
             self.logError(msg)
             pass
         cur.close()
+        
+    def query(self,sqlQuery,params=None):
+        '''
+        run the given sqlQuery and return a list of Dicts
+        
+        Args:
+            
+            sqlQuery(string): the SQL query to be executed
+            params(tuple): the query params, if any
+                
+        Returns:
+            list: a list of Dicts
+        '''
+        resultList=[]
+        for record in self.queryGen(sqlQuery, params):
+            resultList.append(record)
         return resultList
         
     def queryAll(self,entityInfo,fixDates=True):

{pylodstorage-0.2.1 → pylodstorage-0.2.2}/lodstorage/trulytabular.py

@@ -323,13 +323,20 @@ WHERE
                 return qm
         return None
     
-    def mostFrequentPropertiesQuery(self):
+    def mostFrequentPropertiesQuery(self,whereClause:str=None):
         '''
         get the most frequently used properties
+        
+        Args:
+            whereClause(str): an extra WhereClause to use
         '''
         query=self.queryManager.queriesByName["mostFrequentProperties"]
+        if whereClause is None:
+            whereClause=f"?item wdt:P31 wd:{self.itemQid};";
+        else:
+            whereClause+=";"
         query.title=f"most frequently used properties for {self.asText(long=True)}"
-        query.query=query.query % (self.item.asText(long=True),self.itemQid,self.lang)
+        query.query=query.query % (self.item.asText(long=True),whereClause,self.lang)
         return query
     
     def noneTabularQuery(self,wdProperty:WikidataProperty,asFrequency:bool=True):

{pylodstorage-0.2.1 → pylodstorage-0.2.2}/lodstorage/version.py

@@ -9,6 +9,6 @@ class Version(object):
     Version handling for pyLoDStorage
     '''
     name="pylodstorage"
-    version='0.2.1'
+    version='0.2.2'
     date = '2020-09-10'
-    updated = '2022-03-27'
+    updated = '2022-04-11'

{pylodstorage-0.2.1 → pylodstorage-0.2.2}/pylodstorage.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pylodstorage
-Version: 0.2.1
+Version: 0.2.2
 Summary: python List of Dict (Table) Storage library
 Home-page: https://github.com/WolfgangFahl/pyLodStorage
 Author: Wolfgang Fahl

{pylodstorage-0.2.1 → pylodstorage-0.2.2}/sampledata/trulytabular.yaml

@@ -10,7 +10,7 @@
           {
             SELECT ?prop (COUNT(DISTINCT ?item) AS ?count) WHERE {
               hint:Query hint:optimizer "None".
-              ?item wdt:P31 wd:%s;
+              %s
                 ?p ?id.
               ?prop wikibase:directClaim ?p.
             }