Code

Refactor model annotator#19

Code

Merged

drwl merged 73 commits intomaindrwl/annotaterb:mainfrom drwl/refactor-model-annotatordrwl/annotaterb:drwl/refactor-model-annotatorCopy head branch name to clipboardMay 9, 2023

+1,092-565

Commits

Commits on May 7, 2023

• Create ModelThing; Extract some column methods into it

  drwl

  committed
  2a267d7

  Copy full SHA for 2a267d7

• Extract #columns

  drwl

  committed
  bac0e15

  Copy full SHA for bac0e15

• Check in ModelThing

  drwl

  committed
  30cf98a

  Copy full SHA for 30cf98a

• Move #width into Helper

  drwl

  committed
  6b467d0

  Copy full SHA for 6b467d0

• Extract #max_schema_info_width

  drwl

  committed
  96165d5

  Copy full SHA for 96165d5

• Extract #get_schema_header_text

  drwl

  committed
  983caef

  Copy full SHA for 983caef

• Change method so to add back frozen string literal magic comment

  drwl

  committed
  6f23f14

  Copy full SHA for 6f23f14

• Tidy whitespace

  drwl

  committed
  365bf67

  Copy full SHA for 365bf67

• Move #map_col_type_to_ruby_classes into Helper

  drwl

  committed
  be0dd94

  Copy full SHA for be0dd94

• Move .quote into Helper

  drwl

  committed
  5ead066

  Copy full SHA for 5ead066

• Move non_ascii_length, get_col_type into Helper

  drwl

  committed
  629cb48

  Copy full SHA for 629cb48

• Create AnnotationGenerator; Move schema header into it

  drwl

  committed
  8b33753

  Copy full SHA for 8b33753

• Make conditional blocks clearer

  drwl

  committed
  97e6408

  Copy full SHA for 97e6408

• Attempt to expand conditional

  drwl

  committed
  6441dca

  Copy full SHA for 6441dca

• Blockify more conditionals

  drwl

  committed
  0bf4123

  Copy full SHA for 0bf4123

• Move first conditional into ColumnThing

  drwl

  committed
  c907ce4

  Copy full SHA for c907ce4

• Move more methods into ColumnThing

  drwl

  committed
  c7c1f3a

  Copy full SHA for c7c1f3a

• Move array check, geometry, and geometric checks into ColumnThing

  drwl

  committed
  3ca2789

  Copy full SHA for 3ca2789

• Replace last usages of column in get_attributes

  drwl

  committed
  83641e2

  Copy full SHA for 83641e2

• Move retrieve_indexes_from_table into ModelThing

  drwl

  committed
  c206fd0

  Copy full SHA for c206fd0

• Remove duplicate with_comments? method from SchemaInfo

  drwl

  committed
  462f293

  Copy full SHA for 462f293

• Move schema footer method

  drwl

  committed
  459f5ae

  Copy full SHA for 459f5ae

• Move index helper methods out

  drwl

  committed
  e513df6

  Copy full SHA for e513df6

• Move mb_chars_ljust into Helper

  drwl

  committed
  23de386

  Copy full SHA for 23de386

• Blockify conditionals

  drwl

  committed
  be44aff

  Copy full SHA for be44aff

• Move get_attributes into ColumnThing

  drwl

  committed
  bc6f8fc

  Copy full SHA for bc6f8fc

• Move klass into ColumnThing constructor

  drwl

  committed
  cc98921

  Copy full SHA for cc98921

• Move generate into AnnotationGenerator

  drwl

  committed
  289c26c

  Copy full SHA for 289c26c

• Extract magic number constants

  drwl

  committed
  8c34e9f

  Copy full SHA for 8c34e9f

• Remove get_ from methods

  drwl

  committed
  d1d18ff

  Copy full SHA for d1d18ff

• Extract column info method

  drwl

  committed
  1e4dad8

  Copy full SHA for 1e4dad8

Commits on May 8, 2023

• Inline schema_default

  drwl

  committed
  bee36b3

  Copy full SHA for bee36b3

• Update remaining instances of @klass in ModelThing

  drwl

  committed
  3d197f0

  Copy full SHA for 3d197f0

• Isolate calls to model thing

  drwl

  committed
  4b2f820

  Copy full SHA for 4b2f820

• Change source of column default value

  drwl

  committed
  c1e54ec

  Copy full SHA for c1e54ec

• Start tidying simple indexes code path

  drwl

  committed
  84f166a

  Copy full SHA for 84f166a

