sequel 4.49.0 → 5.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (484) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +130 -0
  3. data/README.rdoc +195 -136
  4. data/Rakefile +26 -42
  5. data/bin/sequel +6 -9
  6. data/doc/advanced_associations.rdoc +91 -168
  7. data/doc/association_basics.rdoc +197 -274
  8. data/doc/bin_sequel.rdoc +5 -3
  9. data/doc/cheat_sheet.rdoc +66 -43
  10. data/doc/code_order.rdoc +1 -8
  11. data/doc/core_extensions.rdoc +81 -56
  12. data/doc/dataset_basics.rdoc +8 -17
  13. data/doc/dataset_filtering.rdoc +81 -86
  14. data/doc/extensions.rdoc +3 -10
  15. data/doc/mass_assignment.rdoc +73 -30
  16. data/doc/migration.rdoc +19 -36
  17. data/doc/model_dataset_method_design.rdoc +14 -17
  18. data/doc/model_hooks.rdoc +15 -25
  19. data/doc/model_plugins.rdoc +10 -10
  20. data/doc/mssql_stored_procedures.rdoc +3 -3
  21. data/doc/object_model.rdoc +52 -70
  22. data/doc/opening_databases.rdoc +39 -32
  23. data/doc/postgresql.rdoc +48 -38
  24. data/doc/prepared_statements.rdoc +27 -22
  25. data/doc/querying.rdoc +173 -150
  26. data/doc/reflection.rdoc +5 -6
  27. data/doc/release_notes/5.0.0.txt +159 -0
  28. data/doc/release_notes/5.1.0.txt +31 -0
  29. data/doc/release_notes/5.2.0.txt +33 -0
  30. data/doc/release_notes/5.3.0.txt +121 -0
  31. data/doc/schema_modification.rdoc +78 -64
  32. data/doc/security.rdoc +97 -88
  33. data/doc/sharding.rdoc +43 -30
  34. data/doc/sql.rdoc +53 -65
  35. data/doc/testing.rdoc +4 -5
  36. data/doc/thread_safety.rdoc +2 -4
  37. data/doc/transactions.rdoc +18 -17
  38. data/doc/validations.rdoc +48 -45
  39. data/doc/virtual_rows.rdoc +87 -115
  40. data/lib/sequel/adapters/ado/access.rb +7 -13
  41. data/lib/sequel/adapters/ado/mssql.rb +2 -9
  42. data/lib/sequel/adapters/ado.rb +9 -25
  43. data/lib/sequel/adapters/amalgalite.rb +3 -18
  44. data/lib/sequel/adapters/ibmdb.rb +9 -45
  45. data/lib/sequel/adapters/jdbc/db2.rb +8 -37
  46. data/lib/sequel/adapters/jdbc/derby.rb +4 -50
  47. data/lib/sequel/adapters/jdbc/h2.rb +6 -26
  48. data/lib/sequel/adapters/jdbc/hsqldb.rb +2 -27
  49. data/lib/sequel/adapters/jdbc/jtds.rb +2 -9
  50. data/lib/sequel/adapters/jdbc/mssql.rb +1 -11
  51. data/lib/sequel/adapters/jdbc/mysql.rb +11 -15
  52. data/lib/sequel/adapters/jdbc/oracle.rb +4 -26
  53. data/lib/sequel/adapters/jdbc/postgresql.rb +23 -33
  54. data/lib/sequel/adapters/jdbc/sqlanywhere.rb +4 -17
  55. data/lib/sequel/adapters/jdbc/sqlite.rb +1 -7
  56. data/lib/sequel/adapters/jdbc/sqlserver.rb +1 -13
  57. data/lib/sequel/adapters/jdbc/transactions.rb +1 -14
  58. data/lib/sequel/adapters/jdbc.rb +18 -74
  59. data/lib/sequel/adapters/mock.rb +4 -30
  60. data/lib/sequel/adapters/mysql.rb +7 -44
  61. data/lib/sequel/adapters/mysql2.rb +5 -23
  62. data/lib/sequel/adapters/odbc/db2.rb +1 -1
  63. data/lib/sequel/adapters/odbc/mssql.rb +4 -12
  64. data/lib/sequel/adapters/odbc/oracle.rb +1 -1
  65. data/lib/sequel/adapters/odbc.rb +0 -19
  66. data/lib/sequel/adapters/oracle.rb +8 -13
  67. data/lib/sequel/adapters/postgres.rb +28 -150
  68. data/lib/sequel/adapters/postgresql.rb +1 -1
  69. data/lib/sequel/adapters/shared/access.rb +11 -51
  70. data/lib/sequel/adapters/shared/db2.rb +3 -61
  71. data/lib/sequel/adapters/shared/mssql.rb +21 -157
  72. data/lib/sequel/adapters/shared/mysql.rb +61 -227
  73. data/lib/sequel/adapters/shared/oracle.rb +13 -41
  74. data/lib/sequel/adapters/shared/postgres.rb +58 -264
  75. data/lib/sequel/adapters/shared/sqlanywhere.rb +4 -96
  76. data/lib/sequel/adapters/shared/sqlite.rb +22 -101
  77. data/lib/sequel/adapters/sqlanywhere.rb +4 -23
  78. data/lib/sequel/adapters/sqlite.rb +2 -19
  79. data/lib/sequel/adapters/tinytds.rb +5 -15
  80. data/lib/sequel/adapters/utils/emulate_offset_with_row_number.rb +1 -1
  81. data/lib/sequel/adapters/utils/mysql_mysql2.rb +4 -4
  82. data/lib/sequel/adapters/utils/mysql_prepared_statements.rb +3 -6
  83. data/lib/sequel/adapters/utils/replace.rb +0 -5
  84. data/lib/sequel/adapters/utils/stored_procedures.rb +0 -2
  85. data/lib/sequel/adapters/utils/unmodified_identifiers.rb +2 -0
  86. data/lib/sequel/ast_transformer.rb +3 -94
  87. data/lib/sequel/connection_pool/sharded_single.rb +1 -4
  88. data/lib/sequel/connection_pool/sharded_threaded.rb +97 -95
  89. data/lib/sequel/connection_pool/single.rb +0 -2
  90. data/lib/sequel/connection_pool/threaded.rb +94 -110
  91. data/lib/sequel/connection_pool.rb +38 -28
  92. data/lib/sequel/core.rb +42 -101
  93. data/lib/sequel/database/connecting.rb +23 -60
  94. data/lib/sequel/database/dataset.rb +6 -9
  95. data/lib/sequel/database/dataset_defaults.rb +4 -48
  96. data/lib/sequel/database/features.rb +5 -4
  97. data/lib/sequel/database/logging.rb +2 -9
  98. data/lib/sequel/database/misc.rb +36 -55
  99. data/lib/sequel/database/query.rb +8 -13
  100. data/lib/sequel/database/schema_generator.rb +93 -64
  101. data/lib/sequel/database/schema_methods.rb +61 -79
  102. data/lib/sequel/database/transactions.rb +4 -24
  103. data/lib/sequel/database.rb +12 -2
  104. data/lib/sequel/dataset/actions.rb +57 -107
  105. data/lib/sequel/dataset/dataset_module.rb +4 -16
  106. data/lib/sequel/dataset/features.rb +35 -30
  107. data/lib/sequel/dataset/graph.rb +40 -49
  108. data/lib/sequel/dataset/misc.rb +12 -37
  109. data/lib/sequel/dataset/placeholder_literalizer.rb +4 -4
  110. data/lib/sequel/dataset/prepared_statements.rb +23 -51
  111. data/lib/sequel/dataset/query.rb +91 -161
  112. data/lib/sequel/dataset/sql.rb +33 -225
  113. data/lib/sequel/dataset.rb +18 -10
  114. data/lib/sequel/deprecated.rb +18 -27
  115. data/lib/sequel/exceptions.rb +1 -17
  116. data/lib/sequel/extensions/_model_pg_row.rb +0 -7
  117. data/lib/sequel/extensions/_pretty_table.rb +1 -3
  118. data/lib/sequel/extensions/arbitrary_servers.rb +10 -10
  119. data/lib/sequel/extensions/connection_expiration.rb +1 -1
  120. data/lib/sequel/extensions/connection_validator.rb +1 -1
  121. data/lib/sequel/extensions/constraint_validations.rb +11 -11
  122. data/lib/sequel/extensions/core_extensions.rb +39 -49
  123. data/lib/sequel/extensions/core_refinements.rb +39 -45
  124. data/lib/sequel/extensions/current_datetime_timestamp.rb +0 -4
  125. data/lib/sequel/extensions/date_arithmetic.rb +7 -7
  126. data/lib/sequel/extensions/duplicate_columns_handler.rb +12 -9
  127. data/lib/sequel/extensions/empty_array_consider_nulls.rb +2 -2
  128. data/lib/sequel/extensions/eval_inspect.rb +4 -11
  129. data/lib/sequel/extensions/freeze_datasets.rb +1 -69
  130. data/lib/sequel/extensions/from_block.rb +1 -35
  131. data/lib/sequel/extensions/graph_each.rb +2 -2
  132. data/lib/sequel/extensions/identifier_mangling.rb +9 -19
  133. data/lib/sequel/extensions/implicit_subquery.rb +2 -2
  134. data/lib/sequel/extensions/inflector.rb +4 -4
  135. data/lib/sequel/extensions/migration.rb +27 -43
  136. data/lib/sequel/extensions/no_auto_literal_strings.rb +2 -84
  137. data/lib/sequel/extensions/null_dataset.rb +2 -8
  138. data/lib/sequel/extensions/pagination.rb +1 -17
  139. data/lib/sequel/extensions/pg_array.rb +20 -189
  140. data/lib/sequel/extensions/pg_extended_date_support.rb +230 -0
  141. data/lib/sequel/extensions/pg_hstore.rb +11 -50
  142. data/lib/sequel/extensions/pg_hstore_ops.rb +2 -2
  143. data/lib/sequel/extensions/pg_inet.rb +3 -16
  144. data/lib/sequel/extensions/pg_interval.rb +1 -20
  145. data/lib/sequel/extensions/pg_json.rb +7 -27
  146. data/lib/sequel/extensions/pg_loose_count.rb +1 -1
  147. data/lib/sequel/extensions/pg_range.rb +6 -121
  148. data/lib/sequel/extensions/pg_range_ops.rb +1 -3
  149. data/lib/sequel/extensions/pg_row.rb +5 -77
  150. data/lib/sequel/extensions/pg_row_ops.rb +2 -13
  151. data/lib/sequel/extensions/query.rb +3 -4
  152. data/lib/sequel/extensions/round_timestamps.rb +0 -6
  153. data/lib/sequel/extensions/schema_dumper.rb +13 -13
  154. data/lib/sequel/extensions/select_remove.rb +3 -3
  155. data/lib/sequel/extensions/split_array_nil.rb +2 -2
  156. data/lib/sequel/extensions/sql_comments.rb +2 -2
  157. data/lib/sequel/extensions/string_agg.rb +11 -8
  158. data/lib/sequel/extensions/symbol_aref.rb +6 -20
  159. data/lib/sequel/extensions/synchronize_sql.rb +45 -0
  160. data/lib/sequel/model/associations.rb +129 -131
  161. data/lib/sequel/model/base.rb +133 -731
  162. data/lib/sequel/model/default_inflections.rb +1 -1
  163. data/lib/sequel/model/errors.rb +0 -3
  164. data/lib/sequel/model/exceptions.rb +2 -6
  165. data/lib/sequel/model/inflections.rb +1 -26
  166. data/lib/sequel/model/plugins.rb +1 -0
  167. data/lib/sequel/model.rb +27 -62
  168. data/lib/sequel/plugins/active_model.rb +2 -5
  169. data/lib/sequel/plugins/association_dependencies.rb +15 -15
  170. data/lib/sequel/plugins/association_pks.rb +14 -28
  171. data/lib/sequel/plugins/association_proxies.rb +6 -7
  172. data/lib/sequel/plugins/auto_validations.rb +4 -4
  173. data/lib/sequel/plugins/before_after_save.rb +0 -43
  174. data/lib/sequel/plugins/blacklist_security.rb +9 -8
  175. data/lib/sequel/plugins/boolean_readers.rb +3 -3
  176. data/lib/sequel/plugins/boolean_subsets.rb +2 -2
  177. data/lib/sequel/plugins/caching.rb +5 -5
  178. data/lib/sequel/plugins/class_table_inheritance.rb +71 -102
  179. data/lib/sequel/plugins/column_conflicts.rb +2 -2
  180. data/lib/sequel/plugins/column_select.rb +2 -2
  181. data/lib/sequel/plugins/composition.rb +15 -24
  182. data/lib/sequel/plugins/constraint_validations.rb +4 -3
  183. data/lib/sequel/plugins/csv_serializer.rb +13 -20
  184. data/lib/sequel/plugins/dataset_associations.rb +2 -2
  185. data/lib/sequel/plugins/def_dataset_method.rb +5 -5
  186. data/lib/sequel/plugins/defaults_setter.rb +1 -1
  187. data/lib/sequel/plugins/delay_add_association.rb +1 -1
  188. data/lib/sequel/plugins/finder.rb +16 -10
  189. data/lib/sequel/plugins/force_encoding.rb +1 -7
  190. data/lib/sequel/plugins/hook_class_methods.rb +4 -106
  191. data/lib/sequel/plugins/input_transformer.rb +10 -11
  192. data/lib/sequel/plugins/insert_returning_select.rb +1 -9
  193. data/lib/sequel/plugins/instance_filters.rb +5 -5
  194. data/lib/sequel/plugins/instance_hooks.rb +7 -52
  195. data/lib/sequel/plugins/inverted_subsets.rb +3 -1
  196. data/lib/sequel/plugins/json_serializer.rb +19 -19
  197. data/lib/sequel/plugins/lazy_attributes.rb +1 -10
  198. data/lib/sequel/plugins/list.rb +6 -6
  199. data/lib/sequel/plugins/many_through_many.rb +11 -8
  200. data/lib/sequel/plugins/mssql_optimistic_locking.rb +3 -3
  201. data/lib/sequel/plugins/nested_attributes.rb +18 -31
  202. data/lib/sequel/plugins/optimistic_locking.rb +3 -3
  203. data/lib/sequel/plugins/pg_array_associations.rb +8 -2
  204. data/lib/sequel/plugins/pg_row.rb +2 -11
  205. data/lib/sequel/plugins/prepared_statements.rb +13 -66
  206. data/lib/sequel/plugins/prepared_statements_safe.rb +1 -1
  207. data/lib/sequel/plugins/rcte_tree.rb +7 -7
  208. data/lib/sequel/plugins/serialization.rb +15 -33
  209. data/lib/sequel/plugins/serialization_modification_detection.rb +1 -1
  210. data/lib/sequel/plugins/sharding.rb +2 -8
  211. data/lib/sequel/plugins/single_table_inheritance.rb +10 -13
  212. data/lib/sequel/plugins/skip_create_refresh.rb +3 -3
  213. data/lib/sequel/plugins/static_cache.rb +8 -9
  214. data/lib/sequel/plugins/string_stripper.rb +3 -3
  215. data/lib/sequel/plugins/subclasses.rb +1 -1
  216. data/lib/sequel/plugins/subset_conditions.rb +2 -2
  217. data/lib/sequel/plugins/table_select.rb +2 -2
  218. data/lib/sequel/plugins/tactical_eager_loading.rb +4 -4
  219. data/lib/sequel/plugins/timestamps.rb +6 -7
  220. data/lib/sequel/plugins/touch.rb +4 -8
  221. data/lib/sequel/plugins/tree.rb +3 -3
  222. data/lib/sequel/plugins/typecast_on_load.rb +2 -2
  223. data/lib/sequel/plugins/unlimited_update.rb +1 -7
  224. data/lib/sequel/plugins/update_or_create.rb +3 -3
  225. data/lib/sequel/plugins/update_refresh.rb +3 -3
  226. data/lib/sequel/plugins/uuid.rb +7 -11
  227. data/lib/sequel/plugins/validation_class_methods.rb +10 -9
  228. data/lib/sequel/plugins/validation_contexts.rb +4 -4
  229. data/lib/sequel/plugins/validation_helpers.rb +26 -25
  230. data/lib/sequel/plugins/whitelist_security.rb +13 -9
  231. data/lib/sequel/plugins/xml_serializer.rb +24 -25
  232. data/lib/sequel/sql.rb +145 -276
  233. data/lib/sequel/timezones.rb +8 -23
  234. data/lib/sequel/version.rb +2 -2
  235. data/lib/sequel.rb +1 -1
  236. data/spec/adapter_spec.rb +1 -1
  237. data/spec/adapters/db2_spec.rb +2 -103
  238. data/spec/adapters/mssql_spec.rb +89 -68
  239. data/spec/adapters/mysql_spec.rb +111 -478
  240. data/spec/adapters/oracle_spec.rb +1 -9
  241. data/spec/adapters/postgres_spec.rb +459 -664
  242. data/spec/adapters/spec_helper.rb +12 -31
  243. data/spec/adapters/sqlanywhere_spec.rb +2 -77
  244. data/spec/adapters/sqlite_spec.rb +8 -146
  245. data/spec/bin_spec.rb +11 -16
  246. data/spec/core/connection_pool_spec.rb +173 -74
  247. data/spec/core/database_spec.rb +96 -244
  248. data/spec/core/dataset_spec.rb +99 -414
  249. data/spec/core/deprecated_spec.rb +3 -3
  250. data/spec/core/expression_filters_spec.rb +37 -144
  251. data/spec/core/mock_adapter_spec.rb +241 -4
  252. data/spec/core/object_graph_spec.rb +11 -60
  253. data/spec/core/placeholder_literalizer_spec.rb +1 -14
  254. data/spec/core/schema_generator_spec.rb +51 -40
  255. data/spec/core/schema_spec.rb +88 -77
  256. data/spec/core/spec_helper.rb +6 -24
  257. data/spec/core/version_spec.rb +1 -1
  258. data/spec/core_extensions_spec.rb +7 -83
  259. data/spec/core_model_spec.rb +2 -2
  260. data/spec/deprecation_helper.rb +2 -14
  261. data/spec/extensions/accessed_columns_spec.rb +1 -1
  262. data/spec/extensions/active_model_spec.rb +3 -3
  263. data/spec/extensions/after_initialize_spec.rb +1 -1
  264. data/spec/extensions/arbitrary_servers_spec.rb +2 -2
  265. data/spec/extensions/association_dependencies_spec.rb +1 -1
  266. data/spec/extensions/association_pks_spec.rb +30 -92
  267. data/spec/extensions/association_proxies_spec.rb +1 -1
  268. data/spec/extensions/auto_literal_strings_spec.rb +1 -12
  269. data/spec/extensions/auto_validations_spec.rb +1 -1
  270. data/spec/extensions/blacklist_security_spec.rb +1 -1
  271. data/spec/extensions/blank_spec.rb +1 -1
  272. data/spec/extensions/boolean_readers_spec.rb +1 -1
  273. data/spec/extensions/boolean_subsets_spec.rb +1 -1
  274. data/spec/extensions/caching_spec.rb +1 -1
  275. data/spec/extensions/class_table_inheritance_spec.rb +53 -1118
  276. data/spec/extensions/column_conflicts_spec.rb +1 -1
  277. data/spec/extensions/column_select_spec.rb +4 -4
  278. data/spec/extensions/columns_introspection_spec.rb +1 -1
  279. data/spec/extensions/columns_updated_spec.rb +1 -1
  280. data/spec/extensions/composition_spec.rb +8 -30
  281. data/spec/extensions/connection_expiration_spec.rb +3 -3
  282. data/spec/extensions/connection_validator_spec.rb +3 -3
  283. data/spec/extensions/constraint_validations_plugin_spec.rb +1 -1
  284. data/spec/extensions/constraint_validations_spec.rb +1 -1
  285. data/spec/extensions/core_refinements_spec.rb +1 -3
  286. data/spec/extensions/csv_serializer_spec.rb +4 -9
  287. data/spec/extensions/current_datetime_timestamp_spec.rb +1 -1
  288. data/spec/extensions/dataset_associations_spec.rb +2 -1
  289. data/spec/extensions/dataset_source_alias_spec.rb +1 -1
  290. data/spec/extensions/date_arithmetic_spec.rb +3 -3
  291. data/spec/extensions/def_dataset_method_spec.rb +1 -1
  292. data/spec/extensions/defaults_setter_spec.rb +2 -2
  293. data/spec/extensions/delay_add_association_spec.rb +8 -9
  294. data/spec/extensions/dirty_spec.rb +1 -1
  295. data/spec/extensions/duplicate_columns_handler_spec.rb +1 -1
  296. data/spec/extensions/eager_each_spec.rb +2 -2
  297. data/spec/extensions/empty_array_consider_nulls_spec.rb +1 -1
  298. data/spec/extensions/error_splitter_spec.rb +1 -1
  299. data/spec/extensions/error_sql_spec.rb +1 -1
  300. data/spec/extensions/eval_inspect_spec.rb +1 -1
  301. data/spec/extensions/finder_spec.rb +1 -1
  302. data/spec/extensions/force_encoding_spec.rb +2 -5
  303. data/spec/extensions/freeze_datasets_spec.rb +1 -1
  304. data/spec/extensions/graph_each_spec.rb +5 -5
  305. data/spec/extensions/hook_class_methods_spec.rb +1 -194
  306. data/spec/extensions/identifier_mangling_spec.rb +17 -170
  307. data/spec/extensions/implicit_subquery_spec.rb +1 -5
  308. data/spec/extensions/inflector_spec.rb +1 -1
  309. data/spec/extensions/input_transformer_spec.rb +7 -2
  310. data/spec/extensions/insert_returning_select_spec.rb +1 -1
  311. data/spec/extensions/instance_filters_spec.rb +1 -1
  312. data/spec/extensions/instance_hooks_spec.rb +1 -95
  313. data/spec/extensions/inverted_subsets_spec.rb +1 -1
  314. data/spec/extensions/json_serializer_spec.rb +1 -1
  315. data/spec/extensions/lazy_attributes_spec.rb +1 -7
  316. data/spec/extensions/list_spec.rb +5 -6
  317. data/spec/extensions/looser_typecasting_spec.rb +1 -1
  318. data/spec/extensions/many_through_many_spec.rb +25 -33
  319. data/spec/extensions/migration_spec.rb +12 -2
  320. data/spec/extensions/modification_detection_spec.rb +1 -1
  321. data/spec/extensions/mssql_optimistic_locking_spec.rb +1 -1
  322. data/spec/extensions/named_timezones_spec.rb +3 -3
  323. data/spec/extensions/nested_attributes_spec.rb +1 -29
  324. data/spec/extensions/null_dataset_spec.rb +1 -11
  325. data/spec/extensions/optimistic_locking_spec.rb +2 -2
  326. data/spec/extensions/pagination_spec.rb +1 -1
  327. data/spec/extensions/pg_array_associations_spec.rb +22 -26
  328. data/spec/extensions/pg_array_ops_spec.rb +1 -1
  329. data/spec/extensions/pg_array_spec.rb +3 -48
  330. data/spec/extensions/pg_enum_spec.rb +1 -1
  331. data/spec/extensions/pg_extended_date_support_spec.rb +122 -0
  332. data/spec/extensions/pg_hstore_ops_spec.rb +1 -1
  333. data/spec/extensions/pg_hstore_spec.rb +22 -31
  334. data/spec/extensions/pg_inet_ops_spec.rb +1 -1
  335. data/spec/extensions/pg_inet_spec.rb +1 -14
  336. data/spec/extensions/pg_interval_spec.rb +3 -13
  337. data/spec/extensions/pg_json_ops_spec.rb +1 -1
  338. data/spec/extensions/pg_json_spec.rb +1 -13
  339. data/spec/extensions/pg_loose_count_spec.rb +1 -1
  340. data/spec/extensions/pg_range_ops_spec.rb +1 -1
  341. data/spec/extensions/pg_range_spec.rb +3 -88
  342. data/spec/extensions/pg_row_ops_spec.rb +1 -1
  343. data/spec/extensions/pg_row_plugin_spec.rb +1 -1
  344. data/spec/extensions/pg_row_spec.rb +1 -44
  345. data/spec/extensions/pg_static_cache_updater_spec.rb +1 -1
  346. data/spec/extensions/prepared_statements_safe_spec.rb +7 -7
  347. data/spec/extensions/prepared_statements_spec.rb +13 -48
  348. data/spec/extensions/pretty_table_spec.rb +40 -9
  349. data/spec/extensions/query_spec.rb +1 -12
  350. data/spec/extensions/rcte_tree_spec.rb +23 -34
  351. data/spec/extensions/round_timestamps_spec.rb +1 -5
  352. data/spec/extensions/s_spec.rb +1 -1
  353. data/spec/extensions/schema_caching_spec.rb +1 -1
  354. data/spec/extensions/schema_dumper_spec.rb +43 -32
  355. data/spec/extensions/select_remove_spec.rb +1 -1
  356. data/spec/extensions/sequel_4_dataset_methods_spec.rb +1 -1
  357. data/spec/extensions/serialization_modification_detection_spec.rb +1 -1
  358. data/spec/extensions/serialization_spec.rb +5 -17
  359. data/spec/extensions/server_block_spec.rb +1 -1
  360. data/spec/extensions/server_logging_spec.rb +2 -2
  361. data/spec/extensions/sharding_spec.rb +1 -1
  362. data/spec/extensions/shared_caching_spec.rb +1 -28
  363. data/spec/extensions/single_table_inheritance_spec.rb +2 -5
  364. data/spec/extensions/singular_table_names_spec.rb +1 -1
  365. data/spec/extensions/skip_create_refresh_spec.rb +1 -1
  366. data/spec/extensions/spec_helper.rb +5 -27
  367. data/spec/extensions/split_array_nil_spec.rb +1 -1
  368. data/spec/extensions/split_values_spec.rb +1 -1
  369. data/spec/extensions/sql_comments_spec.rb +1 -1
  370. data/spec/extensions/sql_expr_spec.rb +1 -1
  371. data/spec/extensions/static_cache_spec.rb +1 -1
  372. data/spec/extensions/string_agg_spec.rb +2 -2
  373. data/spec/extensions/string_date_time_spec.rb +1 -1
  374. data/spec/extensions/string_stripper_spec.rb +1 -1
  375. data/spec/extensions/subclasses_spec.rb +1 -1
  376. data/spec/extensions/subset_conditions_spec.rb +1 -1
  377. data/spec/extensions/symbol_aref_refinement_spec.rb +1 -1
  378. data/spec/extensions/symbol_as_refinement_spec.rb +1 -1
  379. data/spec/extensions/synchronize_sql_spec.rb +124 -0
  380. data/spec/extensions/table_select_spec.rb +4 -4
  381. data/spec/extensions/tactical_eager_loading_spec.rb +1 -6
  382. data/spec/extensions/thread_local_timezones_spec.rb +1 -1
  383. data/spec/extensions/timestamps_spec.rb +5 -7
  384. data/spec/extensions/to_dot_spec.rb +1 -1
  385. data/spec/extensions/touch_spec.rb +1 -1
  386. data/spec/extensions/tree_spec.rb +1 -1
  387. data/spec/extensions/typecast_on_load_spec.rb +1 -1
  388. data/spec/extensions/unlimited_update_spec.rb +1 -1
  389. data/spec/extensions/update_or_create_spec.rb +12 -16
  390. data/spec/extensions/update_primary_key_spec.rb +4 -3
  391. data/spec/extensions/update_refresh_spec.rb +1 -1
  392. data/spec/extensions/uuid_spec.rb +10 -13
  393. data/spec/extensions/validate_associated_spec.rb +1 -1
  394. data/spec/extensions/validation_class_methods_spec.rb +3 -3
  395. data/spec/extensions/validation_contexts_spec.rb +1 -1
  396. data/spec/extensions/validation_helpers_spec.rb +10 -44
  397. data/spec/extensions/whitelist_security_spec.rb +5 -5
  398. data/spec/extensions/xml_serializer_spec.rb +8 -13
  399. data/spec/guards_helper.rb +2 -1
  400. data/spec/integration/associations_test.rb +1 -23
  401. data/spec/integration/database_test.rb +7 -7
  402. data/spec/integration/dataset_test.rb +12 -47
  403. data/spec/integration/eager_loader_test.rb +1 -1
  404. data/spec/integration/migrator_test.rb +1 -1
  405. data/spec/integration/model_test.rb +4 -82
  406. data/spec/integration/plugin_test.rb +7 -23
  407. data/spec/integration/prepared_statement_test.rb +8 -88
  408. data/spec/integration/schema_test.rb +10 -10
  409. data/spec/integration/spec_helper.rb +17 -21
  410. data/spec/integration/timezone_test.rb +5 -5
  411. data/spec/integration/transaction_test.rb +3 -55
  412. data/spec/integration/type_test.rb +9 -9
  413. data/spec/model/association_reflection_spec.rb +24 -9
  414. data/spec/model/associations_spec.rb +124 -303
  415. data/spec/model/base_spec.rb +43 -137
  416. data/spec/model/class_dataset_methods_spec.rb +2 -20
  417. data/spec/model/dataset_methods_spec.rb +1 -20
  418. data/spec/model/eager_loading_spec.rb +48 -17
  419. data/spec/model/hooks_spec.rb +5 -300
  420. data/spec/model/inflector_spec.rb +1 -1
  421. data/spec/model/model_spec.rb +29 -339
  422. data/spec/model/plugins_spec.rb +2 -16
  423. data/spec/model/record_spec.rb +33 -129
  424. data/spec/model/spec_helper.rb +5 -15
  425. data/spec/model/validations_spec.rb +1 -1
  426. data/spec/sequel_warning.rb +1 -12
  427. metadata +19 -65
  428. data/doc/active_record.rdoc +0 -927
  429. data/lib/sequel/adapters/cubrid.rb +0 -160
  430. data/lib/sequel/adapters/do/mysql.rb +0 -69
  431. data/lib/sequel/adapters/do/postgres.rb +0 -46
  432. data/lib/sequel/adapters/do/sqlite3.rb +0 -41
  433. data/lib/sequel/adapters/do.rb +0 -166
  434. data/lib/sequel/adapters/jdbc/as400.rb +0 -92
  435. data/lib/sequel/adapters/jdbc/cubrid.rb +0 -65
  436. data/lib/sequel/adapters/jdbc/firebirdsql.rb +0 -37
  437. data/lib/sequel/adapters/jdbc/informix-sqli.rb +0 -34
  438. data/lib/sequel/adapters/jdbc/jdbcprogress.rb +0 -34
  439. data/lib/sequel/adapters/odbc/progress.rb +0 -12
  440. data/lib/sequel/adapters/shared/cubrid.rb +0 -245
  441. data/lib/sequel/adapters/shared/firebird.rb +0 -261
  442. data/lib/sequel/adapters/shared/informix.rb +0 -63
  443. data/lib/sequel/adapters/shared/progress.rb +0 -40
  444. data/lib/sequel/adapters/swift/mysql.rb +0 -50
  445. data/lib/sequel/adapters/swift/postgres.rb +0 -49
  446. data/lib/sequel/adapters/swift/sqlite.rb +0 -48
  447. data/lib/sequel/adapters/swift.rb +0 -169
  448. data/lib/sequel/adapters/utils/pg_types.rb +0 -4
  449. data/lib/sequel/dataset/mutation.rb +0 -98
  450. data/lib/sequel/extensions/_deprecated_identifier_mangling.rb +0 -117
  451. data/lib/sequel/extensions/empty_array_ignore_nulls.rb +0 -8
  452. data/lib/sequel/extensions/filter_having.rb +0 -65
  453. data/lib/sequel/extensions/hash_aliases.rb +0 -51
  454. data/lib/sequel/extensions/meta_def.rb +0 -37
  455. data/lib/sequel/extensions/query_literals.rb +0 -86
  456. data/lib/sequel/extensions/ruby18_symbol_extensions.rb +0 -26
  457. data/lib/sequel/extensions/sequel_3_dataset_methods.rb +0 -133
  458. data/lib/sequel/extensions/set_overrides.rb +0 -82
  459. data/lib/sequel/no_core_ext.rb +0 -4
  460. data/lib/sequel/plugins/association_autoreloading.rb +0 -11
  461. data/lib/sequel/plugins/identifier_columns.rb +0 -49
  462. data/lib/sequel/plugins/many_to_one_pk_lookup.rb +0 -11
  463. data/lib/sequel/plugins/pg_typecast_on_load.rb +0 -90
  464. data/lib/sequel/plugins/prepared_statements_associations.rb +0 -137
  465. data/lib/sequel/plugins/prepared_statements_with_pk.rb +0 -71
  466. data/lib/sequel/plugins/schema.rb +0 -84
  467. data/lib/sequel/plugins/scissors.rb +0 -37
  468. data/spec/core/dataset_mutation_spec.rb +0 -253
  469. data/spec/extensions/_deprecated_identifier_mangling_spec.rb +0 -314
  470. data/spec/extensions/before_after_save_spec.rb +0 -40
  471. data/spec/extensions/filter_having_spec.rb +0 -42
  472. data/spec/extensions/from_block_spec.rb +0 -21
  473. data/spec/extensions/hash_aliases_spec.rb +0 -26
  474. data/spec/extensions/identifier_columns_spec.rb +0 -19
  475. data/spec/extensions/meta_def_spec.rb +0 -35
  476. data/spec/extensions/no_auto_literal_strings_spec.rb +0 -69
  477. data/spec/extensions/pg_typecast_on_load_spec.rb +0 -70
  478. data/spec/extensions/prepared_statements_associations_spec.rb +0 -212
  479. data/spec/extensions/prepared_statements_with_pk_spec.rb +0 -40
  480. data/spec/extensions/query_literals_spec.rb +0 -185
  481. data/spec/extensions/schema_spec.rb +0 -123
  482. data/spec/extensions/scissors_spec.rb +0 -27
  483. data/spec/extensions/sequel_3_dataset_methods_spec.rb +0 -118
  484. data/spec/extensions/set_overrides_spec.rb +0 -75
