skyward-orm 0.3.0 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (96) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +200 -31
  3. data/lib/skyward/orm/adapters/postgresql.rb +140 -38
  4. data/lib/skyward/orm/adapters/sqlite/constraints.rb +18 -0
  5. data/lib/skyward/orm/adapters/sqlite.rb +130 -21
  6. data/lib/skyward/orm/adapters.rb +12 -2
  7. data/lib/skyward/orm/catalog/column.rb +2 -1
  8. data/lib/skyward/orm/cli/boot_file.rb +2 -2
  9. data/lib/skyward/orm/cli/migrate.rb +1 -1
  10. data/lib/skyward/orm/cli/migration.rb +1 -1
  11. data/lib/skyward/orm/cli/scaffold/source.rb +304 -0
  12. data/lib/skyward/orm/cli/scaffold.rb +70 -0
  13. data/lib/skyward/orm/cli/status.rb +5 -3
  14. data/lib/skyward/orm/commands.rb +12 -0
  15. data/lib/skyward/orm/connection/instrumented.rb +69 -0
  16. data/lib/skyward/orm/connection/session.rb +74 -5
  17. data/lib/skyward/orm/{connection/database → database}/schema_check.rb +20 -8
  18. data/lib/skyward/orm/{connection/database.rb → database.rb} +15 -15
  19. data/lib/skyward/orm/execution.rb +9 -0
  20. data/lib/skyward/orm/migrations/alter_table.rb +6 -2
  21. data/lib/skyward/orm/migrations/definitions.rb +7 -4
  22. data/lib/skyward/orm/migrations/diff.rb +154 -30
  23. data/lib/skyward/orm/migrations/rename_constraint.rb +8 -0
  24. data/lib/skyward/orm/migrations/runner.rb +13 -3
  25. data/lib/skyward/orm/migrations/script.rb +60 -20
  26. data/lib/skyward/orm/migrations/status.rb +32 -3
  27. data/lib/skyward/orm/migrations/summary.rb +3 -6
  28. data/lib/skyward/orm/migrations/versions.rb +1 -1
  29. data/lib/skyward/orm/migrations.rb +1 -1
  30. data/lib/skyward/orm/projection.rb +23 -4
  31. data/lib/skyward/orm/queries/clauses.rb +117 -32
  32. data/lib/skyward/orm/record.rb +23 -1
  33. data/lib/skyward/orm/{placeholders.rb → statements/placeholders.rb} +1 -1
  34. data/lib/skyward/orm/statements.rb +171 -30
  35. data/lib/skyward/orm/tables/column.rb +2 -1
  36. data/lib/skyward/orm/tables/column_types.rb +62 -15
  37. data/lib/skyward/orm/tables/declarations.rb +38 -10
  38. data/lib/skyward/orm/{members.rb → tables/members.rb} +1 -1
  39. data/lib/skyward/orm/tables/sources.rb +63 -0
  40. data/lib/skyward/orm/tables/validation.rb +12 -3
  41. data/lib/skyward/orm/tables/values.rb +115 -5
  42. data/lib/skyward/orm/tables.rb +2 -1
  43. data/lib/skyward/orm/transactional.rb +2 -2
  44. data/lib/skyward/orm/version.rb +1 -1
  45. data/lib/skyward/orm.rb +44 -10
  46. data/sig/generated/skyward/orm/adapters/postgresql.rbs +53 -14
  47. data/sig/generated/skyward/orm/adapters/sqlite/constraints.rbs +6 -0
  48. data/sig/generated/skyward/orm/adapters/sqlite.rbs +67 -7
  49. data/sig/generated/skyward/orm/adapters.rbs +3 -0
  50. data/sig/generated/skyward/orm/catalog/column.rbs +6 -4
  51. data/sig/generated/skyward/orm/cli/boot_file.rbs +4 -4
  52. data/sig/generated/skyward/orm/cli/migrate.rbs +2 -2
  53. data/sig/generated/skyward/orm/cli/migration.rbs +2 -2
  54. data/sig/generated/skyward/orm/cli/scaffold/source.rbs +147 -0
  55. data/sig/generated/skyward/orm/cli/scaffold.rbs +28 -0
  56. data/sig/generated/skyward/orm/cli/status.rbs +2 -2
  57. data/sig/generated/skyward/orm/connection/instrumented.rbs +45 -0
  58. data/sig/generated/skyward/orm/connection/session.rbs +40 -6
  59. data/sig/generated/skyward/orm/{connection/database → database}/schema_check.rbs +11 -4
  60. data/sig/generated/skyward/orm/{connection/database.rbs → database.rbs} +4 -5
  61. data/sig/generated/skyward/orm/execution.rbs +18 -0
  62. data/sig/generated/skyward/orm/migrations/alter_table.rbs +11 -5
  63. data/sig/generated/skyward/orm/migrations/definitions.rbs +2 -2
  64. data/sig/generated/skyward/orm/migrations/diff.rbs +77 -11
  65. data/sig/generated/skyward/orm/migrations/rename_constraint.rbs +16 -0
  66. data/sig/generated/skyward/orm/migrations/runner.rbs +5 -0
  67. data/sig/generated/skyward/orm/migrations/script.rbs +32 -8
  68. data/sig/generated/skyward/orm/migrations/status.rbs +15 -2
  69. data/sig/generated/skyward/orm/migrations/summary.rbs +0 -1
  70. data/sig/generated/skyward/orm/migrations/versions.rbs +2 -2
  71. data/sig/generated/skyward/orm/migrations.rbs +1 -1
  72. data/sig/generated/skyward/orm/projection.rbs +10 -2
  73. data/sig/generated/skyward/orm/queries/clauses.rbs +60 -24
  74. data/sig/generated/skyward/orm/record.rbs +8 -0
  75. data/sig/generated/skyward/orm/{placeholders.rbs → statements/placeholders.rbs} +2 -2
  76. data/sig/generated/skyward/orm/statements.rbs +83 -5
  77. data/sig/generated/skyward/orm/tables/column.rbs +6 -4
  78. data/sig/generated/skyward/orm/tables/column_types.rbs +18 -4
  79. data/sig/generated/skyward/orm/tables/declarations.rbs +15 -1
  80. data/sig/generated/skyward/orm/{members.rbs → tables/members.rbs} +2 -2
  81. data/sig/generated/skyward/orm/tables/sources.rbs +32 -0
  82. data/sig/generated/skyward/orm/tables/values.rbs +41 -1
  83. data/sig/generated/skyward/orm/tables.rbs +3 -1
  84. data/sig/generated/skyward/orm.rbs +6 -6
  85. data/sig/manual/pg.rbs +12 -0
  86. data/sig/manual/skyward/orm/cli/scaffold/source.rbs +3 -0
  87. data/sig/manual/skyward/orm/cli/scaffold.rbs +3 -0
  88. data/sig/manual/skyward/orm/database/schema_check.rbs +3 -0
  89. data/sig/manual/skyward/orm/statements/placeholders.rbs +3 -0
  90. data/sig/manual/skyward/orm/tables/members.rbs +3 -0
  91. data/sig/manual/skyward/orm/tables/sources.rbs +3 -0
  92. data/sig/manual/skyward/orm.rbs +32 -5
  93. metadata +43 -14
  94. data/sig/manual/skyward/orm/connection/database/schema_check.rbs +0 -3
  95. data/sig/manual/skyward/orm/members.rbs +0 -3
  96. data/sig/manual/skyward/orm/placeholders.rbs +0 -3
@@ -41,6 +41,23 @@ module Skyward::ORM::Migrations::Status
41
41
  tables.map(&:name).reject { |name| owned.include?(name) }
42
42
  end
43
43
 
44
+ # Each class whose table has what the class can't declare, with the name of
45
+ # each such index and constraint. SQLite can hold a constraint with no name.
46
+ # @rbs classes: Array[singleton(Skyward::ORM::Record)]
47
+ # @rbs column_types: Skyward::ORM::Tables::ColumnTypes
48
+ # @rbs tables: Array[Skyward::ORM::Catalog::Table]
49
+ # @rbs return: Array[[singleton(Skyward::ORM::Record), Array[String]]]
50
+ def kept(classes, column_types, tables)
51
+ classes.sort_by { |klass| klass.table_name.name }.filter_map do |klass|
52
+ table = tables.find { |candidate| candidate.name == klass.table_name }
53
+ next unless table
54
+
55
+ indexes, constraints = Skyward::ORM::Migrations::Diff.kept(klass, column_types.columns(klass), table, tables)
56
+ names = [*indexes.map(&:name), *constraints.map { |constraint| constraint.name || "unnamed" }]
57
+ [klass, names] unless names.empty?
58
+ end
59
+ end
60
+
44
61
  # @rbs migrations: Array[[String, state]]
45
62
  # @rbs changes: Array[Skyward::ORM::Migrations::change]
46
63
  # @rbs unowned: Array[Symbol]
@@ -49,12 +66,14 @@ module Skyward::ORM::Migrations::Status
49
66
  migrations.all? { |_, state| state == :ran } && changes.empty? && unowned.empty?