• Isolate sorted columns code

  drwl

  committed
  edfe795

  Copy full SHA for edfe795

• Remove seemingly unnecessary conditional in simple indexes codepath

  drwl

  committed
  0c807c2

  Copy full SHA for 0c807c2

• Remove dependency on ModelThing for ColumnThing

  drwl

  committed
  9849e48

  Copy full SHA for 9849e48

• Start extracting read values into ColumnWrapper class

  drwl

  committed
  b5d89b0

  Copy full SHA for b5d89b0

• Rename method arg because it conflicts with method name

  drwl

  committed
  f97a000

  Copy full SHA for f97a000

• Move the rest into ColumnWrapper

  drwl

  committed
  6d3ed82

  Copy full SHA for 6d3ed82

• Inline get_col_type

  drwl

  committed
  c376899

  Copy full SHA for c376899

• Extract ColumnWrapper into its own file

  drwl

  committed
  de654ae

  Copy full SHA for de654ae

• Move more into ColumnWrapper

  drwl

  committed
  30e430b

  Copy full SHA for 30e430b

• Remove col_type arg from ColumnThing#get_attributes

  drwl

  committed
  8a9398c

  Copy full SHA for 8a9398c

• Inline #column_type

  drwl

  committed
  db3025c

  Copy full SHA for db3025c

• Change string append to string concatenate

  drwl

  committed
  fdcc44c

  Copy full SHA for fdcc44c

• Change string append to string concatenate

  drwl

  committed
  047b054

  Copy full SHA for 047b054

• Add comment about table_exists? check

  drwl

  committed
  3ecbb1e

  Copy full SHA for 3ecbb1e

• Rename ColumnThing => ColumnAnnotationBuilder

  drwl

  committed
  91ad31a

  Copy full SHA for 91ad31a

• Rename #get_attributes => #build

  drwl

  committed
  0edaf23

  Copy full SHA for 0edaf23

• Comment conditional

  drwl

  committed
  97fdd2f

  Copy full SHA for 97fdd2f

• Change return type; Stop modifying string in place

  drwl

  committed
  66658ad

  Copy full SHA for 66658ad

Commits on May 9, 2023

• Simplify conditional

  drwl

  committed
  1334646

  Copy full SHA for 1334646

• Separate column type and attributes logic

  drwl

  committed
  56c6172

  Copy full SHA for 56c6172

• Join column type conditional

  drwl

  committed
  3bf4975

  Copy full SHA for 3bf4975

• Extract ColumnTypeBuilder

  drwl

  committed
  30b1eae

  Copy full SHA for 30b1eae

• Rename ColumnAnnotationBuilder => ColumnAttributesBuilder; Remove column type logic from it

  drwl

  committed
  8c513f1

  Copy full SHA for 8c513f1

• Tidy AnnotationGenerator#add_column_info

  drwl

  committed
  00fa727

  Copy full SHA for 00fa727

• Extract column annotation building into own class

  drwl

  committed
  8301a20

  Copy full SHA for 8301a20

• Extract index annotation building logic

  drwl

  committed
  3afba3d

  Copy full SHA for 3afba3d

• Extract foreign key annotation building

  drwl

  committed
  058c0bd

  Copy full SHA for 058c0bd

• Inline method

  drwl

  committed
  ac0d2bd

  Copy full SHA for ac0d2bd

• Change string appends to string concatenation

  drwl

  committed
  2e3c786

  Copy full SHA for 2e3c786

• Replace instances of klass

  drwl

  committed
  63672d1

  Copy full SHA for 63672d1

• Rename ModelThing => ModelWrapper

  drwl

  committed
  68c471a

  Copy full SHA for 68c471a

• Convert #schema_footer_text to build string array

  drwl

  committed
  8eb2f41

  Copy full SHA for 8eb2f41

• Remove SchemaInfo class

  drwl

  committed
  b88f53e

  Copy full SHA for b88f53e

• Add tests for ColumnTypeBuilder

  drwl

  committed
  ea75872

  Copy full SHA for ea75872

• Add tests for ColumnAttributesBuilder

  drwl

  committed
  8ca985d

  Copy full SHA for 8ca985d

• Add tests for hide_limit_column_types option

  drwl

  committed
  55a4588

  Copy full SHA for 55a4588

• Update instance of SchemaInfo

  drwl

  committed
  fd1ab6c

  Copy full SHA for fd1ab6c