crudboy 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e345152548a12acb22ef528dd46c908f288733ec20c127ada4f35e8ef6591b7e
-  data.tar.gz: 4fb8c4aad59d49896acdf20024066f7bd61115ec3d8a2ff75a7a04de16d017e8
+  metadata.gz: 0b195104877b7807fcc50b78b278e7faad322cc6fd649355bfb5d0ac3ca44d61
+  data.tar.gz: f20d2f0e5e0af9ce981ecec211bc3454c6a2df18f3c7a5b4a2f59fdeaeec1f28
 SHA512:
-  metadata.gz: e90df33803a2d7efac0d7b2ad27dd8c0c40da90a335ad007f704d3ded20798938275b1ddfe621d1fdf4f718391db197f0ec5524a8ff3708506d55ddc9941b55f
-  data.tar.gz: 47c355b92e41a0afc576393831bc6a8c479d96e90ccbd8003197373b183c57c509753f225330f4c79686d4959526efe48b7b7a4a49a87d986f4572ee36e177df
+  metadata.gz: 868fa74a46e9b0b3762ad828fe83423095d6f8c3c98a8200d9ec8e072d2f531476c049d5684f70f3ba007f4f4773fa058a13ec82635c84807c77be7c3f262ea2
+  data.tar.gz: a6bcdc5a50f747a384b80126d6cf8d138de87e582d847d58af35fad0a15430c90c2f7e8dd080cfdd9938bbb14bdd783cd53f374a792111c6d9a9f2b235839ddf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    crudboy (0.1.5)
+    crudboy (0.2.0)
       activerecord (>= 6.0.3, < 6.2.0)
       activesupport (~> 6.0.3)
       composite_primary_keys (~> 12.0.3)
@@ -53,7 +53,7 @@ GEM
       yard (~> 0.9.11)
     rainbow (3.0.0)
     rake (12.3.3)
-    sqlite3 (1.6.8-x86_64-darwin)
+    sqlite3 (1.7.3-arm64-darwin)
     table_print (1.5.7)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
@@ -65,11 +65,11 @@ GEM
     zeitwerk (2.6.6)
 
 PLATFORMS
-  ruby
+  arm64-darwin-23
 
 DEPENDENCIES
   crudboy!
   rake (~> 12.0)
 
 BUNDLED WITH
-   2.2.3
+   2.4.1

data/lib/crudboy/column.rb

@@ -22,8 +22,8 @@ module Crudboy
     JDBC_TYPES = {
       "varchar" => 'VARCHAR',
       "char" => 'CHAR',
-      "text" => 'TEXT',
-      "longtext" => 'LONGVARCHAR',
+      "text" => 'VARCHAR',
+      "longtext" => 'VARCHAR',
       "int" => 'INTEGER',
       "smallint" => 'INTEGER',
       "bigint" => 'BIGINT',
@@ -37,6 +37,24 @@ module Crudboy
       "decimal" => 'DECIMAL'
     }
 
+    PYTHON_TYPES = {
+      "varchar" => 'str',
+      "char" => 'str',
+      "text" => 'str',
+      "longtext" => 'str',
+      "int" => 'int',
+      "smallint" => 'int',
+      "bigint" => 'int',
+      "tinyint" => 'int',
+      "double" => 'float',
+      "date" => 'datetime',
+      "datetime" => 'datetime',
+      "timestamp" => 'datetime',
+      "time" => 'datetime',
+      "blob" => 'bytes',
+      "decimal" => 'decimal'
+    }
+
     attr_accessor :active_record_column, :primary
 
     def initialize(column, primary)
@@ -87,6 +105,67 @@ module Crudboy
       JDBC_TYPES[raw_type]
     end
 
+    def python_type
+      raw_type = sql_type.scan(/^\w+/).first
+      PYTHON_TYPES[raw_type]
+    end
+
+    def python_type_with_optional
+      raw_python_type = python_type
+      null ? "Optional[#{raw_python_type}]" : raw_python_type
+    end
+
+    def py_sqlmodel_primary_column_declaration
+      format('%s: %s = Field(default_factory=gen_id, primary_key=True, max_length=%s, description="%s")', name, python_type, limit, comment)
+    end
+
+    def py_dto_column_declaration(optional = false)
+      # for example:     id: str = Field(description="ID")
+      if optional
+        format('%s: %s | None = Field(description="%s", default=None)', name, python_type, comment)
+      else
+        format('%s: %s = Field(description="%s")', name, python_type, comment)
+      end
+    end
+
+    def py_sqlmodel_regular_column_declaration
+      if created_at_column?
+        return py_sqlmodel_created_at_column_declaration
+      end
+
+      if updated_at_column?
+        return py_sqlmodel_updated_at_column_declaration
+      end
+
+      format('%s: %s = Field(default=None, max_length=%s, description="%s")', name, python_type_with_optional, limit || 'None', comment || '')
+    end
+
+    def py_sqlmodel_created_at_column_declaration
+      #  create_time: Optional[datetime] = Field(
+      #     default_factory=datetime.now,
+      #     description="Create Time",
+      #     sa_column_kwargs={"server_default": sa.func.now()},
+      # )
+      format('%s: %s = Field(default_factory=datetime.now, description="%s", sa_column_kwargs={"server_default": sa.func.now()})', name, python_type_with_optional, comment || '')
+    end
+
+    def py_sqlmodel_updated_at_column_declaration
+      #  update_time: Optional[datetime] = Field(
+      #     default_factory=datetime.now,
+      #     description="Update Time",
+      #     sa_column_kwargs={"server_default": sa.func.now()},
+      # )
+      format('%s: %s = Field(default_factory=datetime.now, description="%s", sa_column_kwargs={"server_default": sa.func.now()})', name, python_type_with_optional, comment || '')
+    end
+
+    def created_at_column?
+      sql_type =~ /datetime|time|date|timestamp/ && name =~ /gmt_created|created_at|create_time|create_date/
+    end
+
+    def updated_at_column?
+      sql_type =~ /datetime|time|date|timestamp/ && name =~ /gmt_modified|updated_at|update_time|update_date/
+    end
+
     def method_missing(method, *args, **options, &block)
       if active_record_column.respond_to?(method)
         active_record_column.send(method, *args, **options, &block)

data/lib/crudboy/version.rb

@@ -1,3 +1,3 @@
 module Crudboy
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crudboy
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-06 00:00:00.000000000 Z
+date: 2025-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2