50
67
  end
51
68
 
52
- # @rbs (Array[[String, state]] migrations, Array[Skyward::ORM::Migrations::change] changes, Array[Symbol] unowned,
69
+ # @rbs (Array[[String, state]] migrations, Array[Skyward::ORM::Migrations::change] changes,
70
+ # Array[[singleton(Skyward::ORM::Record), Array[String]]] kept, Array[Symbol] unowned,
53
71
  # Skyward::ORM::_Adapter adapter) -> String
54
- def text(migrations, changes, unowned, adapter)
72
+ def text(migrations, changes, kept, unowned, adapter)
55
73
  [
56
74
  listing(migrations),
57
75
  Skyward::ORM::Migrations::Summary.text(changes, adapter),
76
+ kept_text(kept),
58
77
  unowned_text(unowned),
59
78
  clean?(migrations, changes, unowned) ? CLEAN : ""
60
79
  ].join
@@ -82,12 +101,22 @@ module Skyward::ORM::Migrations::Status
82
101
  ["Migrations:\n", *migrations.map { |name, state| " #{name.ljust(width)} #{STATES.fetch(state)}\n" }].join
83
102
  end
84
103
 
104
+ # @rbs kept: Array[[singleton(Skyward::ORM::Record), Array[String]]]
105
+ # @rbs return: String
106
+ def kept_text(kept)
107
+ kept.map do |klass, names|
108
+ width = names.map(&:length).max.to_i
109
+ ["#{klass.table_name}:\n", *names.map { |name| " #{name.ljust(width)} kept: not declared by #{klass}\n" }].join
110
+ end.join
111
+ end
112
+
85
113
  # @rbs unowned: Array[Symbol]
86
114
  # @rbs return: String
87
115
  def unowned_text(unowned)
88
116
  return "" if unowned.empty?
89
117
 
90
118
  ["These tables have no class, so `skyward migration` leaves them alone:\n",
91
- *unowned.map { |table| " #{table}\n" }].join
119
+ *unowned.map { |table| " #{table}\n" },
120
+ "Run `skyward scaffold TABLE` to print a class for one.\n"].join
92
121
  end
93
122
  end
@@ -47,6 +47,7 @@ module Skyward::ORM::Migrations::Summary
47
47
  when Skyward::ORM::Migrations::AddConstraint then ["+", edit.constraint.name.to_s, constraint(edit.constraint)]
48
48
  when Skyward::ORM::Migrations::DropConstraint then ["-", edit.constraint.name || "unnamed",
49
49
  constraint(edit.constraint)]
50
+ when Skyward::ORM::Migrations::RenameConstraint then ["~", edit.to, "renamed from #{edit.from}"]
50
51
  when Skyward::ORM::Migrations::AddIndex then ["+", edit.index.name, index(edit.index)]
51
52
  else ["-", edit.index.name, index(edit.index)]
52
53
  end
@@ -78,7 +79,7 @@ module Skyward::ORM::Migrations::Summary
78
79
  # @rbs adapter: Skyward::ORM::_Adapter
79
80
  # @rbs return: String
80
81
  def column(column, adapter)
81
- sql_type = adapter.sql_type(column.type)
82
+ sql_type = adapter.sql_type(column)
82
83
  return "needs a type" unless sql_type
83
84
 
84
85
  "#{sql_type} #{column.nullable ? "NULL" : "NOT NULL"}"
@@ -100,11 +101,7 @@ module Skyward::ORM::Migrations::Summary
100
101
  end
101
102
  end
102
103
 
103
- # An index on an expression has no columns to name.
104
104
  # @rbs index: Skyward::ORM::Catalog::Index
105
105
  # @rbs return: String
106
- def index(index)
107
- kind = index.unique ? "unique index" : "index"
108
- index.columns.empty? ? "#{kind} on an expression" : "#{kind} (#{index.columns.join(", ")})"
109
- end
106
+ def index(index) = "index (#{index.columns.join(", ")})"
110
107
  end
@@ -7,7 +7,7 @@ module Skyward::ORM::Migrations::Versions
7
7
  # never been migrated doesn't have the table yet.
8
8
  TABLE = :schema_migrations #: Symbol
9
9
 
10
- # @rbs database: Skyward::ORM::Connection::Database
10
+ # @rbs database: Skyward::ORM::Database
11
11
  # @rbs return: Hash[String, String]
12
12
  def checksums(database)
13
13
  return {} unless database.tables.any? { |table| table.name == TABLE }