@@ -4,53 +4,17 @@ module Sequel
4
4
  module SqlAnywhere
5
5
  Sequel::Database.set_shared_adapter_scheme(:sqlanywhere, self)
6
6
 
7
- # SEQUEL5: Remove
8
- @convert_smallint_to_bool = true
9
- class << self
10
- def convert_smallint_to_bool
11
- Sequel::Deprecation.deprecate("Sequel::SqlAnywhere.convert_smallint_to_bool", "Call this method on the Database instance")
12
- @convert_smallint_to_bool
13
- end
14
- def convert_smallint_to_bool=(v)
15
- Sequel::Deprecation.deprecate("Sequel::SqlAnywhere.convert_smallint_to_bool=", "Call this method on the Database instance")
16
- @convert_smallint_to_bool = v
17
- end
18
- end
19
-
20
7
  module DatabaseMethods
21
8
  attr_reader :conversion_procs
22
9
 
23
- # Override the default SqlAnywhere.convert_smallint_to_bool setting for this database.
24
- attr_writer :convert_smallint_to_bool
25
-
26
- AUTO_INCREMENT = 'IDENTITY'.freeze
27
- Sequel::Deprecation.deprecate_constant(self, :AUTO_INCREMENT)
28
- SQL_BEGIN = "BEGIN TRANSACTION".freeze
29
- Sequel::Deprecation.deprecate_constant(self, :SQL_BEGIN)
30
- SQL_COMMIT = "COMMIT TRANSACTION".freeze
31
- Sequel::Deprecation.deprecate_constant(self, :SQL_COMMIT)
32
- SQL_ROLLBACK = "IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION".freeze
33
- Sequel::Deprecation.deprecate_constant(self, :SQL_ROLLBACK)
34
- TEMPORARY = "GLOBAL TEMPORARY ".freeze
35
- Sequel::Deprecation.deprecate_constant(self, :TEMPORARY)
36
- SMALLINT_RE = /smallint/i.freeze
37
- Sequel::Deprecation.deprecate_constant(self, :SMALLINT_RE)
38
- DECIMAL_TYPE_RE = /numeric/i
39
- Sequel::Deprecation.deprecate_constant(self, :DECIMAL_TYPE_RE)
40
-
41
- # Whether to convert smallint to boolean arguments for this dataset.
42
- # Defaults to the SqlAnywhere module setting.
43
- def convert_smallint_to_bool
44
- defined?(@convert_smallint_to_bool) ? @convert_smallint_to_bool : (@convert_smallint_to_bool = ::Sequel::SqlAnywhere.instance_variable_get(:@convert_smallint_to_bool)) # true) # SEQUEL5
45
- end
10
+ # Set whether to convert smallint type to boolean for this Database instance
11
+ attr_accessor :convert_smallint_to_bool
46
12
 
