File tree Expand file tree Collapse file tree 5 files changed +28
-9
lines changed Expand file tree Collapse file tree 5 files changed +28
-9
lines changed Original file line number Diff line number Diff line change 2121 after { parent . nulls_last = false }
2222
2323 it 'sql query' do
24- skip ( 'unsupported database adapter' ) if ENV [ 'DB_ADAPTER' ] == 'oracle_enhanced'
24+ skip ( 'unsupported database adapter' ) if RunningSpec . oracle?
2525
2626 expect ( simple_order . query ( 'email' ) ) . to eq (
2727 "email DESC #{ nulls_last_sql ( parent ) } "
Original file line number Diff line number Diff line change 168168 expect ( result ) . to be_a ( Arel ::Nodes ::And )
169169 end
170170
171- if ENV [ 'DB_ADAPTER' ] == ' postgresql'
171+ if RunningSpec . postgresql?
172172 context 'when db_adapter is postgresql' do
173173 it 'can call #to_sql on returned object' do
174174 result = datatable . build_conditions_for_selected_columns
180180 end
181181 end
182182
183- if ENV [ 'DB_ADAPTER' ] == 'oracle_enhanced'
183+ if RunningSpec . oracle?
184184 context 'when db_adapter is oracle' do
185185 it 'can call #to_sql on returned object' do
186186 result = datatable . build_conditions_for_selected_columns
192192 end
193193 end
194194
195- if ENV [ 'DB_ADAPTER' ] == 'mysql2'
195+ if RunningSpec . mysql?
196196 context 'when db_adapter is mysql2' do
197197 it 'can call #to_sql on returned object' do
198198 result = datatable . build_conditions_for_selected_columns
471471 create ( :user , last_name : 'MARY' )
472472 end
473473
474- if ENV [ 'DB_ADAPTER' ] == 'oracle_enhanced'
474+ if RunningSpec . oracle?
475475 context 'when db_adapter is oracleenhanced' do
476476 it 'filters records matching' do
477477 datatable . params [ :columns ] [ '3' ] [ :search ] [ :value ] = 'RY'
Original file line number Diff line number Diff line change 1818 end
1919
2020 it 'paginates records properly' do
21- if ENV [ 'DB_ADAPTER' ] == 'oracle_enhanced'
21+ if RunningSpec . oracle?
2222 if Rails . version . in? %w[ 4.2.11 ]
2323 expect ( datatable . paginate_records ( records ) . to_sql ) . to include (
2424 'rownum <= 10'
3636
3737 datatable . params [ :start ] = '26'
3838 datatable . params [ :length ] = '25'
39- if ENV [ 'DB_ADAPTER' ] == 'oracle_enhanced'
39+ if RunningSpec . oracle?
4040 if Rails . version . in? %w[ 4.2.11 ]
4141 expect ( datatable . paginate_records ( records ) . to_sql ) . to include (
4242 'rownum <= 51'
Original file line number Diff line number Diff line change 5151 after { datatable . nulls_last = false }
5252
5353 it 'can handle multiple sorting columns' do
54- skip ( 'unsupported database adapter' ) if ENV [ 'DB_ADAPTER' ] == 'oracle_enhanced'
54+ skip ( 'unsupported database adapter' ) if RunningSpec . oracle?
5555
5656 # set to order by Users username in ascending order, and
5757 # by Users email in descending order
6565
6666 describe '#sort_records with nulls last using column config' do
6767 it 'can handle multiple sorting columns' do
68- skip ( 'unsupported database adapter' ) if ENV [ 'DB_ADAPTER' ] == 'oracle_enhanced'
68+ skip ( 'unsupported database adapter' ) if RunningSpec . oracle?
6969
7070 # set to order by Users username in ascending order, and
7171 # by Users email in descending order
Original file line number Diff line number Diff line change 6161 end
6262end
6363
64+ class RunningSpec
65+ def self . sqlite?
66+ ENV [ 'DB_ADAPTER' ] == 'sqlite3'
67+ end
68+
69+ def self . oracle?
70+ ENV [ 'DB_ADAPTER' ] == 'oracle_enhanced'
71+ end
72+
73+ def self . mysql?
74+ ENV [ 'DB_ADAPTER' ] == 'mysql2'
75+ end
76+
77+ def self . postgresql?
78+ ENV [ 'DB_ADAPTER' ] == 'postgresql'
79+ end
80+ end
81+
6482# Configure ActiveRecord
6583adapter = ENV . fetch ( 'DB_ADAPTER' , 'postgresql' )
84+ ENV [ 'DB_ADAPTER' ] = adapter
6685
6786options = {
6887 adapter : adapter ,
You can’t perform that action at this time.
0 commit comments