miguel 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fe535fb9867417bd85648a478880bb452590b98ca6b6ee285ca06a8fa785db4
-  data.tar.gz: 5f8497cc65b4554a2cb3bd0956dc12fd6a566c8ae57462a10aa2749746dedc95
+  metadata.gz: 821d6ef0ddebb1aa237b6dabfa0b2272d05107534114c9596ba948bf6a96aa1c
+  data.tar.gz: de5c7d1f3ad59507f5f727b21d5323151a259d215eb32c32a3ba83ff473940c6
 SHA512:
-  metadata.gz: '0659bdcac90f184db9af02fce004e7ff65398a4955560fd02c36c2049da09fe8c0b0d88772656712d588a3b933e467bf92b065fffa98e44f6b3594a46855e681'
-  data.tar.gz: 1e60c072c0a3674a84621f1df9ee8b64954ff231a4987aed61ff4cacff48703eeaf07b2f58c2e37e657eb2321000780989f8248a28c92814e491d34583963eb9
+  metadata.gz: d89c348653fa910bd3e2a22dc8c30de50b28b60ef14e947a0ae8cafee822f37f9c601551b9cd7cc4f7fc8a43e8b445539d52ae679515bd8ad96fcb481bdfec4c
+  data.tar.gz: e908e8e40752308de4d36453b4a721bfafc7f247a4c0e9dce4cd300fc6280b81d683d0deab8254bf19a4cf16a1c11cd974b0d87455d6aacf2fa60d49480a641c

data/README.md

@@ -123,6 +123,7 @@ set_defaults :Time, :timestamp, default: '2000-01-01 00:00:00'
 set_defaults :Time?, :timestamp, default: nil
 
 set_defaults :unique, :index, unique: true
+set_defaults :fulltext, :index, type: :full_text
 
 set_defaults :Key, :integer, unsigned: false
 set_defaults :primary_key, type: :integer, unsigned: false

data/lib/miguel/importer.rb

@@ -160,8 +160,11 @@ module Miguel
       foreign_key_indexes = table.foreign_keys.map{ |x| x.columns if x.columns.size == 1 }.compact
       for name, opts in db.indexes( table.name )
         opts = opts.dup
+        opts[ :name ] = name
         columns = opts.delete( :columns )
         next if ( ! opts[ :unique ] ) && foreign_key_indexes.include?( columns ) && name == columns.first
+        # Sequel currently doesn't provide info about fulltext indexes, so we have to rely on properly used names.
+        opts[ :type ] = :full_text if name =~ /_fulltext$/
         opts.delete( :deferrable ) unless opts[ :deferrable ]
         table.add_index( columns, opts )
       end

data/lib/miguel/schema.rb

@@ -204,11 +204,15 @@ module Miguel
 
       include Output
 
+      # The table this index belongs to.
+      attr_reader :table
+
       # Index column(s) and options.
       attr_reader :columns, :opts
 
       # Create new index for given column(s).
-      def initialize( columns, opts = {} )
+      def initialize( table, columns, opts = {} )
+        @table = table
         @columns = [ *columns ]
         @opts = opts
       end
@@ -218,11 +222,16 @@ module Miguel
 
       # Get the index options, in a canonic way.
       def canonic_opts
-        o = { :unique => false }
+        o = { :unique => false, :name => default_index_name }
         o.merge!( opts )
         o.delete_if{ |key, value| IGNORED_OPTS.include? key }
       end
 
+      # Get default index name for this index.
+      def default_index_name
+        [ table.name, *columns, :index ].join( '_' ).to_sym
+      end
+
       # Compare one index with another one.
       def == other
         other.is_a?( Index ) &&
@@ -367,7 +376,7 @@ module Miguel
 
       # Add index definition.
       def add_index( columns, *args )
-        @indexes << Index.new( columns, *args )
+        @indexes << Index.new( self, columns, *args )
       end
 
       # Add foreign key definition.
@@ -529,6 +538,7 @@ module Miguel
     #   :Time?, :timestamp, :default => nil
     #
     #   :unique, :index, :unique => true
