BezdarSQL 1.1__tar.gz → 1.1.1__tar.gz

{bezdarsql-1.1 → bezdarsql-1.1.1}/BezdarSQL.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BezdarSQL
-Version: 1.1
+Version: 1.1.1
 Summary: My little SQL ORM for the ones who called bezdars
 Author-email: boliklevik@gmail.com
 Dynamic: author-email

{bezdarsql-1.1 → bezdarsql-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BezdarSQL
-Version: 1.1
+Version: 1.1.1
 Summary: My little SQL ORM for the ones who called bezdars
 Author-email: boliklevik@gmail.com
 Dynamic: author-email

{bezdarsql-1.1 → bezdarsql-1.1.1}/bezdarsql/__init__.py

@@ -46,18 +46,25 @@ def select(table, value='*', filter_by=None, count=1):
         raise _e
 
 
-def select_join(tables, value='*', filter_on=(), count=1):
+def select_join(tables, value='*', filter_on=None, filter_by=None, count=1):
     request = f'select {value} from '
     for index, table in enumerate(tables):
         if index == 0:
             request += f'{table.__tablename__} '
         else:
             request += f'join {table.__tablename__} on '
-            for indexx, fil in enumerate(filter_on):
-                if indexx > 1:
-                    request += f'and {fil.owner.__tablename__}.{fil.name}={filter_on[fil].owner.__tablename__}.{filter_on[fil].name} '
-                else:
-                    request += f'{fil.owner.__tablename__}.{fil.name}={filter_on[fil].owner.__tablename__}.{filter_on[fil].name} '
+            if filter_on:
+                for indexx, fil in enumerate(filter_on):
+                    if indexx > 1:
+                        request += f'and {fil.owner.__tablename__}.{fil.name}={filter_on[fil].owner.__tablename__}.{filter_on[fil].name} '
+                    else:
+                        request += f'{fil.owner.__tablename__}.{fil.name}={filter_on[fil].owner.__tablename__}.{filter_on[fil].name} '
+            elif filter_by:
+                for index, fil in enumerate(filter_by):
+                    if index > 1:
+                        request += f'and {fil.owner.__tablename__}.{fil.name}={repr(filter_by[fil])} '
+                    else:
+                        request += f'{fil.owner.__tablename__}.{fil.name}={repr(filter_by[fil])} '
 
     try:
         with psycopg2.connect(

{bezdarsql-1.1 → bezdarsql-1.1.1}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='BezdarSQL',
-      version='1.1',
+      version='1.1.1',
       description='My little SQL ORM for the ones who called bezdars',
       packages=['bezdarsql'],
       author_email='boliklevik@gmail.com',