Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix custom alphabet issues #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix custom alphabet issues #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b22e71
Fix integer division truncate on guard_count
bir Mar 5, 2020
8ca3c26
Fix issue when len(separators) < min
bir Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 13 additions & 18 deletions hashids.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ begin
end;
$$ language plpgsql;


create or replace function hashids._prepare(
inout alphabet varchar,
in salt varchar = '',
Expand All @@ -134,11 +135,12 @@ create or replace function hashids._prepare(
) as $$
declare
min_alphabet_length integer := 16;
sep_div integer := 3.5;
sep_div float := 3.5;
guard_div integer := 12;
guard_count integer;
cur_sep varchar;
diff varchar;
diff integer;
temp_sep varchar;
begin
if alphabet is null then
alphabet := 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
Expand All @@ -162,29 +164,24 @@ begin
raise exception '[hash_id] error: Alphabet cannot contain spaces';
end if;

for i in 1..length( separators ) loop
cur_sep := array_position( original_alphabet_arr, separators_arr [i] );

if cur_sep is null then
separators := substr( separators, 1, i ) || ' ' || substr( separators, i + 1 );
temp_sep := '';
foreach cur_sep in ARRAY separators_arr loop
if array_position( original_alphabet_arr, cur_sep ) is not null then
temp_sep := temp_sep || cur_sep;
end if;
end loop;

separators := regexp_replace( separators, '[ ]', '', 'g' );
separators := hashids.shuffle( separators, salt );

if ( length( separators ) < 1 or ( length( alphabet ) / length( separators ) ) > sep_div ) then
separators_length = ceil( length( alphabet ) / sep_div );
separators := hashids.shuffle( temp_sep, salt );

if ( separators_length > length( separators ) ) then
separators_length = ceil( length( alphabet )::float / sep_div );
if ( separators_length > length( separators ) ) then
diff := separators_length - length( separators );
separators := separators || substr( alphabet, 1, diff );
alphabet := substr( alphabet, diff );
end if;
alphabet := substr( alphabet, diff+1 );
end if;

alphabet := hashids.shuffle( alphabet, salt );
guard_count := ceil( length( alphabet ) / guard_div );
guard_count := ceil( length( alphabet )::float / guard_div );

if length( alphabet ) < 3 then
guards := substr( separators, 1, guard_count );
Expand Down Expand Up @@ -401,8 +398,6 @@ begin
end;
$$ language plpgsql;

drop function hashids.decode_hex;

create or replace function hashids.decode_hex(
id varchar,
salt varchar = '',
Expand Down