+    #   :fulltext, :index, :type => :full_text
     #
     #   :Key, :integer, :unsigned => false
     #   :primary_key, :type => :integer, :unsigned => false
@@ -560,9 +570,12 @@ module Miguel
         opts[ :type ] ||= :integer unless args.first.is_a? Array or not opts[ :unsigned ]
       end
 
-      # Save some typing for unique indexes.
+      # Save some typing for unique and fulltext indexes.
 
       set_defaults :unique, :index, :unique => true
+      set_defaults :fulltext, :index, :type => :full_text do |opts,args,table|
+        opts[ :name ] ||= [ table, *args, :fulltext ].join( '_' ).to_sym
+      end
 
       # Type shortcuts we use frequently.
 

data/lib/miguel/version.rb

@@ -2,8 +2,8 @@
 
 module Miguel
   MAJOR = 0
-  MINOR = 2
-  PATCH = 1
+  MINOR = 3
+  PATCH = 0
   VERSION = [ MAJOR, MINOR, PATCH ].join( '.' ).freeze
 end
 

data/test/data/schema.rb

@@ -96,8 +96,16 @@ Miguel::Schema.define( use_defaults: false ) do
     unique [:a, :c]
     index [:b, :c, :d]
     index [:b, :a]
+    index [:c, :d], name: :named_cd_index
   end
 
+  table :fulltext do
+    String :s
+    Text :t
+    fulltext :s
+    fulltext [:s, :t]
+  end unless opts[ :skip_fulltext ]
+
   table :null do
     String? :string
     Text? :text

data/test/data/schema.txt

@@ -68,8 +68,15 @@ table :compound do
   index [:a, :c], :null => false, :unique => true
   index [:b, :c, :d], :null => false
   index [:b, :a], :null => false
+  index [:c, :d], :null => false, :name => :named_cd_index
   foreign_key [:b, :a], :compound, :null => false, :key => [:a, :b], :unsigned => false
 end
+table :fulltext do
+  String :s, :null => false, :text => false
+  String :t, :null => false, :text => true
+  index [:s], :null => false, :type => :full_text, :name => :fulltext_s_fulltext
+  index [:s, :t], :null => false, :type => :full_text, :name => :fulltext_s_t_fulltext
+end
 table :null do
   String :string, :null => true, :text => false
   String :text, :null => true, :text => true

data/test/data/schema_bare.txt

@@ -66,6 +66,13 @@ create_table :compound do
   index [:a, :c], :null => false, :unique => true
   index [:b, :c, :d], :null => false
   index [:b, :a], :null => false
+  index [:c, :d], :null => false, :name => :named_cd_index
+end
+create_table :fulltext do
+  String :s, :null => false, :text => false
+  String :t, :null => false, :text => true
+  index [:s], :null => false, :type => :full_text, :name => :fulltext_s_fulltext
+  index [:s, :t], :null => false, :type => :full_text, :name => :fulltext_s_t_fulltext
 end
 create_table :null do
   String :string, :null => true, :text => false

data/test/data/schema_change.txt

@@ -68,6 +68,13 @@ Sequel.migration do
       index [:a, :c], :null => false, :unique => true
       index [:b, :c, :d], :null => false
       index [:b, :a], :null => false
+      index [:c, :d], :null => false, :name => :named_cd_index
+    end
+    create_table :fulltext do
+      String :s, :null => false, :text => false
+      String :t, :null => false, :text => true
+      index [:s], :null => false, :type => :full_text, :name => :fulltext_s_fulltext
+      index [:s, :t], :null => false, :type => :full_text, :name => :fulltext_s_t_fulltext
     end
     create_table :null do
       String :string, :null => true, :text => false

data/test/data/schema_down.txt

@@ -26,6 +26,7 @@ drop_table :users
 drop_table :simple
 drop_table :reuse
 drop_table :compound
+drop_table :fulltext
 drop_table :null
 drop_table :defaults
 drop_table :simple_users

data/test/data/schema_full.txt

@@ -68,6 +68,13 @@ Sequel.migration do
       index [:a, :c], :null => false, :unique => true
       index [:b, :c, :d], :null => false
       index [:b, :a], :null => false
+      index [:c, :d], :null => false, :name => :named_cd_index
+    end
+    create_table :fulltext do
+      String :s, :null => false, :text => false
+      String :t, :null => false, :text => true
+      index [:s], :null => false, :type => :full_text, :name => :fulltext_s_fulltext
+      index [:s, :t], :null => false, :type => :full_text, :name => :fulltext_s_t_fulltext
     end
     create_table :null do
       String :string, :null => true, :text => false
@@ -157,6 +164,7 @@ Sequel.migration do
     drop_table :simple
     drop_table :reuse
     drop_table :compound
+    drop_table :fulltext
     drop_table :null
     drop_table :defaults
     drop_table :simple_users

data/test/data/seq_1.txt

@@ -14,7 +14,7 @@ Sequel.migration do
       add_column :create_time, :timestamp, :default => "2000-01-01 00:00:00", :null => false
       add_column :update_time, :timestamp, :default => "2000-01-01 00:00:00", :null => false
       add_column :fk, :integer, :default => 0, :null => false, :key => [:id], :unsigned => false
-      add_index [:u], :unique => true
+      add_index [:u], :unique => true, :name => :b_u_index
     end
     create_table :c do
       primary_key :id, :null => false, :unsigned => false
@@ -46,7 +46,7 @@ Sequel.migration do
       set_column_type :a, Integer, :null => false
     end
     alter_table :b do
-      drop_index [:u] # :unique => true
+      drop_index [:u] # :unique => true, :name => :b_u_index
       drop_column :create_time # :timestamp, :null => false, :default => "2000-01-01 00:00:00"
       drop_column :update_time # :timestamp, :null => false, :default => "2000-01-01 00:00:00"
       drop_column :fk # :integer, :null => false, :key => [:id], :unsigned => false

data/test/data/seq_2.txt

@@ -4,7 +4,7 @@ Sequel.migration do
       drop_foreign_key [:fk] # :a, :on_update => :no_action, :on_delete => :no_action, :key => [:id]
     end
     alter_table :b do
-      add_index [:create_time], :unique => false
+      add_index [:create_time], :unique => false, :name => :b_create_time_index
     end
     alter_table :c do
       add_column :t, String, :default => "", :null => false, :text => true
@@ -36,7 +36,7 @@ Sequel.migration do
     end
     drop_table :a_b
     alter_table :b do
-      drop_index [:create_time] # :unique => false
+      drop_index [:create_time] # :unique => false, :name => :b_create_time_index
     end
     alter_table :c do
       drop_column :t # String, :null => false, :text => true

data/test/test_importer.rb

@@ -21,9 +21,9 @@ describe Miguel::Importer do
         { zero_timestamps: false },
       ]
     when :postgres
-      [ signed_unsigned: true ]
+      [ signed_unsigned: true, skip_fulltext: true ]
     else
-      [ {} ]
+      [ skip_fulltext: true ]
     end
   end
 

data/test/test_schema.rb

@@ -430,20 +430,26 @@ describe Miguel::Schema do
         Integer :a, :null => false
         Integer :b, :null => false
         String :s, :null => false, :text => false
+        String :t, :null => false, :text => true
         index [:a], :null => false
         index [:b], :null => false, :unique => true
         index [:a, :b], :null => false
         index [:a, :b, :c], :null => false, :unique => true
+        index [:s], :null => false, :type => :full_text, :name => :index_s_fulltext
+        index [:s, :t], :null => false, :type => :full_text, :name => :index_s_t_fulltext
       end
     EOT
       table :index do
         Integer :a
         Integer :b
         String :s
+        Text :t
         index :a
         unique :b
         index [:a, :b]
         unique [:a, :b, :c]
+        fulltext :s
+        fulltext [:s, :t]
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miguel
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Patrik Rak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel