skyward-orm 0.4.0 → 0.4.1

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 (61) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE +21 -0
  3. data/README.md +66 -48
  4. data/lib/skyward/orm/adapters/postgresql/connection.rb +64 -4
  5. data/lib/skyward/orm/adapters/postgresql.rb +95 -76
  6. data/lib/skyward/orm/adapters/sqlite/connection.rb +87 -0
  7. data/lib/skyward/orm/adapters/sqlite/constraints.rb +15 -15
  8. data/lib/skyward/orm/adapters/sqlite.rb +59 -55
  9. data/lib/skyward/orm/adapters/statement_cache.rb +51 -0
  10. data/lib/skyward/orm/adapters.rb +12 -6
  11. data/lib/skyward/orm/cli/boot_file.rb +2 -2
  12. data/lib/skyward/orm/cli/migration.rb +7 -7
  13. data/lib/skyward/orm/cli/scaffold/source.rb +49 -30
  14. data/lib/skyward/orm/cli/scaffold.rb +6 -6
  15. data/lib/skyward/orm/commands.rb +9 -9
  16. data/lib/skyward/orm/connection/instrumented.rb +4 -2
  17. data/lib/skyward/orm/connection/pool.rb +2 -2
  18. data/lib/skyward/orm/database/decoders.rb +41 -0
  19. data/lib/skyward/orm/database/schema_check.rb +3 -3
  20. data/lib/skyward/orm/database.rb +65 -31
  21. data/lib/skyward/orm/migrations/definitions.rb +13 -13
  22. data/lib/skyward/orm/migrations/diff.rb +4 -4
  23. data/lib/skyward/orm/migrations/directory.rb +5 -5
  24. data/lib/skyward/orm/migrations/runner.rb +8 -8
  25. data/lib/skyward/orm/migrations/script.rb +9 -9
  26. data/lib/skyward/orm/migrations/status.rb +7 -7
  27. data/lib/skyward/orm/migrations/summary.rb +22 -22
  28. data/lib/skyward/orm/migrations/versions.rb +2 -3
  29. data/lib/skyward/orm/projection.rb +6 -12
  30. data/lib/skyward/orm/queries/clauses.rb +201 -112
  31. data/lib/skyward/orm/query.rb +2 -2
  32. data/lib/skyward/orm/record.rb +5 -9
  33. data/lib/skyward/orm/statements/placeholders.rb +3 -3
  34. data/lib/skyward/orm/statements.rb +34 -28
  35. data/lib/skyward/orm/tables/column_types.rb +7 -7
  36. data/lib/skyward/orm/tables/declarations.rb +5 -5
  37. data/lib/skyward/orm/tables/rows.rb +28 -10
  38. data/lib/skyward/orm/tables/sources.rb +3 -3
  39. data/lib/skyward/orm/tables/values.rb +18 -18
  40. data/lib/skyward/orm/version.rb +1 -1
  41. data/lib/skyward/orm.rb +15 -14
  42. data/sig/generated/skyward/orm/adapters/postgresql/connection.rbs +35 -3
  43. data/sig/generated/skyward/orm/adapters/postgresql.rbs +14 -3
  44. data/sig/generated/skyward/orm/adapters/sqlite/connection.rbs +55 -0
  45. data/sig/generated/skyward/orm/adapters/sqlite.rbs +11 -6
  46. data/sig/generated/skyward/orm/adapters/statement_cache.rbs +37 -0
  47. data/sig/generated/skyward/orm/adapters.rbs +3 -0
  48. data/sig/generated/skyward/orm/cli/scaffold/source.rbs +11 -0
  49. data/sig/generated/skyward/orm/connection/instrumented.rbs +4 -2
  50. data/sig/generated/skyward/orm/database/decoders.rbs +19 -0
  51. data/sig/generated/skyward/orm/database.rbs +38 -14
  52. data/sig/generated/skyward/orm/queries/clauses.rbs +81 -28
  53. data/sig/generated/skyward/orm/record.rbs +6 -7
  54. data/sig/generated/skyward/orm/statements.rbs +8 -10
  55. data/sig/generated/skyward/orm/tables/rows.rbs +1 -1
  56. data/sig/generated/skyward/orm.rbs +2 -2
  57. data/sig/manual/pg.rbs +10 -0
  58. data/sig/manual/skyward/orm/database/decoders.rbs +3 -0
  59. data/sig/manual/skyward/orm.rbs +9 -3
  60. data/sig/manual/sqlite3.rbs +13 -2
  61. metadata +11 -3
@@ -7,10 +7,10 @@ module Skyward::ORM::Migrations::Status
7
7
  # type state = :ran | :pending | :edited | :gone
8
8
 
9
9
  STATES = {
10
- ran: "ran",
11
- pending: "pending",
12
- edited: "edited after it ran",
13
- gone: "ran, but its file is gone"
10
+ ran: 'ran',
11
+ pending: 'pending',
12
+ edited: 'edited after it ran',
13
+ gone: 'ran, but its file is gone'
14
14
  }.freeze #: Hash[state, String]
15
15
 
16
16
  NONE = "No migrations yet.\n" #: String
