sql-testing-tools 0.2.4__tar.gz → 0.2.4a0__tar.gz

{sql_testing_tools-0.2.4 → sql_testing_tools-0.2.4a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sql_testing_tools
-Version: 0.2.4
+Version: 0.2.4a0
 Description-Content-Type: text/markdown
 Requires-Dist: sqlparse>=0.5.1
 Requires-Dist: requests>=2.32.3

sql_testing_tools-0.2.4a0/setup.py

@@ -0,0 +1,27 @@
+from setuptools import setup, find_packages
+
+with open("README.md", "r") as fh:
+    description = fh.read()
+
+
+setup(
+    name='sql_testing_tools',
+    version='0.2.4.a',
+    packages=find_packages(),
+    install_requires=[
+        'sqlparse>=0.5.1',
+        'requests>=2.32.3'
+    ],
+    long_description=description,
+    long_description_content_type="text/markdown",
+    package_data={
+        'sql_testing_tools.databases': [
+            'databases/*.db'#, 
+            #'./databases/bayern.db', 
+            #'./databases/film_fernsehen.db',
+            #'./databases/ladepunkte.db',
+            #'./databases/straftaten.db',
+            ]
+    },
+    include_package_data=True
+)

{sql_testing_tools-0.2.4 → sql_testing_tools-0.2.4a0}/sql_testing_tools/BaseAccess.py

@@ -1,6 +1,6 @@
 import sqlite3
 import os
-#from importlib import resources
+import importlib
 
 
 __db=""
@@ -9,19 +9,45 @@ def setDBName(path: str):
     global __db
     print("Setting DB to: " + path)
     __db = path
-    #with resources.path('sql_testing_tools', path) as db_path:
-    #    __db = str(db_path)
-    #    print(__db)
 
+def checkDbInResources():
+    global __db
+
+    resources = list(importlib.resources.contents('sql_testing_tools.databases'))
+    print("Available resources: " + str(resources))
+
+    newPath = __db.replace("databases/","") 
+
+    if(newPath not in resources):
+        print("Database not in resources. Trying to find '"+ __db +"' in the current directory.")
+        for root, dirs, files in os.walk('.'):
+            for file in files:
+                f = os.path.join(root, file)
+                print(f)
+                if f.endswith(newPath):
+                    print("Database found in current directory.")
+                    return False
+    else:
+        print("Database found in resources.")
+        __db = newPath
+        return True
 
-#setDBName("databases/bayern.db")
 
 def run(sql: str):
-    con = sqlite3.connect(__db)
-    cur = con.cursor()
-    cur.execute(sql)
-    con.commit()
-    return cur
+    global __db
+    if checkDbInResources():
+        with importlib.resources.path('sql_testing_tools.databases', __db) as db_path:
+            with sqlite3.connect(db_path) as con:
+                cur = con.cursor()
+                cur.execute(sql)
+                con.commit()
+                return cur
+    else:
+        with sqlite3.connect(__db) as con:
+            cur = con.cursor()
+            cur.execute(sql)
+            con.commit()
+            return cur
 
 def runFromFile(path: str):
     sql = getSQLFromFile(path)

{sql_testing_tools-0.2.4 → sql_testing_tools-0.2.4a0}/sql_testing_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sql_testing_tools
-Version: 0.2.4
+Version: 0.2.4a0
 Description-Content-Type: text/markdown
 Requires-Dist: sqlparse>=0.5.1
 Requires-Dist: requests>=2.32.3

sql_testing_tools-0.2.4/setup.py

@@ -1,17 +0,0 @@
-from setuptools import setup, find_packages
-
-with open("README.md", "r") as fh:
-    description = fh.read()
-
-
-setup(
-    name='sql_testing_tools',
-    version='0.2.4',
-    packages=find_packages(),
-    install_requires=[
-        'sqlparse>=0.5.1',
-        'requests>=2.32.3'
-    ],
-    long_description=description,
-    long_description_content_type="text/markdown"
-)