BezdarSQL 1.0__tar.gz → 1.1.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BezdarSQL
-Version: 1.0
+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.0 → bezdarsql-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BezdarSQL
-Version: 1.0
+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.0 → bezdarsql-1.1.1}/bezdarsql/__init__.py

@@ -9,9 +9,9 @@ def select(table, value='*', filter_by=None, count=1):
         request += ' where '
         for index, fil in enumerate(filters):
             if index > 1:
-                request += f'and {fil}={filters[fil]} '
+                request += f'and {fil.owner.__tablename__}.{fil.name}={repr(filters[fil])} '
             else:
-                request += f'{fil}={filters[fil]} '
+                request += f'{fil.owner.__tablename__}.{fil.name}={repr(filters[fil])} '
     else:
         request += ';'
 
@@ -33,13 +33,11 @@ def select(table, value='*', filter_by=None, count=1):
                     results = cursor.fetchall()
 
                 attrsintable = [i for i in table.__dict__ if not '__' in i]
-                attrs = {}
                 objects = []
                 for result in results:
-                    for index, attr in enumerate(attrsintable):
-                        attrs[attr] = result[index]
                     obj = table()
-                    obj.__dict__.update(attrs)
+                    for index, attr in enumerate(attrsintable):
+                        obj.__dict__[attr] = result[index]
                     objects.append(obj)
 
                 return objects
@@ -48,6 +46,59 @@ def select(table, value='*', filter_by=None, count=1):
         raise _e
 
 
+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 '
+            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(
+                host=host,
+                port=port,
+                user=user,
+                database=db_name,
+                password=password,
+        ) as connection:
+            connection.autocommit = True
+            with connection.cursor() as cursor:
+                cursor.execute(request + ';')
+
+                if count >= 0:
+                    results = cursor.fetchmany(count)
+                elif count == -1:
+                    results = cursor.fetchall()
+
+                objects = []
+                for result in results:
+                    for index, table in enumerate(tables):
+                        attrsintable = [i for i in table.__dict__ if not '__' in i]
+                        obj = table()
+                        for index, attr in enumerate(attrsintable):
+                            obj.__dict__[attr] = result[index]
+                        objects.append(obj)
+                        result = result[len(attrsintable):]
+
+                return objects
+
+    except Exception as _e:
+        raise _e
+
+
 def insert(table_obj):
     request = f'insert into {table_obj.__tablename__} ('
     attrs = [i for i in table_obj.__dict__ if '__' not in i]

{bezdarsql-1.0 → bezdarsql-1.1.1}/bezdarsql/base.py

@@ -5,6 +5,12 @@ class Column:
     def __init__(self, **kwargs):
         self.autoincrement = kwargs.get('autoincrement')
 
+
+    def __set_name__(self, owner, name):
+        self.owner = owner
+        self.name = name
+
+
 @dataclasses.dataclass
 class Base:
-    __tablename__ = None
+    __tablename__ = None

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

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