47
- # Sysbase Server uses the :sqlanywhere type.
48
13
  def database_type
49
14
  :sqlanywhere
50
15
  end
51
16
 
52
17
  def freeze
53
- convert_smallint_to_bool
54
18
  @conversion_procs.freeze
55
19
  super
56
20
  end
@@ -172,22 +136,18 @@ module Sequel
172
136
  false
173
137
  end
174
138
 
175
- # SQL fragment for marking a table as temporary
176
139
  def temporary_table_sql
177
140
  "GLOBAL TEMPORARY "
178
141
  end
179
142
 
180
- # SQL to BEGIN a transaction.
181
143
  def begin_transaction_sql
182
144
  "BEGIN TRANSACTION"
183
145
  end
184
146
 
185
- # SQL to ROLLBACK a transaction.
186
147
  def rollback_transaction_sql
187
148
  "IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION"
188
149
  end
189
150
 
190
- # SQL to COMMIT a transaction.
191
151
  def commit_transaction_sql
192
152
  "COMMIT TRANSACTION"
193
153
  end
@@ -214,7 +174,6 @@ module Sequel
214
174
  :image
215
175
  end
216
176
 
217
- # Sybase specific syntax for altering tables.
218
177
  def alter_table_sql(table, op)
219
178
  case op[:op]
