fixes #39

WolfgangFahl · Jul 30, 2021 · 3588d3f · 3588d3f
1 parent 5bd46b2
commit 3588d3f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/lodstorage/entity.py b/lodstorage/entity.py
@@ -161,7 +161,7 @@ def isCached(self):
             raise Exception("unsupported mode %s" % self.mode)            
         return result     
 
-    def fromCache(self,force:bool=False,getListOfDicts=None):
+    def fromCache(self,force:bool=False,getListOfDicts=None,sampleRecordCount=-1):
         '''
         get my entries from the cache or from the callback provide
         
@@ -180,7 +180,7 @@ def fromCache(self,force:bool=False,getListOfDicts=None):
             listOfDicts=getListOfDicts()
             duration=time.time()-startTime
             self.showProgress(f"got {len(listOfDicts)} {self.entityPluralName} in {duration:5.1f} s")   
-            self.cacheFile=self.storeLoD(listOfDicts)
+            self.cacheFile=self.storeLoD(listOfDicts,sampleRecordCount=sampleRecordCount)
             self.setListFromLoD(listOfDicts)
         else:
             # fromStore also sets self.cacheFile
@@ -275,7 +275,7 @@ def storeLoD(self,listOfDicts,limit=10000000,batchSize=250,cacheFile=None,fixNon
         
         Args:
             listOfDicts(list): the list of dicts to store
-            limit(int): maximumn number of records to store
+            limit(int): maximum number of records to store
             batchSize(int): size of batch for storing
             cacheFile(string): the name of the storage e.g path to JSON or sqlite3 file
             sampleRecordCount(int): the number of records to analyze for type information

diff --git a/lodstorage/sql.py b/lodstorage/sql.py
@@ -73,6 +73,8 @@ def createTable(self,listOfRecords,entityName,primaryKey=None,withDrop=False,sam
            EntityInfo: meta data information for the created table
         '''
         l= len(listOfRecords)
+        if sampleRecordCount<0:
+            sampleRecordCount=l
         if l<sampleRecordCount:
             msg="only %d/%d of needed sample records to createTable available" % (l,sampleRecordCount)
             if failIfTooFew:

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setup(
     name='pylodstorage',
-    version='0.0.59',
+    version='0.0.60',
 
     packages=['lodstorage',],
     author='Wolfgang Fahl',