@@ -53,7 +53,7 @@ module Skyward::ORM::Migrations::Status
53
53
  next unless table
54
54
 
55
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" }]
56
+ names = [*indexes.map(&:name), *constraints.map { |constraint| constraint.name || 'unnamed' }]
57
57
  [klass, names] unless names.empty?
58
58
  end
59
59
  end
@@ -75,7 +75,7 @@ module Skyward::ORM::Migrations::Status
75
75
  Skyward::ORM::Migrations::Summary.text(changes, adapter),
76
76
  kept_text(kept),
77
77
  unowned_text(unowned),
78
- clean?(migrations, changes, unowned) ? CLEAN : ""
78
+ clean?(migrations, changes, unowned) ? CLEAN : ''
79
79
  ].join
80
80
  end
81
81
 
@@ -113,7 +113,7 @@ module Skyward::ORM::Migrations::Status
113
113
  # @rbs unowned: Array[Symbol]
114
114
  # @rbs return: String
115
115
  def unowned_text(unowned)
116
- return "" if unowned.empty?
116
+ return '' if unowned.empty?
117
117
 
118
118
  ["These tables have no class, so `skyward migration` leaves them alone:\n",
119
119
  *unowned.map { |table| " #{table}\n" },
@@ -35,21 +35,21 @@ module Skyward::ORM::Migrations::Summary
35
35
  # @rbs return: [String, String, String]
36
36
  def line(edit, adapter)
37
37
  case edit
38
- when Skyward::ORM::Migrations::AddColumn then ["+", edit.column.name.name, column(edit.column, adapter)]
38
+ when Skyward::ORM::Migrations::AddColumn then ['+', edit.column.name.name, column(edit.column, adapter)]
39
39
  when Skyward::ORM::Migrations::DropColumn
40
- ["-", edit.column.name.name, "#{edit.column.type} #{edit.column.nullable ? "NULL" : "NOT NULL"}".lstrip]
41
- when Skyward::ORM::Migrations::RenameColumn then ["~", edit.to.name, "renamed from #{edit.from}"]
42
- when Skyward::ORM::Migrations::ChangeType then ["~", edit.column.name, "#{edit.to}, was #{edit.from}"]
40
+ ['-', edit.column.name.name, "#{edit.column.type} #{edit.column.nullable ? 'NULL' : 'NOT NULL'}".lstrip]
41
+ when Skyward::ORM::Migrations::RenameColumn then ['~', edit.to.name, "renamed from #{edit.from}"]
42
+ when Skyward::ORM::Migrations::ChangeType then ['~', edit.column.name, "#{edit.to}, was #{edit.from}"]
43
43
  when Skyward::ORM::Migrations::ChangeNullable
44
- ["~", edit.column.name, edit.nullable ? "NULL, was NOT NULL" : "NOT NULL, was NULL"]
45
- when Skyward::ORM::Migrations::ChangeDefault then ["~", edit.column.name,
44
+ ['~', edit.column.name, edit.nullable ? 'NULL, was NOT NULL' : 'NOT NULL, was NULL']
45
+ when Skyward::ORM::Migrations::ChangeDefault then ['~', edit.column.name,
46
46
  "#{default(edit.to)}, was #{default(edit.from)}"]
47
- when Skyward::ORM::Migrations::AddConstraint then ["+", edit.constraint.name.to_s, constraint(edit.constraint)]
48
- when Skyward::ORM::Migrations::DropConstraint then ["-", edit.constraint.name || "unnamed",
47
+ when Skyward::ORM::Migrations::AddConstraint then ['+', edit.constraint.name.to_s, constraint(edit.constraint)]
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}"]
51
- when Skyward::ORM::Migrations::AddIndex then ["+", edit.index.name, index(edit.index)]
52
- else ["-", edit.index.name, index(edit.index)]
50
+ when Skyward::ORM::Migrations::RenameConstraint then ['~', edit.to, "renamed from #{edit.from}"]
51
+ when Skyward::ORM::Migrations::AddIndex then ['+', edit.index.name, index(edit.index)]
52
+ else ['-', edit.index.name, index(edit.index)]
53
53
  end
54
54
  end
55
55
 
@@ -58,15 +58,15 @@ module Skyward::ORM::Migrations::Summary
58
58
  def counts(change)
59
59
  schema = change.klass.schema
60
60
  declared = [
61
- [schema.references.size, "reference", "references"],
62
- [schema.checks.size + change.columns.count { |column| column.type == :enum }, "check", "checks"],
63
- [schema.uniques.size, "unique", "uniques"],
64
- [schema.indexes.size, "index", "indexes"]
61
+ [schema.references.size, 'reference', 'references'],
62
+ [schema.checks.size + change.columns.count { |column| column.type == :enum }, 'check', 'checks'],
63
+ [schema.uniques.size, 'unique', 'uniques'],
64
+ [schema.indexes.size, 'index', 'indexes']
65
65
  ] #: Array[[Integer, String, String]]
66
66
  [
67
- count(change.columns.size, "column", "columns"),
67
+ count(change.columns.size, 'column', 'columns'),
68
68
  *declared.filter_map { |size, one, many| count(size, one, many) if size.positive? }
69
- ].join(", ")
69
+ ].join(', ')
70
70
  end
71
71
 
72
72
  # @rbs size: Integer
@@ -80,19 +80,19 @@ module Skyward::ORM::Migrations::Summary
80
80
  # @rbs return: String
81
81
  def column(column, adapter)
82
82
  sql_type = adapter.sql_type(column)
83
- return "needs a type" unless sql_type
83
+ return 'needs a type' unless sql_type
84
84
 
85
- "#{sql_type} #{column.nullable ? "NULL" : "NOT NULL"}"
85
+ "#{sql_type} #{column.nullable ? 'NULL' : 'NOT NULL'}"
86
86
  end
87
87
 
88
88
  # @rbs default: String?
89
89
  # @rbs return: String
90
- def default(default) = default ? "DEFAULT #{default}" : "no default"
90
+ def default(default) = default ? "DEFAULT #{default}" : 'no default'
91
91
 
92
92
  # @rbs constraint: Skyward::ORM::Catalog::Constraint
93
93
  # @rbs return: String
94
94
  def constraint(constraint)
95
- columns = "(#{constraint.columns.join(", ")})"
95
+ columns = "(#{constraint.columns.join(', ')})"
96
96
  case constraint.kind
97
97
  when :primary_key then "primary key #{columns}"
98
98
  when :unique then "unique #{columns}"
@@ -103,5 +103,5 @@ module Skyward::ORM::Migrations::Summary
103
103
 
104
104
  # @rbs index: Skyward::ORM::Catalog::Index
105
105
  # @rbs return: String
106
- def index(index) = "index (#{index.columns.join(", ")})"
106
+ def index(index) = "index (#{index.columns.join(', ')})"
107
107
  end
@@ -12,8 +12,7 @@ module Skyward::ORM::Migrations::Versions
12
12
  def checksums(database)
13
13
  return {} unless database.tables.any? { |table| table.name == TABLE }
14
14
 
15
- database.execute("SELECT version, checksum FROM #{TABLE}").to_h do |version, checksum|
16
- [version.to_s, checksum.to_s]
17
- end
15
+ rows = database.connection { |connection| connection.execute("SELECT version, checksum FROM #{TABLE}") }
16
+ rows.to_h { |version, checksum| [version.to_s, checksum.to_s] }
18
17
  end
19
18
  end
@@ -8,10 +8,7 @@ class Skyward::ORM::Projection
8
8
  # @rbs return: R | Skyward::ORM::Violation
9
9
  def insert(**values)
10
10
  require_insertable
11
- database = @session.database
12
- sql, binds = Skyward::ORM::Statements.insert(
13
- database.adapter, database.column_types, database.tables, @table, values
14
- )
11
+ sql, binds = Skyward::ORM::Statements.insert(@session.database, @table, values, @row)
15
12
  written = returning(sql, binds)
16
13
  case written
17
14
  when Skyward::ORM::Violation then written
@@ -33,7 +30,7 @@ class Skyward::ORM::Projection
33
30
  sql, binds = Skyward::ORM::Statements.insert_all(
34
31
  database.adapter, database.column_types, database.tables, @table, rows
35
32
  )
36
- returning(sql, binds)
33
+ returning("#{sql} #{Skyward::ORM::Statements.returning(@row)}", binds)
37
34
  end
38
35
 
39
36
  # @rbs rows: Array[Hash[Symbol, untyped]]
@@ -43,7 +40,7 @@ class Skyward::ORM::Projection
43
40
  # @rbs **values: untyped
44
41
  # @rbs return: Array[R] | Skyward::ORM::Violation
45
42
  def update(**values)
46
- sql, binds = updating(values)
43
+ sql, binds = updating(values, @row)
47
44
  returning(sql, binds)
48
45
  end
49
46
 
@@ -53,7 +50,7 @@ class Skyward::ORM::Projection
53
50
 
54
51
  # @rbs return: Array[R] | Skyward::ORM::Violation
55
52
  def delete
56
- sql, binds = deleting
53
+ sql, binds = deleting(@row)
57
54
  returning(sql, binds)
58
55
  end
59
56
 
@@ -66,7 +63,7 @@ class Skyward::ORM::Projection
66
63
  # comes back.
67
64
  # @rbs return: void
68
65
  def require_insertable
69
- refused = [("conditions" if @scope == :narrowed), *clauses].compact
66
+ refused = [('conditions' if @scope == :narrowed), *clauses].compact
70
67
  return if refused.empty?
71
68
 
72
69
  raise ArgumentError,
@@ -79,8 +76,5 @@ class Skyward::ORM::Projection
79
76
  # @rbs sql: String
80
77
  # @rbs binds: Array[untyped]
81
78
  # @rbs return: Array[untyped] | Skyward::ORM::Violation
82
- def returning(sql, binds)
83
- returned = Skyward::ORM::Statements.returning(Skyward::ORM::Tables::Members.of(@row))
84
- @session.database.write_returning(@table, @row, "#{sql} #{returned}", binds)
85
- end
79
+ def returning(sql, binds) = @session.database.write_returning(@table, @row, sql, binds)
86
80
  end