220
179
  when :add_column
@@ -278,58 +237,9 @@ module Sequel
278
237
  end
279
238
 
280
239
  module DatasetMethods
281
- BOOL_TRUE = '1'.freeze
282
- Sequel::Deprecation.deprecate_constant(self, :BOOL_TRUE)
283
- BOOL_FALSE = '0'.freeze
284
- Sequel::Deprecation.deprecate_constant(self, :BOOL_FALSE)
285
- WILDCARD = LiteralString.new('%').freeze
286
- Sequel::Deprecation.deprecate_constant(self, :WILDCARD)
287
- TOP = " TOP ".freeze
288
- Sequel::Deprecation.deprecate_constant(self, :TOP)
289
- START_AT = " START AT ".freeze
290
- Sequel::Deprecation.deprecate_constant(self, :START_AT)
291
- SQL_WITH_RECURSIVE = "WITH RECURSIVE ".freeze
292
- Sequel::Deprecation.deprecate_constant(self, :SQL_WITH_RECURSIVE)
293
- DATE_FUNCTION = 'today()'.freeze
294
- Sequel::Deprecation.deprecate_constant(self, :DATE_FUNCTION)
295
- NOW_FUNCTION = 'now()'.freeze
296
- Sequel::Deprecation.deprecate_constant(self, :NOW_FUNCTION)
297
- DATEPART = 'datepart'.freeze
298
- Sequel::Deprecation.deprecate_constant(self, :DATEPART)
299
- REGEXP = 'REGEXP'.freeze
300
- Sequel::Deprecation.deprecate_constant(self, :REGEXP)
301
- NOT_REGEXP = 'NOT REGEXP'.freeze
302
- Sequel::Deprecation.deprecate_constant(self, :NOT_REGEXP)
303
- APOS = "'".freeze
304
- Sequel::Deprecation.deprecate_constant(self, :APOS)
305
- APOS_RE = /'/.freeze
306
- Sequel::Deprecation.deprecate_constant(self, :APOS_RE)
307
- DOUBLE_APOS = "''".freeze
308
- Sequel::Deprecation.deprecate_constant(self, :DOUBLE_APOS)
309
- BACKSLASH_RE = /\\/.freeze
310
- Sequel::Deprecation.deprecate_constant(self, :BACKSLASH_RE)
311
- QUAD_BACKSLASH = "\\\\\\\\".freeze
312
- Sequel::Deprecation.deprecate_constant(self, :QUAD_BACKSLASH)
313
- BLOB_START = "0x".freeze
314
- Sequel::Deprecation.deprecate_constant(self, :BLOB_START)
315
- HSTAR = "H*".freeze
316
- Sequel::Deprecation.deprecate_constant(self, :HSTAR)
317
- CROSS_APPLY = 'CROSS APPLY'.freeze
318
- Sequel::Deprecation.deprecate_constant(self, :CROSS_APPLY)
319
- OUTER_APPLY = 'OUTER APPLY'.freeze
320
- Sequel::Deprecation.deprecate_constant(self, :OUTER_APPLY)
321
- ONLY_OFFSET = " TOP 2147483647".freeze
322
- Sequel::Deprecation.deprecate_constant(self, :ONLY_OFFSET)
323
-
324
240
  Dataset.def_sql_method(self, :insert, %w'with insert into columns values')
