jade-sql 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 203373e2a0789908e800cda5e81acee5883edb436205ec016f281549451218cd
-  data.tar.gz: 3338e7d2e8132fdf4ed4de0e8b53658d8a2cce64ee8f13394cc7dca53413906c
+  metadata.gz: df48a8644fe4cc5364406e9e5c4fc306a325a8b8c1d74f67dffcea445e11ff7b
+  data.tar.gz: aeb330e8b520e3b7abe4dff3f815b961d0fc66754fe8ec650590fd005782e455
 SHA512:
-  metadata.gz: f5e68d85a8d74169946d1368aa91ef46fe99c05a6b3250a5f11b44cc0ee13f75c66b3e1a3bbe59febb9c63ebee3f32ea419396444dffb699fa239a211f943821
-  data.tar.gz: 4ad41bf4b0b780a78b599bba48bd90f7b14a35dfd2564a38b8153bbeec8dd8a7abd77a08d6c43db9888df49096429702aa31d2a6ceebd606446023d729988dd7
+  metadata.gz: 4c78bfc6bf42a94222d5ea49812fdb592cad83850cf714ad412eda541ad933029a82b06dec6bca9a7206241ccb3657d9465f016481b9b4540cef59025c0c85b5
+  data.tar.gz: f2f6ba3266809cb49d32fc013966d74bb924e041bb32192d09dd938647f8226303e069c4829af4fab104b97b480ca6869415338ebab09cc1627a547025d378f3

data/lib/jade-sql/bin/generate_schema.rb

@@ -66,11 +66,12 @@ module JadeSql
     Table = Data.define(:name, :columns, :pk_columns)
     Column = Data.define(:name, :jade_type, :nullable)
 
-    def generate(sql, tables: nil, module_name: 'Schema')
+    def generate(sql, tables: nil, columns: nil, module_name: 'Schema')
       bodies = scan_table_bodies(sql)
       bodies = select_tables(bodies, tables) if tables
       pks = parse_pks(sql)
       parsed = bodies.map { |name, body| Table[name, parse_columns(body, name), pks[name] || []] }
+      parsed = select_columns(parsed, columns) if columns
       format(emit(parsed, module_name))
     end
 
@@ -107,6 +108,29 @@ module JadeSql
       bodies.select { |name, _| whitelist.include?(name) }
     end
 
+    # A schema generated for one domain carries only the columns that domain
+    # was granted, so a column it wasn't granted is absent from `Cols` and
+    # naming it is a type error rather than a review comment.
+    def select_columns(tables, whitelist)
+      tables.map do |t|
+        allowed = whitelist[t.name]
+        next t unless allowed
+
+        validate_columns!(t, allowed)
+
+        t.with(columns: t.columns.select { allowed.include?(it.name) })
+      end
+    end
+
+    def validate_columns!(table, allowed)
+      unknown = allowed - table.columns.map(&:name)
+      raise "Unknown column(s) on #{table.name}: #{unknown.join(', ')}" if unknown.any?
+
+      (table.pk_columns - allowed).then do
+        raise "#{table.name}: primary key #{it.join(', ')} must be selected" if it.any?
+      end
+    end
+
     def parse_columns(body, table_name)
       body
         .split("\n")

data/lib/jade-sql/tasks.rake

@@ -1,19 +1,38 @@
 require 'jade-sql/bin/generate_schema'
 
 namespace :jade do
-  desc "Generate schema.jd from db/structure.sql (INPUT, OUTPUT, TABLES, MODULE)"
+  desc "Generate schema.jd from db/structure.sql (INPUT, OUTPUT, TABLES, COLUMNS, MODULE)"
   task :schema do
     input       = ENV['INPUT']  || 'db/structure.sql'
     output      = ENV['OUTPUT'] || 'app/jade/schema.jd'
     tables      = ENV['TABLES']&.split(',')&.map(&:strip)&.reject(&:empty?)
+    columns     = parse_columns_env(ENV['COLUMNS'])
     module_name = ENV['MODULE'] || 'Schema'
 
     FileUtils.mkdir_p(File.dirname(output))
     File.write(
       output,
-      JadeSql::SchemaGenerator.generate(File.read(input), tables: tables, module_name: module_name),
+      JadeSql::SchemaGenerator.generate(
+        File.read(input), tables:, columns:, module_name:
+      ),
     )
 
     puts "wrote #{output}"
   end
+
+  # COLUMNS="patients:id,age;visits:id,seen_on" — tables separated by `;`,
+  # their columns by `,`. A table left out keeps all of its columns.
+  def parse_columns_env(raw)
+    return nil unless raw
+
+    raw
+      .split(';')
+      .reject { it.strip.empty? }
+      .to_h do
+        table, cols = it.split(':', 2)
+        raise "COLUMNS entry #{it.inspect} needs the form table:col,col" if cols.nil?
+
+        [table.strip, cols.split(',').map(&:strip).reject(&:empty?)]
+      end
+  end
 end

data/lib/jade-sql/version.rb

@@ -1,3 +1,3 @@
 module JadeSql
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: jade-sql
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - agustin
 bindir: exe
 cert_chain: []
-date: 2026-06-17 00:00:00.000000000 Z
+date: 2026-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jade-lang
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 description: Query and mutation builders, schema generation from db/structure.sql,
   and an ActiveRecord-backed runtime for the Jade language. Renders typed queries
   to (String, List(Value)) and decodes rows into Jade structs.