querylet-rails 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b538b6b0c79fc05704c812ae0efadc9abba452fbe9a4a528918367149ff7ce0
-  data.tar.gz: 911f27123fc5ed36dc960c16c50241cc4b66419d5e2f344586cf95bdb70edd43
+  metadata.gz: 302e8d10adf702f7225a143ff065b6db8bc67a126371f3f84e3113cf781a356d
+  data.tar.gz: 2e9b82dbbf9cc7d016a94392c8e75c5e22060fa6f362b80f1c65cad86f15962f
 SHA512:
-  metadata.gz: 491d161d381af74c0ffbfcb9be6409ee83653a5897cba99378902f12a4ebec9a2d8bedfdec7157cb59726de265be07369e05d5f38befd84fece409513c160dbd
-  data.tar.gz: 8df9b821f1eeecf603c072a6a2104054340617c36a313628b1acdf541f2e9c02f391e70ca1e4653c22d5f4dbee24fcf88e22f7297b6b3b5ebfe0fe4413f8e137
+  metadata.gz: f4c915bf73424ae790eddada5e967e2bb02037071ab00b76f40c4e30a444740374d7b3f830ea03994bee5f8a8ec9fdf4b32faa1804a379022f90e106d379b914
+  data.tar.gz: 35490fe8cde047492b1ff02d09bb8d15ef29e00575fe03138cf7a63c92b5c185b90d7eb1e90a5ad3743d796139578207440ee04e54ec7be8132fae531740a45c

data/lib/querylet_rails/model/queryable.rb

@@ -4,7 +4,6 @@ module QueryletRails
   module Model
     module Queryable
       extend ActiveSupport::Concern
-      # override this function
 
       def query relative_path, data={}
         self.class.query relative_path, data
@@ -34,18 +33,74 @@ module QueryletRails
         self.class.select_paginate query, attrs, count
       end
 
-      module ClassMethods
+      # This will fetch the current tenant id
+      def current_tenant_id
+        self.class.current_tenant_id
+      end
+
+      def set_tenant_id
+        self.class.set_tenant_id
+      end
+
+      def reset_tenant_id
+        self.class.reset_tenant_id
+      end
+
+      # This will apply the current tenant_id on the creation of a new model
+      def initialize_tenant_id
+        if new_record?
+          if has_attribute?(:tenant_id) && self.tenant_id.nil?
+            self.tenant_id = current_tenant_id
+          end
+        end
+      end
+
+      included do
+        after_initialize :initialize_tenant_id
+      end
+
+      class_methods do
+        # override this function
         def query_root
           Rails.root
         end
 
-        def query relative_path, data={}
+        def _query_wrap_object template
+          <<-HEREDOC.chomp
+(SELECT COALESCE(row_to_json(object_row),'{}'::json) FROM (
+#{template.to_s.chomp}
+) object_row);
+          HEREDOC
+        end
+
+        def _query_wrap_array template
+          <<-HEREDOC.chomp
+(SELECT COALESCE(array_to_json(array_agg(row_to_json(array_row))),'[]'::json) FROM (
+#{template.to_s.chomp}
+) array_row);
+          HEREDOC
+        end
+
+        def current_tenant_id
+          self.connection.execute('SHOW my.tenant_id').getvalue(0, 0).to_i
+        end
+
+        def set_tenant_id new_tenant_id
+          raise "tenant_id not an valid value" unless new_tenant_id.is_a?(Integer)
+          self.connection.execute "SET SESSION my.tenant_id = #{new_tenant_id}"
+        end
+
+        def reset_tenant_id
+          self.connection.execute "RESET my.tenant_id"
+        end
+
+        def _query relative_path, data={}
           file_path = self.query_root.join('app','queries',relative_path + '.sql')
           template  = File.read file_path
-          query_compile_template template, data
+          _query_compile_template template, data
         end
 
-        def query_compile_template template, data={}
+        def _query_compile_template template, data={}
           querylet = Querylet::Querylet.new path: self.query_root.join('app','queries').to_s
           begin
           querylet.compile(template).call(data)
@@ -61,59 +116,47 @@ module QueryletRails
           end
         end
 
+        def query relative_path, data={}
+          _query relative_path, data
+        end
+
         def select_value relative_path, data={}
-          sql = self.query relative_path, data
+          sql = _query relative_path, data
           self.connection.select_value sql
         end
 
         def select_values relative_path, data={}
-          sql = self.query relative_path, data
+          sql = _query relative_path, data
           self.connection.select_values sql
         end
 
         def select_array relative_path, data={}
-          template = self.query relative_path, data
-          sql = query_wrap_array template
+          sql = _query relative_path, data
+          sql = self._query_wrap_array sql
           self.connection.select_value sql
         end
 
         def select_object relative_path, data={}
-          template = self.query relative_path, data
-          sql = query_wrap_object template
+          sql = _query relative_path, data
+          sql = self._query_wrap_object sql
           self.connection.select_value sql
         end
 
         def select_all relative_path, data={}
-          sql = self.query relative_path, data
+          sql = _query relative_path, data
           self.connection.select_all sql
         end
 
-        def query_wrap_object template
-          <<-HEREDOC.chomp
-    (SELECT COALESCE(row_to_json(object_row),'{}'::json) FROM (
-    #{template.to_s.chomp}
-    ) object_row)
-          HEREDOC
-        end
-
-        def query_wrap_array template
-          <<-HEREDOC.chomp
-    (SELECT COALESCE(array_to_json(array_agg(row_to_json(array_row))),'[]'::json) FROM (
-    #{template.to_s.chomp}
-    ) array_row)
-          HEREDOC
-        end
-
         def select_paginate relative_path, data, count
           file_path = self.query_root.join('app','queries',relative_path + '.sql')
           template  = File.read file_path
           if count
-            sql = self.query_wrap_object template
-            sql = self.query_compile_template sql, data
+            sql = self._query_wrap_object template
+            sql = self._query_compile_template sql, data
             self.connection.select_value sql
           else
-            sql = self.query_wrap_array template
-            sql = self.query_compile_template sql, data
+            sql = self._query_wrap_array template
+            sql = self._query_compile_template sql, data
             self.connection.select_value sql
           end
         end

data/lib/querylet_rails/version.rb

@@ -1,3 +1,3 @@
 module QueryletRails
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: querylet-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - TeacherSeat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: querylet
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Querylet Rails