325
241
  Dataset.def_sql_method(self, :select, %w'with select distinct limit columns into from join where group having compounds order lock')
326
242
 
327
- # Override the default IBMDB.convert_smallint_to_bool setting for this dataset.
328
- def convert_smallint_to_bool=(v)
329
- Sequel::Deprecation.deprecate("Sequel::SqlAnywhere::Dataset#convert_smallint_to_bool=", "Call with_convert_smallint_to_bool instead, which returns a modified copy instead of modifying the object")
330
- @opts[:convert_smallint_to_bool] = v
331
- end
332
-
333
243
  # Whether to convert smallint to boolean arguments for this dataset.
334
244
  # Defaults to the IBMDB module setting.
335
245
  def convert_smallint_to_bool
@@ -380,7 +290,6 @@ module Sequel
380
290
  true
381
291
  end
382
292
 
383
- # SQLAnywhere uses + for string concatenation, and LIKE is case insensitive by default.
384
293
  def complex_expression_sql_append(sql, op, args)
385
294
  case op
386
295
  when :'||'
@@ -437,7 +346,7 @@ module Sequel
437
346
  string.gsub(/[\\%_\[]/){|m| "\\#{m}"}
438
347
  end
439
348
 
440
- # Use today() and Now() for CURRENT_DATE and CURRENT_TIMESTAMP
349
+ # Use today() for CURRENT_DATE and now() for CURRENT_TIMESTAMP and CURRENT_TIME
441
350
  def constant_sql_append(sql, constant)
442
351
  case constant
443
352
  when :CURRENT_DATE
@@ -492,8 +401,7 @@ module Sequel
492
401
  end
493
402
  end
494
403
 
495
- # Sybase uses TOP N for limit. For Sybase TOP (N) is used
496
- # to allow the limit to be a bound variable.
404
+ # Sybase uses TOP N for limit.
497
405
  def select_limit_sql(sql)
498
406
  l = @opts[:limit]
499
407
  o = @opts[:offset]
@@ -1,13 +1,14 @@
1
1
  # frozen-string-literal: true
2
2
 
3
- Sequel.require %w'replace unmodified_identifiers', 'adapters/utils'
3
+ require_relative '../utils/replace'
4
+ require_relative '../utils/unmodified_identifiers'
4
5
 
5
6
  module Sequel
6
7
  module SQLite
7
8
  Sequel::Database.set_shared_adapter_scheme(:sqlite, self)
8
9
 
9
10
  def self.mock_adapter_setup(db)
10
- db.instance_eval do
11
+ db.instance_exec do
11
12
  @sqlite_version = 30903
12
13
  end
13
14
  end
@@ -18,13 +19,6 @@ module Sequel
18
19
  module DatabaseMethods
19
20
  include UnmodifiedIdentifiers::DatabaseMethods
20
21
 
21
- PRIMARY_KEY_INDEX_RE = /\Asqlite_autoindex_/.freeze
22
- Sequel::Deprecation.deprecate_constant(self, :PRIMARY_KEY_INDEX_RE)
23
- TABLES_FILTER = Sequel.~(:name=>'sqlite_sequence'.freeze) & {:type => 'table'.freeze}
24
- Sequel::Deprecation.deprecate_constant(self, :TABLES_FILTER)
25
- VIEWS_FILTER = {:type => 'view'.freeze}.freeze
26
- Sequel::Deprecation.deprecate_constant(self, :VIEWS_FILTER)
27
-
28
22
  AUTO_VACUUM = [:none, :full, :incremental].freeze
29
23
  SYNCHRONOUS = [:off, :normal, :full].freeze
30
24
  TEMP_STORE = [:default, :file, :memory].freeze
@@ -56,46 +50,6 @@ module Sequel
56
50
  :sqlite
57
51
  end
58
52
 
59
- # SEQUEL5: Remove
60
- def auto_vacuum
61
- AUTO_VACUUM[pragma_get(:auto_vacuum).to_i]
62
- end
63
- def auto_vacuum=(value)
64
- value = AUTO_VACUUM.index(value) || (raise Error, "Invalid value for auto_vacuum option. Please specify one of :none, :full, :incremental.")
65
- pragma_set(:auto_vacuum, value)
66
- end
67
- def case_sensitive_like=(value)
68
- pragma_set(:case_sensitive_like, !!value ? 'on' : 'off') if sqlite_version >= 30203
69
- end
70
- def foreign_keys
71
- pragma_get(:foreign_keys).to_i == 1 if sqlite_version >= 30619
72
- end
73
- def foreign_keys=(value)
74
- pragma_set(:foreign_keys, !!value ? 'on' : 'off') if sqlite_version >= 30619
75
- end
76
- def pragma_get(name)
77
- Sequel::Deprecation.deprecate('Database#{pragma_get,auto_vacuum,case_sensitive_like,foreign_keys,synchronous,temp_store} on SQLite', "These methods may not be safe when using multiple connections, call fetch(#{"PRAGMA #{name}".inspect}).single_value if you really want to get the pragma value")
78
- self["PRAGMA #{name}"].single_value
79
- end
80
- def pragma_set(name, value)
81
- Sequel::Deprecation.deprecate('Database#{pragma_set,auto_vacuum=,case_sensitive_like=,foreign_keys=,synchronous=,temp_store=} on SQLite', "These methods are not thread safe or safe when using multiple connections, pass the appropriate option when connecting to set the pragma correctly for all connections")
82
- execute_ddl("PRAGMA #{name} = #{value}")
83
- end
84
- def synchronous
85
- SYNCHRONOUS[pragma_get(:synchronous).to_i]
86
- end
87
- def synchronous=(value)
88
- value = SYNCHRONOUS.index(value) || (raise Error, "Invalid value for synchronous option. Please specify one of :off, :normal, :full.")
89
- pragma_set(:synchronous, value)
90
- end
91
- def temp_store
92
- TEMP_STORE[pragma_get(:temp_store).to_i]
93
- end
94
- def temp_store=(value)
95
- value = TEMP_STORE.index(value) || (raise Error, "Invalid value for temp_store option. Please specify one of :default, :file, :memory.")
96
- pragma_set(:temp_store, value)
97
- end
98
-
99
53
  # Set the integer_booleans option using the passed in :integer_boolean option.
100
54
  def set_integer_booleans
101
55
  @integer_booleans = @opts.has_key?(:integer_booleans) ? typecast_value_boolean(@opts[:integer_booleans]) : true
@@ -203,7 +157,7 @@ module Sequel
203
157
  # Creates a dataset that uses the VALUES clause:
204
158
  #
205
159
  # DB.values([[1, 2], [3, 4]])
206
- # VALUES ((1, 2), (3, 4))
160
+ # # VALUES ((1, 2), (3, 4))
207
161
  def values(v)
208
162
  @default_dataset.clone(:values=>v)
209
163
  end
@@ -527,7 +481,6 @@ module Sequel
527
481
  end
528
482
  end
529
483
 
530
- # Instance methods for datasets that connect to an SQLite database
531
484
  module DatasetMethods
532
485
  include Dataset::Replace
533
486
  include UnmodifiedIdentifiers::DatasetMethods
@@ -535,50 +488,9 @@ module Sequel
535
488
  # The allowed values for insert_conflict
536
489
  INSERT_CONFLICT_RESOLUTIONS = %w'ROLLBACK ABORT FAIL IGNORE REPLACE'.each(&:freeze).freeze
537
490
 
538
- CONSTANT_MAP = {:CURRENT_DATE=>"date(CURRENT_TIMESTAMP, 'localtime')".freeze, :CURRENT_TIMESTAMP=>"datetime(CURRENT_TIMESTAMP, 'localtime')".freeze, :CURRENT_TIME=>"time(CURRENT_TIMESTAMP, 'localtime')".freeze}#.freeze # SEQUEL5
539
- EXTRACT_MAP = {:year=>"'%Y'", :month=>"'%m'", :day=>"'%d'", :hour=>"'%H'", :minute=>"'%M'", :second=>"'%f'"}#.freeze # SEQUEL5
540
- #EXTRACT_MAP.each_value(&:freeze) # SEQUEL5
541
-
542
- NOT_SPACE = 'NOT '.freeze
543
- Sequel::Deprecation.deprecate_constant(self, :NOT_SPACE)
544
- COMMA = ', '.freeze
545
- Sequel::Deprecation.deprecate_constant(self, :COMMA)
546
- PAREN_CLOSE = ')'.freeze
547
- Sequel::Deprecation.deprecate_constant(self, :PAREN_CLOSE)
548
- AS = ' AS '.freeze
549
- Sequel::Deprecation.deprecate_constant(self, :AS)
550
- APOS = "'".freeze
551
- Sequel::Deprecation.deprecate_constant(self, :APOS)
552
- EXTRACT_OPEN = "CAST(strftime(".freeze
553
- Sequel::Deprecation.deprecate_constant(self, :EXTRACT_OPEN)
554
- EXTRACT_CLOSE = ') AS '.freeze
555
- Sequel::Deprecation.deprecate_constant(self, :EXTRACT_CLOSE)
556
- NUMERIC = 'NUMERIC'.freeze
557
- Sequel::Deprecation.deprecate_constant(self, :NUMERIC)
558
- INTEGER = 'INTEGER'.freeze
559
- Sequel::Deprecation.deprecate_constant(self, :INTEGER)
560
- BACKTICK = '`'.freeze
561
- Sequel::Deprecation.deprecate_constant(self, :BACKTICK)
562
- BACKTICK_RE = /`/.freeze
563
- Sequel::Deprecation.deprecate_constant(self, :BACKTICK_RE)
564
- DOUBLE_BACKTICK = '``'.freeze
565
- Sequel::Deprecation.deprecate_constant(self, :DOUBLE_BACKTICK)
566
- BLOB_START = "X'".freeze
567
- Sequel::Deprecation.deprecate_constant(self, :BLOB_START)
568
- HSTAR = "H*".freeze
569
- Sequel::Deprecation.deprecate_constant(self, :HSTAR)
570
- DATE_OPEN = "date(".freeze
571
- Sequel::Deprecation.deprecate_constant(self, :DATE_OPEN)
572
- DATETIME_OPEN = "datetime(".freeze
573
- Sequel::Deprecation.deprecate_constant(self, :DATETIME_OPEN)
574
- ONLY_OFFSET = " LIMIT -1 OFFSET ".freeze
575
- Sequel::Deprecation.deprecate_constant(self, :ONLY_OFFSET)
576
- OR = " OR ".freeze
577
- Sequel::Deprecation.deprecate_constant(self, :OR)
578
- SELECT_VALUES = "VALUES ".freeze
579
- Sequel::Deprecation.deprecate_constant(self, :SELECT_VALUES)
580
- EMULATED_FUNCTION_MAP = {:char_length=>'length'.freeze}
581
- Sequel::Deprecation.deprecate_constant(self, :EMULATED_FUNCTION_MAP)
491
+ CONSTANT_MAP = {:CURRENT_DATE=>"date(CURRENT_TIMESTAMP, 'localtime')".freeze, :CURRENT_TIMESTAMP=>"datetime(CURRENT_TIMESTAMP, 'localtime')".freeze, :CURRENT_TIME=>"time(CURRENT_TIMESTAMP, 'localtime')".freeze}.freeze
492
+ EXTRACT_MAP = {:year=>"'%Y'", :month=>"'%m'", :day=>"'%d'", :hour=>"'%H'", :minute=>"'%M'", :second=>"'%f'"}.freeze
493
+ EXTRACT_MAP.each_value(&:freeze)
582
494
 
583
495
  Dataset.def_sql_method(self, :delete, [['if db.sqlite_version >= 30803', %w'with delete from where'], ["else", %w'delete from where']])
584
496
  Dataset.def_sql_method(self, :insert, [['if db.sqlite_version >= 30803', %w'with insert conflict into columns values'], ["else", %w'insert conflict into columns values']])
@@ -600,7 +512,7 @@ module Sequel
600
512
  end
601
513
 
602
514
  # SQLite doesn't support a NOT LIKE b, you need to use NOT (a LIKE b).
603
- # It doesn't support xor or the extract function natively, so those have to be emulated.
515
+ # It doesn't support xor, power, or the extract function natively, so those have to be emulated.
604
516
  def complex_expression_sql_append(sql, op, args)
605
517
  case op
606
518
  when :"NOT LIKE", :"NOT ILIKE"
@@ -703,15 +615,14 @@ module Sequel
703
615
  #
704
616
  # Examples:
705
617
  #
706
- # DB[:table].insert_conflict.insert(:a=>1, :b=>2)
618
+ # DB[:table].insert_conflict.insert(a: 1, b: 2)
707
619
  # # INSERT OR IGNORE INTO TABLE (a, b) VALUES (1, 2)
708
620
  #
709
- # DB[:table].insert_conflict(:replace).insert(:a=>1, :b=>2)
621
+ # DB[:table].insert_conflict(:replace).insert(a: 1, b: 2)
710
622
  # # INSERT OR REPLACE INTO TABLE (a, b) VALUES (1, 2)
711
623
  def insert_conflict(resolution = :ignore)
712
624
  unless INSERT_CONFLICT_RESOLUTIONS.include?(resolution.to_s.upcase)
713
- Sequel::Deprecation.deprecate("Passing #{resolution.inspect} argument to Dataset#insert_conflict", "The allowed values are: :rollback, :abort, :fail, :ignore, or :replace")
714
- # raise Error, "Invalid value passed to Dataset#insert_conflict: #{resolution.inspect}. The allowed values are: :rollback, :abort, :fail, :ignore, or :replace"
625
+ raise Error, "Invalid value passed to Dataset#insert_conflict: #{resolution.inspect}. The allowed values are: :rollback, :abort, :fail, :ignore, or :replace"
715
626
  end
716
627
  clone(:insert_conflict => resolution)
717
628
  end
@@ -719,7 +630,7 @@ module Sequel
719
630
  # Ignore uniqueness/exclusion violations when inserting, using INSERT OR IGNORE.
720
631
  # Exists mostly for compatibility to MySQL's insert_ignore. Example:
721
632
  #
722
- # DB[:table].insert_ignore.insert(:a=>1, :b=>2)
633
+ # DB[:table].insert_ignore.insert(a: 1, b: 2)
723
634
  # # INSERT OR IGNORE INTO TABLE (a, b) VALUES (1, 2)
724
635
  def insert_ignore
725
636
  insert_conflict(:ignore)
@@ -730,6 +641,11 @@ module Sequel
730
641
  db.sqlite_version >= 30803
731
642
  end
732
643
 
644
+ # SQLite supports CTEs in subqueries if it supports CTEs.
645
+ def supports_cte_in_subqueries?
646
+ supports_cte?
647
+ end
648
+
733
649
  # SQLite does not support table aliases with column aliases
734
650
  def supports_derived_column_lists?
735
651
  false
@@ -854,6 +770,11 @@ module Sequel
854
770
  expression_list_append(sql, opts[:values])
855
771
  end
856
772
 
773
+ # SQLite does not support CTEs directly inside UNION/INTERSECT/EXCEPT.
774
+ def supports_cte_in_compounds?
775
+ false
776
+ end
777
+
857
778
  # SQLite supports quoted function names.
858
779
  def supports_quoted_function_names?
859
780
  true
@@ -1,11 +1,9 @@
1
1
  # frozen-string-literal: true
2
2
 
3
3
  require 'sqlanywhere'
4
-
5
- Sequel.require %w'shared/sqlanywhere', 'adapters'
4
+ require_relative 'shared/sqlanywhere'
6
5
 
7
6
  module Sequel
8
- # Module for holding all SqlAnywhere-related classes and modules for Sequel.
9
7
  module SqlAnywhere
10
8
 
11
9
  class SQLAnywhereException < StandardError
@@ -27,9 +25,6 @@ module Sequel
27
25
  def time(s) ::Sequel.string_to_time(s) end
28
26
  end.new
29
27
 
30
- TYPE_TRANSLATOR = tt
31
- Sequel::Deprecation.deprecate_constant(self, :TYPE_TRANSLATOR)
32
-
33
28
  SQLANYWHERE_TYPES = {}
34
29
  {
35
30
  [0, 484] => tt.method(:decimal),
@@ -40,15 +35,11 @@ module Sequel
40
35
  }.each do |k,v|
41
36
  k.each{|n| SQLANYWHERE_TYPES[n] = v}
42
37
  end
43
- # SQLANYWHERE_TYPES.freeze # SEQUEL5
38
+ SQLANYWHERE_TYPES.freeze
44
39
 
45
- # Database class for SQLAnywhere databases used with Sequel.
46
40
  class Database < Sequel::Database
47
41
  include Sequel::SqlAnywhere::DatabaseMethods
48
42
 
49
- DEFAULT_CONFIG = { :user => 'dba', :password => 'sql' }
50
- Sequel::Deprecation.deprecate_constant(self, :DEFAULT_CONFIG)
51
-
52
43
  attr_accessor :api
53
44
 
54
45
  set_adapter_scheme :sqlanywhere
@@ -79,12 +70,10 @@ module Sequel
79
70
  conn
80
71
  end
81
72
 
82
- # Closes given database connection.
83
73
  def disconnect_connection(c)
84
74
  @api.sqlany_disconnect(c)
85
75
  end
86
76
 
87
- # Returns number of rows affected
88
77
  def execute_dui(sql, opts=OPTS)
89
78
  synchronize(opts[:server]) do |conn|
90
79
  _execute(conn, :rows, sql, opts)
@@ -110,8 +99,6 @@ module Sequel
110
99
 
111
100
  private
112
101
 
113
- LAST_INSERT_ID = 'SELECT @@IDENTITY'.freeze
114
- Sequel::Deprecation.deprecate_constant(self, :LAST_INSERT_ID)
115
102
  def _execute(conn, type, sql, opts)
116
103
  unless rs = log_connection_yield(sql, conn){@api.sqlany_execute_direct(conn, sql)}
117
104
  result, errstr = @api.sqlany_error(conn)
@@ -132,6 +119,7 @@ module Sequel
132
119
  end
133
120
 
134
121
  def adapter_initialize
122
+ @convert_smallint_to_bool = true
135
123
  @conversion_procs = SQLANYWHERE_TYPES.dup
136
124
  @conversion_procs[392] = method(:to_application_timestamp_sa)
137
125
  @api = SQLAnywhere::SQLAnywhereInterface.new
@@ -148,22 +136,15 @@ module Sequel
148
136
  end
149
137
  end
150
138
 
151
- # Dataset class for SqlAnywhere datasets accessed via the native driver.
152
139
  class Dataset < Sequel::Dataset
153
140
  include Sequel::SqlAnywhere::DatasetMethods
154
141
 
155
- Database::DatasetClass = self
156
- Sequel::Deprecation.deprecate_constant(Database, :DatasetClass)
157
-
158
- # Yield all rows matching this dataset. If the dataset is set to
159
- # split multiple statements, yield arrays of hashes one per statement
160
- # instead of yielding results for all statements as hashes.
161
142
  def fetch_rows(sql)
162
143
  db = @db
163
144
  cps = db.conversion_procs
164
145
  api = db.api
165
146
  execute(sql) do |rs|
166
- convert = (convert_smallint_to_bool and db.convert_smallint_to_bool)
147
+ convert = convert_smallint_to_bool
167
148
  col_infos = []
168
149
  api.sqlany_num_cols(rs).times do |i|
169
150
  _, _, name, _, type = api.sqlany_get_column_info(rs, i)
@@ -1,11 +1,9 @@
1
1
  # frozen-string-literal: true
2
2
 
3
3
  require 'sqlite3'
4
- Sequel.require 'adapters/shared/sqlite'
4
+ require_relative 'shared/sqlite'
5
5
 
6
6
  module Sequel
7
- # Top level module for holding all SQLite-related modules and classes
8
- # for Sequel.
9
7
  module SQLite
10
8
  FALSE_VALUES = (%w'0 false f no n' + [0]).freeze
11
9
 
@@ -60,9 +58,6 @@ module Sequel
60
58
  end
61
59
  end.new
62
60
 
63
- TYPE_TRANSLATOR = tt
64
- Sequel::Deprecation.deprecate_constant(self, :TYPE_TRANSLATOR)
65
-
66
61
  # Hash with string keys and callable values for converting SQLite types.
67
62
  SQLITE_TYPES = {}
68
63
  {
@@ -76,10 +71,8 @@ module Sequel
76
71
  }.each do |k,v|
77
72
  k.each{|n| SQLITE_TYPES[n] = v}
78
73
  end
79
- # SQLITE_TYPES.freeze # SEQUEL5
74
+ SQLITE_TYPES.freeze
80
75
 
81
- # Database class for SQLite databases used with Sequel and the
82
- # ruby-sqlite3 driver.
83
76
  class Database < Sequel::Database
84
77
  include ::Sequel::SQLite::DatabaseMethods
85
78
 
@@ -149,7 +142,6 @@ module Sequel
149
142
  end
150
143
  end
151
144
 
152
- # Run the given SQL with the given arguments and return the last inserted row id.
153
145
  def execute_insert(sql, opts=OPTS)
154
146
  _execute(:insert, sql, opts)
155
147
  end
@@ -291,17 +283,9 @@ module Sequel
291
283
  #end
292
284
  end
293
285
 
294
- # Dataset class for SQLite datasets that use the ruby-sqlite3 driver.
295
286
  class Dataset < Sequel::Dataset
296
287
  include ::Sequel::SQLite::DatasetMethods
297
288
 
298
- Database::DatasetClass = self
299
- Sequel::Deprecation.deprecate_constant(Database, :DatasetClass)
300
-
301
- PREPARED_ARG_PLACEHOLDER = ':'.freeze
302
- Sequel::Deprecation.deprecate_constant(self, :PREPARED_ARG_PLACEHOLDER)
303
-
304
- # SQLite already supports named bind arguments, so use directly.
305
289
  module ArgumentMapper
306
290
  include Sequel::Dataset::ArgumentMapper
307
291
 
@@ -332,7 +316,6 @@ module Sequel
332
316
  BindArgumentMethods = prepared_statements_module(:bind, ArgumentMapper)
333
317
  PreparedStatementMethods = prepared_statements_module(:prepare, BindArgumentMethods)
334
318
 
335
- # Yield a hash for each row in the dataset.
336
319
  def fetch_rows(sql)
337
320
  execute(sql) do |result|
338
321
  i = -1
@@ -1,7 +1,7 @@
1
1
  # frozen-string-literal: true
2
2
 
3
3
  require 'tiny_tds'
4
- Sequel.require 'adapters/shared/mssql'
4
+ require_relative 'shared/mssql'
5
5
 
6
6
  module Sequel
7
7
  module TinyTDS
@@ -59,7 +59,7 @@ module Sequel
59
59
  else
60
60
  log_connection_yield(sql, c) do
61
61
  r = c.execute(sql)
62
- return r.send(m) if m
62
+ return r.public_send(m) if m
63
63
  end
64
64
  end
65
65
  yield(r) if block_given?
@@ -71,22 +71,18 @@ module Sequel
71
71
  end
72
72
  end
73
73
 
74
- # Return the number of rows modified by the given +sql+.
75
74
  def execute_dui(sql, opts=OPTS)
76
75
  opts = Hash[opts]
77
76
  opts[:return] = :do
78
77
  execute(sql, opts)
79
78
  end
80
79
 
81
- # Return the value of the autogenerated primary key (if any)
82
- # for the row inserted by the given +sql+.
83
80
  def execute_insert(sql, opts=OPTS)
84
81
  opts = Hash[opts]
85
82
  opts[:return] = :insert
86
83
  execute(sql, opts)
87
84
  end
88
85
 
89
- # Execute the DDL +sql+ on the database and return nil.
90
86
  def execute_ddl(sql, opts=OPTS)
91
87
  opts = Hash[opts]
92
88
  opts[:return] = :each
@@ -135,9 +131,6 @@ module Sequel
135
131
  Dataset
136
132
  end
137
133
 
138
- TINYTDS_DISCONNECT_ERRORS = /\A(Attempt to initiate a new Adaptive Server operation with results pending|The request failed to run because the batch is aborted, this can be caused by abort signal sent from client|Adaptive Server connection timed out)/
139
- Sequel::Deprecation.deprecate_constant(self, :TINYTDS_DISCONNECT_ERRORS)
140
-
141
134
  # Return true if the :conn argument is present and not active.
142
135
  def disconnect_error?(e, opts)
143
136
  super || (opts[:conn] && !opts[:conn].active?) || ((e.is_a?(::TinyTds::Error) && /\A(Attempt to initiate a new Adaptive Server operation with results pending|The request failed to run because the batch is aborted, this can be caused by abort signal sent from client|Adaptive Server connection timed out)/.match(e.message)))
@@ -185,9 +178,6 @@ module Sequel
185
178
  class Dataset < Sequel::Dataset
186
179
  include Sequel::MSSQL::DatasetMethods
187
180
 
188
- Database::DatasetClass = self
189
- Sequel::Deprecation.deprecate_constant(Database, :DatasetClass)
190
-
191
181
  module ArgumentMapper
192
182
  include Sequel::Dataset::ArgumentMapper
193
183
 
@@ -213,10 +203,10 @@ module Sequel
213
203
 
214
204
  PreparedStatementMethods = prepared_statements_module("sql = prepared_sql; opts = Hash[opts]; opts[:arguments] = bind_arguments", ArgumentMapper)
215
205
 
216
- # Yield hashes with symbol keys, attempting to optimize for
217
- # various cases.
218
206
  def fetch_rows(sql)
219
207
  execute(sql) do |result|
208
+ # Mutating an array in the result is questionable, but supported
209
+ # by tiny_tds developers (tiny_tds issue #57)
220
210
  columns = result.fields.map!{|c| output_identifier(c)}
221
211
  if columns.empty?
222
212
  args = []
@@ -247,7 +237,7 @@ module Sequel
247
237
 
248
238
  private
249
239
 
250
- # Properly escape the given string +v+.
240
+ # Properly escape the given string
251
241
  def literal_string_append(sql, v)
252
242
  sql << (mssql_unicode_strings ? "N'" : "'")
253
243
  sql << db.synchronize(@opts[:server]){|c| c.escape(v)}.gsub(/\\((?:\r\n)|\n)/, '\\\\\\\\\\1\\1') << "'"
@@ -7,7 +7,7 @@ module Sequel
7
7
  # when ordering.
8
8
  def empty?
9
9
  return super unless emulate_offset_with_row_number?
10
- get(Sequel::SQL::AliasedExpression.new(1, :one)).nil?
10
+ select(Dataset::EMPTY_SELECT).limit(1).single_value!.nil?
11
11
  end
12
12
 
13
13
  # Emulate OFFSET support with the ROW_NUMBER window function
@@ -1,6 +1,7 @@
1
1
  # frozen-string-literal: true
2
2
 
3
- Sequel.require %w'shared/mysql utils/stored_procedures', 'adapters'
3
+ require_relative '../shared/mysql'
4
+ require_relative 'stored_procedures'
4
5
 
5
6
  module Sequel
6
7
  module MySQL
@@ -47,9 +48,6 @@ module Sequel
47
48
  conn.prepared_statements = {}
48
49
  end
49
50
 
50
- # Stupid MySQL doesn't use SQLState error codes correctly, mapping
51
- # all constraint violations to 23000 even though it recognizes
52
- # different types.
53
51
  def database_specific_error_class(exception, opts)
54
52
  case exception.errno
55
53
  when 1048
@@ -58,6 +56,8 @@ module Sequel
58
56
  UniqueConstraintViolation
59
57
  when 1451, 1452
60
58
  ForeignKeyConstraintViolation
59
+ when 4025
60
+ CheckConstraintViolation
61
61
  else
62
62
  super
63
63
  end
@@ -8,10 +8,9 @@ module Sequel
8
8
 
9
9
  # Executes a prepared statement on an available connection. If the
10
10
  # prepared statement already exists for the connection and has the same
11
- # SQL, reuse it, otherwise, prepare the new statement. Because of the
12
- # usual MySQL stupidity, we are forced to name arguments via separate
13
- # SET queries. Use @sequel_arg_N (for N starting at 1) for these
14
- # arguments.
11
+ # SQL, reuse it, otherwise, prepare the new statement. Issue a SET
12
+ # query with literalized values for each argument, then an EXECUTE to
13
+ # execute the query with the arguments.
15
14
  def execute_prepared_statement(ps_name, opts, &block)
16
15
  args = opts[:arguments]
17
16
  ps = prepared_statement(ps_name)
@@ -30,8 +29,6 @@ module Sequel
30
29
  end
31
30
 
32
31
  module DatasetMethods
33
- # Methods to add to MySQL prepared statement calls without using a
34
- # real database prepared statement and bound variables.
35
32
  module CallableStatementMethods
36
33
  # Extend given dataset with this module so subselects inside subselects in
37
34
  # prepared statements work.