sql_view 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0c483bd4b3381f12564e802d7e4169de63644dee304521156471397e5214e4e
-  data.tar.gz: c720532cb86979da70f0bcade52e1e74e5240ebe42e82f21288781511aa73861
+  metadata.gz: 0a7a2e1de23dc9d9523bfc1d6f0dfe65348a085ba81a0c5fc762d6ce64d0236e
+  data.tar.gz: 32f417176adaa3a7f1c65ca7bfb405d63236d0979bafd0fd106562bac018f68f
 SHA512:
-  metadata.gz: 0613cd3a590e6a163c4f035cc6ff8361f2432c155e536dff873f5f6d8d60a78eceb6f9a2946512291c06bbe6d603e0c8da4c4c548e41fbc26079544fe3a6cfb8
-  data.tar.gz: e9c49cfcac2404cd093a88e280d6bb4f8968cb40662bd04aec6ed3893b5bc68aedb108f194f3545add3946a82eb7e5b2c9abf997b241d535519d95b7dae96a95
+  metadata.gz: 3b32c1f94077eba3876764860bc3bc87fdd3e49386747f668d0682ebd3a87fe0417e48c48618d8f0c46040fcf43d20e0d114f3c955b0abea82591e478f7b91d9
+  data.tar.gz: f4a3534cc2cd8ba5e52156ddedda64a5d9d7016018ff28fca8f107291febdb5456001d8bef82c6f25c70f2ef0c8255d391223db1f1803be1f96f38ace3772505

data/lib/generators/sql_view/view/view_generator.rb

@@ -14,11 +14,13 @@ module SqlView
 class #{class_name}View < SqlView::Model
 #{top_code}
 
-  schema -> {#{schema_code} }
+  schema -> #{schema_code}
 
   extend_model_with do
     # sample how you can extend it, similar to regular AR model
     #
+    # include SomeConcern
+    #
     # belongs_to :user
     # has_many :posts
     #
@@ -28,7 +30,7 @@ class #{class_name}View < SqlView::Model
 end
 FILE
 
-        create_file "db/migrate/#{self.class.next_migration_number("db/migrate")}_create_#{file_name}s_view.rb", <<-FILE
+        create_file "db/migrate/#{self.class.next_migration_number("db/migrate")}_create_#{file_name}_view.rb", <<-FILE
 class #{migration_class_name} < #{activerecord_migration_class}
   def up
     #{class_name}View.sql_view.up
@@ -59,11 +61,15 @@ FILE
         end
 
         def schema_code
-          " #{args[0].presence || "\n    # ActiveRecord::Relation or SQL\n    # for example: User.where(active: true)\n " }"
+          if args[0].present?
+            "{ #{args[0]} }"
+          else
+            " { #{ "\n    # ActiveRecord::Relation or SQL\n    # for example: User.where(active: true)\n  }" }"
+          end
         end
 
         def migration_class_name
-          "Create#{class_name.tr('.', '').pluralize}View"
+          "Create#{class_name.tr('.', '')}View"
         end
 
         def activerecord_migration_class
@@ -85,4 +91,4 @@ FILE
 
     end
   end
-end
+end

data/lib/sql_view/schema_dumper.rb

@@ -6,7 +6,16 @@ module SqlView
   # @api private
   module SchemaDumper
     class DBView < OpenStruct
+      def to_schema
+        <<-DEFINITION
+  create_sql_view "#{self.viewname}", sql: <<-\SQL
+    CREATE #{materialized_or_not} VIEW "#{self.viewname}" AS
+    #{escaped_definition.indent(2)}
+  SQL\n
+        DEFINITION
+      end
 
+      private
       def materialized?
         self.kind == "m"
       end
@@ -15,15 +24,6 @@ module SqlView
         materialized? ? " MATERIALIZED " : nil
       end
 
-      def to_schema
-        <<-DEFINITION
-    create_sql_view "#{self.viewname}", sql: <<-\SQL
-      CREATE #{materialized_or_not} VIEW "#{self.viewname}" AS
-      #{escaped_definition.indent(2)}
-    SQL
-        DEFINITION
-      end
-
       def escaped_definition
         definition.gsub("\\", "\\\\\\")
       end
@@ -40,15 +40,23 @@ module SqlView
       end
 
       dumpable_views_in_database.each do |viewname|
+        next if already_indexed?(viewname)
         view = DBView.new(get_view_info(viewname))
-        #puts view.to_schema
         stream.puts(view.to_schema)
-        #indexes(view.name, stream)
+        indexes(viewname, stream)
       end
     end
 
     private
 
+    # make sure view was added one time, because somehow was adding views two times
+    def already_indexed?(viewname)
+      @already_indexed ||= []
+      return true if @already_indexed.include?(viewname)
+      @already_indexed << viewname
+      false
+    end
+
     def dumpable_views_in_database
       @dumpable_views_in_database ||= ActiveRecord::Base.connection.views.reject do |viewname|
         ignored?(viewname)

data/lib/sql_view/version.rb

@@ -1,3 +1,3 @@
 module SqlView
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/sql_view.rb

@@ -64,6 +64,7 @@ module SqlView
 
     def up
       view_sql = parent.sql_view_options[:sql_or_proc].call
+      raise "Please configure schema for #{parent} (association or SQL) for the view" if view_sql.to_s == ""
       sql = <<-SQL
       CREATE #{materialized_or_not} VIEW #{parent.view_name} AS
       #{view_sql.respond_to?(:to_sql) ? view_sql.to_sql : view_sql };
@@ -103,6 +104,13 @@ module SqlView
       if parent.sql_view_options[:extend_model_with].present?
         klass.class_eval(&parent.sql_view_options[:extend_model_with])
       end
+      # to use e.associations.count for example
+      # because of the error undefined scan for nil class
+      klass.class_eval %Q{
+        def self.name
+          "#{parent.class}"
+        end
+      }
       klass
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_view
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails