rails-snowflake 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9748211e158cfa6d669e478b09f34c1349b3f73d1e424ed0c2cebdbeab0e612
-  data.tar.gz: 295bfd2e78582989bd6c943d57480f14f9b4279e475fd58327eb9b31c4d6fb1b
+  metadata.gz: a0645a18c52266f1b80a691e7e5fcb07af9cc2ba5c4c5a82cac3a425e7ffe19b
+  data.tar.gz: 58b81ade2ed8ffd1367dcf504637a494034e6cc667f6be5ee33ac5b3afaadd5d
 SHA512:
-  metadata.gz: 4df342f41de3d1fc1efcb1112cf86587bd4721565ba6dadc115fc3653624f3980326017b0a4a0d5ffaac72198e392615a0e6e064ea24f3f8d2f997fa14b736e2
-  data.tar.gz: ce95567f740c3e23afd2b6946784226ed13d8d0f38eb92091c11e3377817623a8746b85921218317b08dea51df91b04b6ed15e0a330af727987c3e848a8d8041
+  metadata.gz: b5c30b3c3eb18d0d9c7a7911b2abb082976f773ae0f6a83c53be1865314f211a30f70cdd970d9c8324969eaa1f080e932f073eefa492acb2f9205c1b544e70c1
+  data.tar.gz: 5a294aa27bb5e3f396dc58445d1b8d5ed9528fd11fc31eab454b7590accd33a2573348484355b3e2cf0645a924a87a03dc8f7ecaf29c9797a273ab512da90b49

data/README.md

@@ -30,14 +30,13 @@ rails generate rails_snowflake:install
 
 ## Quick Start
 
-**That's it!** Just use `t.snowflake` in your migrations and everything works automatically.
+**That's it!** Just use `id: :snowflake` or `t.snowflake` in your migrations and everything works automatically.
 
 ### For Snowflake ID as primary key:
 ```ruby
-class CreateUsers < ActiveRecord::Migration[8.0]
+class CreateUsers < ActiveRecord::Migration
   def change
-    create_table :users, id: false do |t|
-      t.snowflake :id, primary_key: true  # Snowflake primary key
+    create_table :users, id: :snowflake do |t|
       t.string :name
       t.timestamps
     end
@@ -45,11 +44,8 @@ class CreateUsers < ActiveRecord::Migration[8.0]
 end
 ```
 
-**Note**: When using `t.snowflake :id` directly, Rails will complain about redefining the primary key. Always use `create_table :table_name, id: false` when you want a snowflake primary key.
-
-### For additional snowflake columns (non-primary key):
 ```ruby
-class CreatePosts < ActiveRecord::Migration[8.0]
+class CreatePosts < ActiveRecord::Migration
   def change
     create_table :posts do |t|
       t.string :title
@@ -116,7 +112,7 @@ execute("ALTER TABLE table_name ALTER COLUMN id SET DEFAULT timestamp_id('table_
 ## Requirements
 
 - **Database**: PostgreSQL >= 15
-- **Rails**: 7.1+
+- **Rails**: 7.2+
 - **Ruby**: 3.2+
 
 ## How it Works

data/lib/rails/snowflake/native_database_type.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Rails
+  module Snowflake
+    module NativeDatabaseType
+      def native_database_types
+        super.merge(
+          snowflake: { name: "bigint" }
+        )
+      end
+    end
+  end
+end

data/lib/rails/snowflake/railtie.rb

@@ -1,17 +1,19 @@
 # frozen_string_literal: true
 
+require_relative "types/snowflake"
+require_relative "table_definition"
+require_relative "native_database_type"
+
 module Rails
   module Snowflake
     class Railtie < ::Rails::Railtie
-      initializer "snowflake_id.register_field_type" do
+      initializer "snowflake.register_table_definitions" do
         ActiveSupport.on_load(:active_record) do
-          ActiveRecord::ConnectionAdapters::TableDefinition.prepend(Rails::Snowflake::ColumnMethods)
+          ActiveRecord::Type.register(:snowflake, Rails::Snowflake::Types::Snowflake, adapter: :postgresql)
 
-          if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-            ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:snowflake] = { name: "bigint" }
-          else
-            raise "Rails::Snowflake: Unsupported database adapter. Only PostgreSQL is supported."
-          end
+          ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(Rails::Snowflake::NativeDatabaseType)
+          ActiveRecord::ConnectionAdapters::TableDefinition.prepend(Rails::Snowflake::TableDefinition)
+          ActiveRecord::ConnectionAdapters::Table.prepend(Rails::Snowflake::TableDefinition)
         end
       end
 

data/lib/rails/snowflake/table_definition.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Rails
+  module Snowflake
+    module TableDefinition
+      def primary_key(name, type = :primary_key, **options)
+        if type == :snowflake
+          options[:default] = snowflake_default_function
+        end
+
+        super
+      end
+
+      def snowflake(column_name, **options)
+        if column_name == :id
+          raise Error, "Cannot use t.snowflake :id directly. Use `create_table :table_name, id: :snowflake` instead."
+        end
+
+        unless @name
+          raise Error, "Could not determine table name for Snowflake column. Make sure you're using it within a `create_table` block."
+        end
+
+        options[:default] = snowflake_default_function
+        options[:index] ||= true
+
+        column(column_name, :snowflake, **options)
+      end
+
+      private
+
+      def snowflake_default_function
+        -> { "timestamp_id('#{@name}'::text)" }
+      end
+    end
+  end
+end

data/lib/rails/snowflake/types/snowflake.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Rails
+  module Snowflake
+    module Types
+      class Snowflake < ActiveRecord::Type::BigInteger
+        def type
+          :snowflake
+        end
+      end
+    end
+  end
+end

data/lib/rails/snowflake/version.rb

@@ -2,6 +2,6 @@
 
 module Rails
   module Snowflake
-    VERSION = "0.1.2"
+  VERSION = "0.2.0"
   end
 end

data/lib/rails/snowflake.rb

@@ -3,7 +3,6 @@
 # Manually require all Rails::Snowflake modules
 require_relative "snowflake/version"
 require_relative "snowflake/id"
-require_relative "snowflake/column_methods"
 require_relative "snowflake/railtie"
 require_relative "snowflake/generators/install/install_generator"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-snowflake
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Luiz Eduardo Kowalski
@@ -35,12 +35,14 @@ files:
 - README.md
 - Rakefile
 - lib/rails/snowflake.rb
-- lib/rails/snowflake/column_methods.rb
 - lib/rails/snowflake/database_tasks.rb
 - lib/rails/snowflake/generators/install/install_generator.rb
 - lib/rails/snowflake/generators/install/templates/install_snowflake_id.rb.erb
 - lib/rails/snowflake/id.rb
+- lib/rails/snowflake/native_database_type.rb
 - lib/rails/snowflake/railtie.rb
+- lib/rails/snowflake/table_definition.rb
+- lib/rails/snowflake/types/snowflake.rb
 - lib/rails/snowflake/version.rb
 - lib/tasks/rails/snowflake_tasks.rake
 homepage: https://github.com/luizkowalski/snowflake_id/

data/lib/rails/snowflake/column_methods.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Rails
-  module Snowflake
-    module ColumnMethods
-    def snowflake(name, **options)
-      if name == :id && !options[:primary_key]
-        raise Error, "Cannot use t.snowflake :id directly. Use `create_table` with `id: false` and then `t.snowflake :id, primary_key: true`"
-      end
-
-      unless @name
-        raise Error, "Could not determine table name for Snowflake column. Make sure you're using it within a `create_table` block."
-      end
-
-      options[:default] = -> { "timestamp_id('#{@name}'::text)" }
-      options[:index] ||= true
-
-      column(name, :bigint, **options)
-    end
-    end
-  end
-end