@@ -4,5 +4,5 @@ module Skyward::ORM::Migrations
4
4
  # @rbs!
5
5
  # type change = CreateTable | AlterTable
6
6
  # type edit = AddColumn | DropColumn | RenameColumn | ChangeType | ChangeNullable | ChangeDefault
7
- # | AddConstraint | DropConstraint | AddIndex | DropIndex
7
+ # | AddConstraint | DropConstraint | RenameConstraint | AddIndex | DropIndex
8
8
  end
@@ -9,7 +9,9 @@ class Skyward::ORM::Projection
9
9
  def insert(**values)
10
10
  require_insertable
11
11
  database = @session.database
12
- sql, binds = Skyward::ORM::Statements.insert(database.adapter, database.column_types, @table, values)
12
+ sql, binds = Skyward::ORM::Statements.insert(
13
+ database.adapter, database.column_types, database.tables, @table, values
14
+ )
13
15
  written = returning(sql, binds)
14
16
  case written
15
17
  when Skyward::ORM::Violation then written
@@ -21,6 +23,23 @@ class Skyward::ORM::Projection
21
23
  # @rbs return: R
22
24
  def insert!(**values) = unviolated(insert(**values))
23
25
 
26
+ # @rbs rows: Array[Hash[Symbol, untyped]]
27
+ # @rbs return: Array[R] | Skyward::ORM::Violation
28
+ def insert_all(rows)
29
+ require_insertable
30
+ return [] if rows.empty?
31
+
32
+ database = @session.database
33
+ sql, binds = Skyward::ORM::Statements.insert_all(
34
+ database.adapter, database.column_types, database.tables, @table, rows
35
+ )
36
+ returning(sql, binds)
37
+ end
38
+
39
+ # @rbs rows: Array[Hash[Symbol, untyped]]
40
+ # @rbs return: Array[R]
41
+ def insert_all!(rows) = unviolated(insert_all(rows))
42
+
24
43
  # @rbs **values: untyped
25
44
  # @rbs return: Array[R] | Skyward::ORM::Violation
26
45
  def update(**values)
@@ -43,8 +62,8 @@ class Skyward::ORM::Projection
43
62
 
44
63
  private
45
64
 
46
- # An INSERT writes one row and takes none of a query's clauses, so the query
47
- # can only say what comes back.
65
+ # An INSERT takes none of a query's clauses, so the query can only say what
66
+ # comes back.
48
67
  # @rbs return: void
49
68
  def require_insertable
50
69
  refused = [("conditions" if @scope == :narrowed), *clauses].compact
@@ -61,7 +80,7 @@ class Skyward::ORM::Projection
61
80
  # @rbs binds: Array[untyped]
62
81
  # @rbs return: Array[untyped] | Skyward::ORM::Violation
63
82
  def returning(sql, binds)
64
- returned = Skyward::ORM::Statements.returning(Skyward::ORM::Members.of(@row))
83
+ returned = Skyward::ORM::Statements.returning(Skyward::ORM::Tables::Members.of(@row))
65
84
  @session.database.write_returning(@table, @row, "#{sql} #{returned}", binds)
66
85
  end
67
86
  end
@@ -10,9 +10,15 @@ module Skyward::ORM::Queries::Clauses
10
10
  # type direction = :asc | :desc
11
11
  # type condition = Comparison | Fragment | Negation | Disjunction
12
12
  # type scope = :all | :start | :narrowed
13
+ # type parts = [singleton(Skyward::ORM::Record), Array[Join], scope, Array[condition],
14
+ # Array[[Symbol, direction]], Array[Symbol], Integer?, Integer?]
13
15
 
14
16
  DIRECTIONS = %i[asc desc].freeze #: Array[direction]
15
17
 
18
+ COUNT = Skyward::ORM::Tables::Column.new(
19
+ name: :count, type: :integer, nullable: false, symbols: [], element: nil
20
+ ) #: Skyward::ORM::Tables::Column
21
+
16
22
  Comparison = Data.define(
17
23
  :column, #: Symbol
18
24
  :operator, #: String
@@ -160,6 +166,24 @@ module Skyward::ORM::Queries::Clauses
160
166
  # @rbs return: self
161
167
  def offset(count) = with(offset: require_count(:offset, count))
162
168
 
169
+ # @rbs other: Skyward::ORM::Query[untyped]
170
+ # @rbs return: self
171
+ def merge(other)
172
+ require_query(other)
173
+ table, joins, scope, conditions, orders, groups, limit, offset = other.parts
174
+ raise ArgumentError, "#{@table} can't merge a query of #{table}, a different table class" unless table == @table
175
+
176
+ with(
177
+ joins: merged_joins(joins),
178
+ scope: merged_scope(scope),
179
+ conditions: [*@conditions, *conditions],
180
+ orders: [*@orders, *orders],
181
+ groups: [*@groups, *groups],
182
+ limit: limit || @limit,
183
+ offset: offset || @offset
184
+ )
185
+ end
186
+
163
187
  # Steep ties the row class to S only through its new, so the query keeps it
164
188
  # as the Class it is.
165
189
  # @rbs [S] (Skyward::ORM::_Row[S] row, **String expressions) -> Skyward::ORM::Projection[S]
@@ -195,7 +219,7 @@ module Skyward::ORM::Queries::Clauses
195
219
  sql, binds = from(database, [], @limit)
196
220
  counted = @groups.empty? && @limit.nil? && @offset.nil? ? sql : %(FROM (SELECT 1 #{sql}) AS "counted")
197
221
  # PostgreSQL's driver returns every value as text, so the adapter reads it.
198
- database.adapter.decode(:integer, database.execute("SELECT COUNT(*) #{counted}", binds).fetch(0).fetch(0))
222
+ database.adapter.decode(COUNT, database.execute("SELECT COUNT(*) #{counted}", binds).fetch(0).fetch(0))
199
223
  end
200
224
 
201
225
  # Order can't change whether the query has a row, so it's left out, and a
@@ -220,6 +244,13 @@ module Skyward::ORM::Queries::Clauses
220
244
  # @rbs return: [String, Array[untyped]]
221
245
  def to_sql = statement(@session.database, @orders, @limit)
222
246
 
247
+ protected
248
+
249
+ # rbs-inline writes a protected method as public, so Steep would let an app
250
+ # call this, though Ruby won't.
251
+ # @rbs return: parts
252
+ def parts = [@table, @joins, @scope, @conditions, @orders, @groups, @limit, @offset]
253
+
223
254
  private
224
255
 
225
256
  # Steep can't tie the class it builds to self, or the row class to S, so
@@ -260,9 +291,7 @@ module Skyward::ORM::Queries::Clauses
260
291
  unless table.is_a?(Class) && table < Skyward::ORM::Record && table.schema.table
261
292
  raise ArgumentError, "#{@table} can't join #{table.inspect}, which isn't a table class"
262
293
  end
263
- # A table that's in a query twice needs an alias to tell the two apart,
264
- # which a query can't give it.
265
- if tables.any? { |present| present.table_name == table.table_name }
294
+ if present?(table)
266
295
  raise ArgumentError, "#{@table} can't join #{table}, since #{table.table_name} is already in the query"
267
296
  end
268
297
  raise ArgumentError, "#{@table} can't join #{table} on nothing. Give it columns, such as list_id: :id" if on.empty?
@@ -272,6 +301,45 @@ module Skyward::ORM::Queries::Clauses
272
301
  Join.new(keyword:, table:, on:)
273
302
  end
274
303
 
304
+ # @rbs other: untyped
305
+ # @rbs return: void
306
+ def require_query(other)
307
+ if other.is_a?(Skyward::ORM::Projection)
308
+ raise ArgumentError,
309
+ "#{@table} can't merge a projection, whose row class and expressions would have nowhere to go. " \
310
+ "Merge the query before its into."
311
+ end
312
+ return if other.is_a?(Skyward::ORM::Query)
313
+
314
+ raise ArgumentError, "#{@table} can't merge #{other.inspect}, which isn't a query"
315
+ end
316
+
317
+ # Two scopes that each join a table the same way compose, so an identical
318
+ # join is kept once.
319
+ # @rbs joins: Array[Join]
320
+ # @rbs return: Array[Join]
321
+ def merged_joins(joins)
322
+ added = joins - @joins
323
+ conflict = added.find { |join| present?(join.table) }
324
+ if conflict
325
+ raise ArgumentError,
326
+ "#{@table} can't merge a different join of #{conflict.table}, " \
327
+ "since #{conflict.table.table_name} is already in the query"
328
+ end
329
+
330
+ [*@joins, *added]
331
+ end
332
+
333
+ # Merging only ever narrows, so every row may be changed only when both
334
+ # queries said so with an explicit all.
335
+ # @rbs scope: scope
336
+ # @rbs return: scope
337
+ def merged_scope(scope)
338
+ return :narrowed if [@scope, scope].include?(:narrowed)
339
+
340
+ @scope == :all && scope == :all ? :all : :start
341
+ end
342
+
275
343
  # @rbs sql: String?
276
344
  # @rbs values: Array[untyped]
277
345
  # @rbs conditions: Hash[Symbol, untyped]
@@ -346,7 +414,7 @@ module Skyward::ORM::Queries::Clauses
346
414
  # @rbs expressions: Hash[Symbol, String]
347
415
  # @rbs return: void
348
416
  def require_members(row, expressions)
349
- members = Skyward::ORM::Members.of(row)
417
+ members = Skyward::ORM::Tables::Members.of(row)
350
418
  unknown = expressions.keys - members
351
419
  raise ArgumentError, "#{row} has no member #{unknown.join(", ")} to take an expression" unless unknown.empty?
352
420
 
@@ -356,27 +424,30 @@ module Skyward::ORM::Queries::Clauses
356
424
  raise ArgumentError, "#{@table} has no column #{unread.join(", ")}, so #{row} needs an expression for it"
357
425
  end
358
426
 
359
- # @rbs database: Skyward::ORM::Connection::Database
427
+ # @rbs database: Skyward::ORM::Database
360
428
  # @rbs orders: Array[[Symbol, direction]]
361
429
  # @rbs limit: Integer?
362
430
  # @rbs return: [String, Array[untyped]]
363
431
  def statement(database, orders, limit)
364
432
  sql, binds = from(database, orders, limit)
365
- columns = Skyward::ORM::Members.of(@row).map do |member|
433
+ columns = Skyward::ORM::Tables::Members.of(@row).map do |member|
366
434
  expression = @expressions.fetch(member, nil)
367
435
  expression ? "#{expression} AS #{Skyward::ORM::Statements.quote(member)}" : qualified(member)
368
436
  end.join(", ")
369
437
  ["SELECT #{columns} #{sql}", binds]
370
438
  end
371
439
 
372
- # @rbs database: Skyward::ORM::Connection::Database
440
+ # @rbs database: Skyward::ORM::Database
373
441
  # @rbs orders: Array[[Symbol, direction]]
374
442
  # @rbs limit: Integer?
375
443
  # @rbs return: [String, Array[untyped]]
376
444
  def from(database, orders, limit)
377
445
  adapter = database.adapter
378
446
  where, binds = filter(database, 1)
379
- ordered = orders.map { |column, direction| "#{qualified(column)} #{direction.upcase}" }
447
+ columns = Skyward::ORM::Statements.by_name(database.column_types, @table)
448
+ ordered = orders.map do |column, direction|
449
+ "#{adapter.comparable(columns[column]&.type || :untyped, qualified(column))} #{direction.upcase}"
450
+ end
380
451
  # The limit and offset are bound rather than written in, so every page of a
381
452
  # query shares one SQL string.
382
453
  paging = [limit, @offset].compact
@@ -401,7 +472,7 @@ module Skyward::ORM::Queries::Clauses
401
472
 
402
473
  # An UPDATE binds its SET values first, so its WHERE's numbered placeholders
403
474
  # start after them.
404
- # @rbs database: Skyward::ORM::Connection::Database
475
+ # @rbs database: Skyward::ORM::Database
405
476
  # @rbs position: Integer
406
477
  # @rbs return: [String?, Array[untyped]]
407
478
  def filter(database, position)
@@ -409,7 +480,7 @@ module Skyward::ORM::Queries::Clauses
409
480
  [("WHERE #{clauses}" unless @conditions.empty?), binds]
410
481
  end
411
482
 
412
- # @rbs database: Skyward::ORM::Connection::Database
483
+ # @rbs database: Skyward::ORM::Database
413
484
  # @rbs conditions: Array[condition]
414
485
  # @rbs position: Integer
415
486
  # @rbs return: [String, Array[untyped]]
@@ -422,7 +493,7 @@ module Skyward::ORM::Queries::Clauses
422
493
  [clauses.join(" AND "), binds]
423
494
  end
424
495
 
425
- # @rbs database: Skyward::ORM::Connection::Database
496
+ # @rbs database: Skyward::ORM::Database
426
497
  # @rbs condition: condition
427
498
  # @rbs position: Integer
428
499
  # @rbs return: [String, Array[untyped]]
@@ -438,29 +509,36 @@ module Skyward::ORM::Queries::Clauses
438
509
  end
439
510
  end
440
511
 
441
- # @rbs database: Skyward::ORM::Connection::Database
512
+ # @rbs database: Skyward::ORM::Database
442
513
  # @rbs comparison: Comparison
443
514
  # @rbs position: Integer
444
515
  # @rbs return: [String, Array[untyped]]
445
516
  def comparison(database, comparison, position)
517
+ adapter = database.adapter
518
+ column = Skyward::ORM::Statements.by_name(database.column_types, @table).fetch(comparison.column)
446
519
  name = qualified(comparison.column)
447
520
  value = comparison.value
448
521
  case value
449
522
  when nil then ["#{name} IS NULL", []]
450
- when Array then within(database, name, value, position)
451
- else ["#{name} #{comparison.operator} #{database.adapter.placeholder(position)}", [database.adapter.encode(value)]]
523
+ when Array then within(adapter, column, name, value, position)
524
+ else
525
+ # = compares exactly as the column stores its values, and only a range's
526
+ # ends need them in order.
527
+ compared = comparison.operator == "=" ? name : adapter.comparable(column.type, name)
528
+ bound = Skyward::ORM::Statements.encode(adapter, column, value)
529
+ ["#{compared} #{comparison.operator} #{adapter.placeholder(position)}", [bound]]
452
530
  end
453
531
  end
454
532
 
455
- # @rbs database: Skyward::ORM::Connection::Database
533
+ # @rbs database: Skyward::ORM::Database
456
534
  # @rbs fragment: Fragment
457
535
  # @rbs position: Integer
458
536
  # @rbs return: [String, Array[untyped]]
459
537
  def fragment(database, fragment, position)
460
538
  adapter = database.adapter
461
539
  binds = fragment.values.map { |value| adapter.encode(value) }
462
- Skyward::ORM::Placeholders.require_scalars(binds, "An SQL condition")
463
- sql = Skyward::ORM::Placeholders.replace(fragment.sql, binds.size) do |index|
540
+ Skyward::ORM::Statements::Placeholders.require_scalars(binds, "An SQL condition")
541
+ sql = Skyward::ORM::Statements::Placeholders.replace(fragment.sql, binds.size) do |index|
464
542
  adapter.placeholder(position + index - 1)
465
543
  end
466
544
  # A -- comment runs to the end of its line, so the closing parenthesis
@@ -471,7 +549,7 @@ module Skyward::ORM::Queries::Clauses
471
549
  # NOT of an unknown is unknown, so a row whose column is NULL would be left
472
550
  # out, though it doesn't match. An untyped column may hold NULL, and an SQL
473
551
  # string's columns can't be known.
474
- # @rbs database: Skyward::ORM::Connection::Database
552
+ # @rbs database: Skyward::ORM::Database
475
553
  # @rbs conditions: Array[condition]
476
554
  # @rbs position: Integer
477
555
  # @rbs return: [String, Array[untyped]]
@@ -489,7 +567,7 @@ module Skyward::ORM::Queries::Clauses
489
567
  [kept.empty? ? "NOT (#{sql})" : "(NOT (#{sql})#{kept})", binds]
490
568
  end
491
569
 
492
- # @rbs database: Skyward::ORM::Connection::Database
570
+ # @rbs database: Skyward::ORM::Database
493
571
  # @rbs conditions: Array[condition]
494
572
  # @rbs position: Integer
495
573
  # @rbs return: [String, Array[untyped]]
@@ -499,21 +577,22 @@ module Skyward::ORM::Queries::Clauses
499
577
  end
500
578
 
501
579
  # PostgreSQL refuses an empty IN (), and IN never matches NULL.
502
- # @rbs database: Skyward::ORM::Connection::Database
580
+ # @rbs adapter: Skyward::ORM::_Adapter
581
+ # @rbs column: Skyward::ORM::Tables::Column
503
582
  # @rbs name: String
504
583
  # @rbs values: Array[untyped]
505
584
  # @rbs position: Integer
506
585
  # @rbs return: [String, Array[untyped]]
507
- def within(database, name, values, position)
586
+ def within(adapter, column, name, values, position)
508
587
  present = values.compact
509
- placeholders = Array.new(present.size) { |index| database.adapter.placeholder(position + index) }
588
+ placeholders = Array.new(present.size) { |index| adapter.placeholder(position + index) }
510
589
  list = "#{name} IN (#{placeholders.join(", ")})"
511
590
  sql = if values.empty? then "1 = 0"
512
591
  elsif present.empty? then "#{name} IS NULL"
513
592
  elsif values.include?(nil) then "(#{list} OR #{name} IS NULL)"
514
593
  else list
515
594
  end
516
- [sql, present.map { |value| database.adapter.encode(value) }]
595
+ [sql, present.map { |value| Skyward::ORM::Statements.encode(adapter, column, value) }]
517
596
  end
518
597
 
519
598
  # Steep can't tie the row class to R, so the rows are untyped here and each
@@ -533,7 +612,13 @@ module Skyward::ORM::Queries::Clauses
533
612
  # @rbs return: Array[singleton(Skyward::ORM::Record)]
534
613
  def tables = [@table, *@joins.map(&:table)]
535
614
 
536
- # @rbs database: Skyward::ORM::Connection::Database
615
+ # A table that's in a query twice needs an alias to tell the two apart,
616
+ # which a query can't give it.
617
+ # @rbs table: singleton(Skyward::ORM::Record)
618
+ # @rbs return: bool
619
+ def present?(table) = tables.any? { |present| present.table_name == table.table_name }
620
+
621
+ # @rbs database: Skyward::ORM::Database
537
622
  # @rbs return: void
538
623
  def prepare(database) = tables.each { |table| database.prepare(table) }
539
624
 
@@ -553,14 +638,15 @@ module Skyward::ORM::Queries::Clauses
553
638
  raise ArgumentError, "#{@table} update needs a column to set, such as update(done: true)" if values.empty?
554
639
 
555
640
  database = @session.database
556
- Skyward::ORM::Statements.require_values(database.column_types, @table, values)
641
+ column_types = database.column_types
642
+ Skyward::ORM::Statements.require_values(column_types, database.tables, @table, values)
557
643
  assignments = values.keys.each.with_index(1).map do |column, position|
558
644
  "#{Skyward::ORM::Statements.quote(column)} = #{database.adapter.placeholder(position)}"
559
645
  end
560
646
  changing(
561
647
  :update,
562
648
  "UPDATE #{Skyward::ORM::Statements.quote(@table.table_name)} SET #{assignments.join(", ")}",
563
- values.values
649
+ Skyward::ORM::Statements.binds(database.adapter, column_types, @table, values)
564
650
  )
565
651
  end
566
652
 
@@ -569,13 +655,12 @@ module Skyward::ORM::Queries::Clauses
569
655
 
570
656
  # @rbs method: Symbol
571
657
  # @rbs sql: String
572
- # @rbs values: Array[untyped]
658
+ # @rbs set: Array[untyped]
573
659
  # @rbs return: [String, Array[untyped]]
574
- def changing(method, sql, values)
660
+ def changing(method, sql, set)
575
661
  require_writable(method)
576
- database = @session.database
577
- where, binds = filter(database, values.size + 1)
578
- [[sql, where].compact.join(" "), [*values.map { |value| database.adapter.encode(value) }, *binds]]
662
+ where, binds = filter(@session.database, set.size + 1)
663
+ [[sql, where].compact.join(" "), [*set, *binds]]
579
664
  end
580
665
 
581
666
  # @rbs [T] (T | Skyward::ORM::Violation written) -> T
@@ -57,7 +57,7 @@ class Skyward::ORM::Record
57
57
  # @rbs return: Integer | Skyward::ORM::Violation
58
58
  def self.insert(**values)
59
59
  database = Skyward::ORM::Connection::SESSION.database
60
- sql, binds = Skyward::ORM::Statements.insert(database.adapter, database.column_types, self, values)
60
+ sql, binds = Skyward::ORM::Statements.insert(database.adapter, database.column_types, database.tables, self, values)
61
61
  database.write(self, sql, binds)
62
62
  end
63
63
 
@@ -71,6 +71,28 @@ class Skyward::ORM::Record
71
71
  end
72
72
  end
73
73
 
74
+ # @rbs rows: Array[Hash[Symbol, untyped]]
75
+ # @rbs return: Integer | Skyward::ORM::Violation
76
+ def self.insert_all(rows)
77
+ return 0 if rows.empty?
78
+
79
+ database = Skyward::ORM::Connection::SESSION.database
80
+ sql, binds = Skyward::ORM::Statements.insert_all(
81
+ database.adapter, database.column_types, database.tables, self, rows
82
+ )
83
+ database.write(self, sql, binds)
84
+ end
85
+
86
+ # @rbs rows: Array[Hash[Symbol, untyped]]
87
+ # @rbs return: Integer
88
+ def self.insert_all!(rows)
89
+ written = insert_all(rows)
90
+ case written
91
+ when Skyward::ORM::Violation then raise Skyward::ORM::ViolationError, written
92
+ else written
93
+ end
94
+ end
95
+
74
96
  # @rbs return: Array[Symbol]
75
97
  def self.members = schema.columns
76
98
 
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- module Skyward::ORM::Placeholders
3
+ module Skyward::ORM::Statements::Placeholders
4
4
  extend self
5
5
 
6
6
  # A ? in a string, a quoted name or a comment is the SQL's own, so those